summaryrefslogtreecommitdiff
path: root/chromium/net/dns/dns_query_unittest.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-07-14 17:41:05 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2016-08-04 12:37:36 +0000
commit399c965b6064c440ddcf4015f5f8e9d131c7a0a6 (patch)
tree6b06b60ff365abef0e13b3503d593a0df48d20e8 /chromium/net/dns/dns_query_unittest.cc
parent7366110654eec46f21b6824f302356426f48cd74 (diff)
downloadqtwebengine-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_query_unittest.cc')
-rw-r--r--chromium/net/dns/dns_query_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chromium/net/dns/dns_query_unittest.cc b/chromium/net/dns/dns_query_unittest.cc
index 2a4648e244f..775fb6c7676 100644
--- a/chromium/net/dns/dns_query_unittest.cc
+++ b/chromium/net/dns/dns_query_unittest.cc
@@ -50,7 +50,7 @@ TEST(DnsQueryTest, Clone) {
DnsQuery q1(0, qname, dns_protocol::kTypeA);
EXPECT_EQ(0, q1.id());
- scoped_ptr<DnsQuery> q2 = q1.CloneWithNewId(42);
+ std::unique_ptr<DnsQuery> q2 = q1.CloneWithNewId(42);
EXPECT_EQ(42, q2->id());
EXPECT_EQ(q1.io_buffer()->size(), q2->io_buffer()->size());
EXPECT_EQ(q1.qtype(), q2->qtype());