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

net/dns/mapped_host_resolver_unittest.cc

Index: net/dns/mapped_host_resolver_unittest.cc
diff --git a/net/dns/mapped_host_resolver_unittest.cc b/net/dns/mapped_host_resolver_unittest.cc
index 65332f2a8df2354d48ea137bb132a18ffe9c2b59..830eeba88ef27bac10814da2a2f8535deb08dd81 100644
--- a/net/dns/mapped_host_resolver_unittest.cc
+++ b/net/dns/mapped_host_resolver_unittest.cc
@@ -46,12 +46,10 @@ TEST(MappedHostResolverTest, Inclusion) {
   // 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();
@@ -61,12 +59,10 @@ TEST(MappedHostResolverTest, Inclusion) {
   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();
@@ -75,12 +71,10 @@ TEST(MappedHostResolverTest, Inclusion) {
 
   // 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());
@@ -90,12 +84,10 @@ TEST(MappedHostResolverTest, Inclusion) {
   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();
@@ -125,12 +117,10 @@ TEST(MappedHostResolverTest, Exclusion) {
   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();
@@ -138,12 +128,10 @@ TEST(MappedHostResolverTest, Exclusion) {
   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();
@@ -169,12 +157,10 @@ TEST(MappedHostResolverTest, SetRulesFromString) {
   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();
@@ -182,12 +168,10 @@ TEST(MappedHostResolverTest, SetRulesFromString) {
   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();
@@ -226,23 +210,19 @@ TEST(MappedHostResolverTest, MapToError) {
 
   // 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();