From 399c965b6064c440ddcf4015f5f8e9d131c7a0a6 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 14 Jul 2016 17:41:05 +0200 Subject: BASELINE: Update Chromium to 52.0.2743.76 and Ninja to 1.7.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I382f51b959689505a60f8b707255ecb344f7d8b4 Reviewed-by: Michael BrĂ¼ning --- chromium/net/dns/dns_query_unittest.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chromium/net/dns/dns_query_unittest.cc') 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 q2 = q1.CloneWithNewId(42); + std::unique_ptr 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()); -- cgit v1.2.1