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

net/socket/socks5_client_socket_unittest.cc

 // Copyright (c) 2012 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 "net/socket/socks5_client_socket.h"
 
 #include <algorithm>
 #include <iterator>
 #include <map>
 #include <utility>
@@ skipping 47 matching lines @@
   std::unique_ptr<SOCKS5ClientSocket> user_sock_;
   AddressList address_list_;
   // Filled in by BuildMockSocket() and owned by its return value
   // (which |user_sock| is set to).
   StreamSocket* tcp_sock_;
   TestCompletionCallback callback_;
   std::unique_ptr<MockHostResolver> host_resolver_;
   std::unique_ptr<SocketDataProvider> data_;
 
  private:
+  std::unique_ptr<HostResolver::Request> request_;

[mmenke, 2016/07/19 19:03:56]

This doesn't need to be a member of the class - can move this down into SetUp,
since it's only used there.

[maksims (do not use this acc), 2016/07/21 07:12:46]

Done.

   DISALLOW_COPY_AND_ASSIGN(SOCKS5ClientSocketTest);
 };
 
 SOCKS5ClientSocketTest::SOCKS5ClientSocketTest()
   : kNwPort(base::HostToNet16(80)),
     host_resolver_(new MockHostResolver) {
 }
 
 // Set up platform before every test case
 void SOCKS5ClientSocketTest::SetUp() {
   PlatformTest::SetUp();
 
   // Resolve the "localhost" AddressList used by the TCP connection to connect.
   HostResolver::RequestInfo info(HostPortPair("www.socks-proxy.com", 1080));
   TestCompletionCallback callback;
-  int rv = host_resolver_->Resolve(info,
-                                   DEFAULT_PRIORITY,
-                                   &address_list_,
-                                   callback.callback(),
-                                   NULL,
-                                   BoundNetLog());
+  int rv =
+      host_resolver_->Resolve(info, DEFAULT_PRIORITY, &address_list_,
+                              callback.callback(), &request_, BoundNetLog());
   ASSERT_THAT(rv, IsError(ERR_IO_PENDING));
   rv = callback.WaitForResult();
   ASSERT_THAT(rv, IsOk());
 }
 
 std::unique_ptr<SOCKS5ClientSocket> SOCKS5ClientSocketTest::BuildMockSocket(
     MockRead reads[],
     size_t reads_count,
     MockWrite writes[],
     size_t writes_count,
@@ skipping 281 matching lines @@
     EXPECT_TRUE(user_sock_->IsConnected());
     net_log_.GetEntries(&net_log_entries);
     EXPECT_TRUE(LogContainsEndEvent(net_log_entries, -1,
                                     NetLog::TYPE_SOCKS5_CONNECT));
   }
 }
 
 }  // namespace
 
 }  // namespace net