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_test_util.h | |
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_test_util.h')
-rw-r--r-- | chromium/net/dns/dns_test_util.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chromium/net/dns/dns_test_util.h b/chromium/net/dns/dns_test_util.h index fc325005610..d28c9e44609 100644 --- a/chromium/net/dns/dns_test_util.h +++ b/chromium/net/dns/dns_test_util.h @@ -8,10 +8,10 @@ #include <stddef.h> #include <stdint.h> +#include <memory> #include <string> #include <vector> -#include "base/memory/scoped_ptr.h" #include "net/dns/dns_client.h" #include "net/dns/dns_config_service.h" #include "net/dns/dns_protocol.h" @@ -201,8 +201,8 @@ class MockDnsClient : public DnsClient { private: DnsConfig config_; - scoped_ptr<MockTransactionFactory> factory_; - scoped_ptr<AddressSorter> address_sorter_; + std::unique_ptr<MockTransactionFactory> factory_; + std::unique_ptr<AddressSorter> address_sorter_; }; } // namespace net |