diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-07-14 17:41:05 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-08-04 12:37:36 +0000 |
| commit | 399c965b6064c440ddcf4015f5f8e9d131c7a0a6 (patch) | |
| tree | 6b06b60ff365abef0e13b3503d593a0df48d20e8 /chromium/net/dns/dns_config_service_posix_unittest.cc | |
| parent | 7366110654eec46f21b6824f302356426f48cd74 (diff) | |
| download | qtwebengine-chromium-399c965b6064c440ddcf4015f5f8e9d131c7a0a6.tar.gz | |
BASELINE: Update Chromium to 52.0.2743.76 and Ninja to 1.7.1
Change-Id: I382f51b959689505a60f8b707255ecb344f7d8b4
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/net/dns/dns_config_service_posix_unittest.cc')
| -rw-r--r-- | chromium/net/dns/dns_config_service_posix_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/net/dns/dns_config_service_posix_unittest.cc b/chromium/net/dns/dns_config_service_posix_unittest.cc index 18a71176b84..88448b16567 100644 --- a/chromium/net/dns/dns_config_service_posix_unittest.cc +++ b/chromium/net/dns/dns_config_service_posix_unittest.cc @@ -179,7 +179,7 @@ TEST(DnsConfigServicePosixTest, RejectEmptyNameserver) { TEST(DnsConfigServicePosixTest, DestroyWhileJobsWorking) { // Regression test to verify crash does not occur if DnsConfigServicePosix // instance is destroyed while SerialWorker jobs have posted to worker pool. - scoped_ptr<internal::DnsConfigServicePosix> service( + std::unique_ptr<internal::DnsConfigServicePosix> service( new internal::DnsConfigServicePosix()); service->ReadConfig(base::Bind(&DummyConfigCallback)); service.reset(); @@ -274,7 +274,7 @@ class DnsConfigServicePosixTest : public testing::Test { bool seen_config_; base::Time creation_time_; base::FilePath temp_file_; - scoped_ptr<DnsConfigServicePosix> service_; + std::unique_ptr<DnsConfigServicePosix> service_; DnsConfig test_config_; }; |