Change HostResolver::Resolve() to take an std::unique_ptr<Request>* rather than a RequestHandle*

chromeos/network/host_resolver_impl_chromeos_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/network/host_resolver_impl_chromeos.h"
 
 #include <memory>
 
 #include "base/location.h"
 #include "base/macros.h"
@@ skipping 83 matching lines @@
   // Run from IO message loop.
   void InitializeHostResolver() {
     net::HostResolver::Options options;
     host_resolver_ =
         chromeos::HostResolverImplChromeOS::CreateHostResolverForTest(
             base::ThreadTaskRunnerHandle::Get(), network_state_handler_.get());
   }
 
   // Run from IO message loop.
   void Resolve(net::HostResolver::RequestInfo info) {
-    result_ = host_resolver_->Resolve(
-        info,
-        net::DEFAULT_PRIORITY,
-        &addresses_,
-        base::Bind(&ResolveCompletionCallback),
-        NULL,
-        net_log_);
+    result_ = host_resolver_->Resolve(info, net::DEFAULT_PRIORITY, &addresses_,
+                                      base::Bind(&ResolveCompletionCallback),
+                                      &request_, net_log_);
   }
 
   void SetDefaultIPConfigs(const std::string& default_device_path) {
     const std::string kTestIPv4ConfigPath("test_ip_v4_config_path");
     const std::string kTestIPv6ConfigPath("test_ip_v6_config_path");
 
     SetIPConfig(kTestIPv4ConfigPath, shill::kTypeIPv4, kTestIPv4Address);
     SetIPConfig(kTestIPv6ConfigPath, shill::kTypeIPv6, kTestIPv6Address);
     base::RunLoop().RunUntilIdle();
 
@@ skipping 22 matching lines @@
         dbus::ObjectPath(path),
         shill::kMethodProperty,
         base::StringValue(method),
         base::Bind(&DoNothingWithCallStatus));
   }
 
   std::unique_ptr<chromeos::NetworkStateHandler> network_state_handler_;
   std::unique_ptr<net::HostResolver> host_resolver_;
   base::MessageLoop io_message_loop_;
   net::BoundNetLog net_log_;
+  std::unique_ptr<net::HostResolver::Request> request_;
 
   DISALLOW_COPY_AND_ASSIGN(HostResolverImplChromeOSTest);
 };
 
 TEST_F(HostResolverImplChromeOSTest, Resolve) {
   net::HostResolver::RequestInfo info(
       net::HostPortPair(net::GetHostName(), 80));
   info.set_address_family(net::ADDRESS_FAMILY_IPV4);
   info.set_is_my_ip_address(true);
   EXPECT_EQ(net::OK, CallResolve(info));
   ASSERT_EQ(1u, addresses_.size());
   std::string expected = base::StringPrintf("%s:%d", kTestIPv4Address, 0);
   EXPECT_EQ(expected, addresses_[0].ToString());
 
   info.set_address_family(net::ADDRESS_FAMILY_IPV6);
   EXPECT_EQ(net::OK, CallResolve(info));
   ASSERT_EQ(2u, addresses_.size());
   expected = base::StringPrintf("[%s]:%d", kTestIPv6Address, 0);
   EXPECT_EQ(expected, addresses_[0].ToString());
   expected = base::StringPrintf("%s:%d", kTestIPv4Address, 0);
   EXPECT_EQ(expected, addresses_[1].ToString());
 }