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

net/dns/mapped_host_resolver_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/dns/mapped_host_resolver.h"
 
 #include <utility>
 
 #include "net/base/address_list.h"
 #include "net/base/net_errors.h"
@@ skipping 28 matching lines @@
   // Create a remapped resolver that uses |resolver_impl|.
   std::unique_ptr<MappedHostResolver> resolver(
       new MappedHostResolver(std::move(resolver_impl)));
 
   int rv;
   AddressList address_list;
 
   // Try resolving "www.google.com:80". There are no mappings yet, so this
   // hits |resolver_impl| and fails.
   TestCompletionCallback callback;
+  std::unique_ptr<HostResolver::Request> req1;
   rv = resolver->Resolve(
       HostResolver::RequestInfo(HostPortPair("www.google.com", 80)),
-      DEFAULT_PRIORITY,
-      &address_list,
-      callback.callback(),
-      NULL,
+      DEFAULT_PRIORITY, &address_list, callback.callback(), &req1,
       BoundNetLog());
   EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
   rv = callback.WaitForResult();
   EXPECT_THAT(rv, IsError(ERR_NAME_NOT_RESOLVED));
 
   // Remap *.google.com to baz.com.
   EXPECT_TRUE(resolver->AddRuleFromString("map *.google.com baz.com"));
 
   // Try resolving "www.google.com:80". Should be remapped to "baz.com:80".
+  std::unique_ptr<HostResolver::Request> req2;
   rv = resolver->Resolve(
       HostResolver::RequestInfo(HostPortPair("www.google.com", 80)),
-      DEFAULT_PRIORITY,
-      &address_list,
-      callback.callback(),
-      NULL,
+      DEFAULT_PRIORITY, &address_list, callback.callback(), &req2,
       BoundNetLog());
   EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
   rv = callback.WaitForResult();
   EXPECT_THAT(rv, IsOk());
   EXPECT_EQ("192.168.1.5:80", FirstAddress(address_list));
 
   // Try resolving "foo.com:77". This will NOT be remapped, so result
   // is "foo.com:77".
+  std::unique_ptr<HostResolver::Request> req3;
   rv = resolver->Resolve(HostResolver::RequestInfo(HostPortPair("foo.com", 77)),
-                         DEFAULT_PRIORITY,
-                         &address_list,
-                         callback.callback(),
-                         NULL,
-                         BoundNetLog());
+                         DEFAULT_PRIORITY, &address_list, callback.callback(),
+                         &req3, BoundNetLog());
   EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
   rv = callback.WaitForResult();
   EXPECT_THAT(rv, IsOk());
   EXPECT_EQ("192.168.1.8:77", FirstAddress(address_list));
 
   // Remap "*.org" to "proxy:99".
   EXPECT_TRUE(resolver->AddRuleFromString("Map *.org proxy:99"));
 
   // Try resolving "chromium.org:61". Should be remapped to "proxy:99".
+  std::unique_ptr<HostResolver::Request> req4;
   rv = resolver->Resolve(
       HostResolver::RequestInfo(HostPortPair("chromium.org", 61)),
-      DEFAULT_PRIORITY,
-      &address_list,
-      callback.callback(),
-      NULL,
+      DEFAULT_PRIORITY, &address_list, callback.callback(), &req4,
       BoundNetLog());
   EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
   rv = callback.WaitForResult();
   EXPECT_THAT(rv, IsOk());
   EXPECT_EQ("192.168.1.11:99", FirstAddress(address_list));
 }
 
 // Tests that exclusions are respected.
 TEST(MappedHostResolverTest, Exclusion) {
   // Create a mock host resolver, with specific hostname to IP mappings.
   std::unique_ptr<MockHostResolver> resolver_impl(new MockHostResolver());
   resolver_impl->rules()->AddRule("baz", "192.168.1.5");
   resolver_impl->rules()->AddRule("www.google.com", "192.168.1.3");
 
   // Create a remapped resolver that uses |resolver_impl|.
   std::unique_ptr<MappedHostResolver> resolver(
       new MappedHostResolver(std::move(resolver_impl)));
 
   int rv;
   AddressList address_list;
   TestCompletionCallback callback;
 
   // Remap "*.com" to "baz".
   EXPECT_TRUE(resolver->AddRuleFromString("map *.com baz"));
 
   // Add an exclusion for "*.google.com".
   EXPECT_TRUE(resolver->AddRuleFromString("EXCLUDE *.google.com"));
 
   // Try resolving "www.google.com". Should not be remapped due to exclusion).
+  std::unique_ptr<HostResolver::Request> req1;
   rv = resolver->Resolve(
       HostResolver::RequestInfo(HostPortPair("www.google.com", 80)),
-      DEFAULT_PRIORITY,
-      &address_list,
-      callback.callback(),
-      NULL,
+      DEFAULT_PRIORITY, &address_list, callback.callback(), &req1,
       BoundNetLog());
   EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
   rv = callback.WaitForResult();
   EXPECT_THAT(rv, IsOk());
   EXPECT_EQ("192.168.1.3:80", FirstAddress(address_list));
 
   // Try resolving "chrome.com:80". Should be remapped to "baz:80".
+  std::unique_ptr<HostResolver::Request> req2;
   rv = resolver->Resolve(
       HostResolver::RequestInfo(HostPortPair("chrome.com", 80)),
-      DEFAULT_PRIORITY,
-      &address_list,
-      callback.callback(),
-      NULL,
+      DEFAULT_PRIORITY, &address_list, callback.callback(), &req2,
       BoundNetLog());
   EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
   rv = callback.WaitForResult();
   EXPECT_THAT(rv, IsOk());
   EXPECT_EQ("192.168.1.5:80", FirstAddress(address_list));
 }
 
 TEST(MappedHostResolverTest, SetRulesFromString) {
   // Create a mock host resolver, with specific hostname to IP mappings.
   std::unique_ptr<MockHostResolver> resolver_impl(new MockHostResolver());
   resolver_impl->rules()->AddRule("baz", "192.168.1.7");
   resolver_impl->rules()->AddRule("bar", "192.168.1.9");
 
   // Create a remapped resolver that uses |resolver_impl|.
   std::unique_ptr<MappedHostResolver> resolver(
       new MappedHostResolver(std::move(resolver_impl)));
 
   int rv;
   AddressList address_list;
   TestCompletionCallback callback;
 
   // Remap "*.com" to "baz", and *.net to "bar:60".
   resolver->SetRulesFromString("map *.com baz , map *.net bar:60");
 
   // Try resolving "www.google.com". Should be remapped to "baz".
+  std::unique_ptr<HostResolver::Request> req1;
   rv = resolver->Resolve(
       HostResolver::RequestInfo(HostPortPair("www.google.com", 80)),
-      DEFAULT_PRIORITY,
-      &address_list,
-      callback.callback(),
-      NULL,
+      DEFAULT_PRIORITY, &address_list, callback.callback(), &req1,
       BoundNetLog());
   EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
   rv = callback.WaitForResult();
   EXPECT_THAT(rv, IsOk());
   EXPECT_EQ("192.168.1.7:80", FirstAddress(address_list));
 
   // Try resolving "chrome.net:80". Should be remapped to "bar:60".
+  std::unique_ptr<HostResolver::Request> req2;
   rv = resolver->Resolve(
       HostResolver::RequestInfo(HostPortPair("chrome.net", 80)),
-      DEFAULT_PRIORITY,
-      &address_list,
-      callback.callback(),
-      NULL,
+      DEFAULT_PRIORITY, &address_list, callback.callback(), &req2,
       BoundNetLog());
   EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
   rv = callback.WaitForResult();
   EXPECT_THAT(rv, IsOk());
   EXPECT_EQ("192.168.1.9:60", FirstAddress(address_list));
 }
 
 // Parsing bad rules should silently discard the rule (and never crash).
 TEST(MappedHostResolverTest, ParseInvalidRules) {
   std::unique_ptr<MappedHostResolver> resolver(
@@ skipping 18 matching lines @@
       new MappedHostResolver(std::move(resolver_impl)));
 
   int rv;
   AddressList address_list;
 
   // Remap *.google.com to resolving failures.
   EXPECT_TRUE(resolver->AddRuleFromString("MAP *.google.com ~NOTFOUND"));
 
   // Try resolving www.google.com --> Should give an error.
   TestCompletionCallback callback1;
+  std::unique_ptr<HostResolver::Request> req1;
   rv = resolver->Resolve(
       HostResolver::RequestInfo(HostPortPair("www.google.com", 80)),
-      DEFAULT_PRIORITY,
-      &address_list,
-      callback1.callback(),
-      NULL,
+      DEFAULT_PRIORITY, &address_list, callback1.callback(), &req1,
       BoundNetLog());
   EXPECT_THAT(rv, IsError(ERR_NAME_NOT_RESOLVED));
 
   // Try resolving www.foo.com --> Should succeed.
   TestCompletionCallback callback2;
+  std::unique_ptr<HostResolver::Request> req2;
   rv = resolver->Resolve(
       HostResolver::RequestInfo(HostPortPair("www.foo.com", 80)),
-      DEFAULT_PRIORITY,
-      &address_list,
-      callback2.callback(),
-      NULL,
+      DEFAULT_PRIORITY, &address_list, callback2.callback(), &req2,
       BoundNetLog());
   EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
   rv = callback2.WaitForResult();
   EXPECT_THAT(rv, IsOk());
   EXPECT_EQ("192.168.1.5:80", FirstAddress(address_list));
 }
 
 }  // namespace
 
 }  // namespace net