Reland "Change ProxyResolver::GetProxyForURL() to take a unique_ptr<Request>* "

net/http/http_stream_factory_impl_job_controller_unittest.cc

 // Copyright (c) 2016 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/http/http_stream_factory_impl_job_controller.h"
 
 #include <memory>
 
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
@@ skipping 601 matching lines @@
   EXPECT_TRUE(job_controller_->main_job());
   EXPECT_TRUE(job_controller_->alternative_job());
 
   MockAsyncProxyResolver resolver;
   proxy_resolver_factory->pending_requests()[0]->CompleteNowWithForwarder(
       net::OK, &resolver);
 
   // Resolve proxy for the main job which then proceed to wait for the
   // alternative job which is IO_PENDING.
   int main_job_request_id =
-      resolver.pending_requests()[0]->url().SchemeIs("http") ? 0 : 1;
+      resolver.pending_jobs()[0]->url().SchemeIs("http") ? 0 : 1;
 
-  resolver.pending_requests()[main_job_request_id]->results()->UseNamedProxy(
+  resolver.pending_jobs()[main_job_request_id]->results()->UseNamedProxy(
       "result1:80");
-  resolver.pending_requests()[main_job_request_id]->CompleteNow(net::OK);
+  resolver.pending_jobs()[main_job_request_id]->CompleteNow(net::OK);
   EXPECT_TRUE(job_controller_->main_job()->is_waiting());
 
   // Resolve proxy for the alternative job to proceed to create a connection.
   // Use hanging HostResolver to fail creation of a SPDY session for the
   // alternative job. The alternative job will be IO_PENDING thus should resume
   // the main job.
-  resolver.pending_requests()[0]->CompleteNow(net::OK);
+  resolver.pending_jobs()[0]->CompleteNow(net::OK);
   EXPECT_CALL(request_delegate_, OnStreamFailed(_, _)).Times(0);
   EXPECT_CALL(*job_factory_.main_job(), Resume()).Times(1);
 
   base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(HttpStreamFactoryImplJobControllerTest,
        NoAvailableQuicSessionToResumeMainJob) {
   // Use failing HostResolver which is unable to resolve the host name for QUIC.
   // No QUIC session is created and thus should resume the main job.
@@ skipping 29 matching lines @@
   EXPECT_TRUE(job_controller_->main_job());
   EXPECT_TRUE(job_controller_->alternative_job());
 
   MockAsyncProxyResolver resolver;
   proxy_resolver_factory->pending_requests()[0]->CompleteNowWithForwarder(
       net::OK, &resolver);
 
   // Resolve proxy for the main job which then proceed to wait for the
   // alternative job which is IO_PENDING.
   int main_job_request_id =
-      resolver.pending_requests()[0]->url().SchemeIs("http") ? 0 : 1;
+      resolver.pending_jobs()[0]->url().SchemeIs("http") ? 0 : 1;
 
-  resolver.pending_requests()[main_job_request_id]->results()->UseNamedProxy(
+  resolver.pending_jobs()[main_job_request_id]->results()->UseNamedProxy(
       "result1:80");
-  resolver.pending_requests()[main_job_request_id]->CompleteNow(net::OK);
+  resolver.pending_jobs()[main_job_request_id]->CompleteNow(net::OK);
   EXPECT_TRUE(job_controller_->main_job()->is_waiting());
 
   // Resolve proxy for the alternative job to proceed to create a connection.
   // Use failing HostResolver to fail creation of a QUIC session for the
   // alternative job. The alternative job will thus resume the main job.
-  resolver.pending_requests()[0]->results()->UseNamedProxy("result1:80");
-  resolver.pending_requests()[0]->CompleteNow(net::OK);
+  resolver.pending_jobs()[0]->results()->UseNamedProxy("result1:80");
+  resolver.pending_jobs()[0]->CompleteNow(net::OK);
 
   // Wait until OnStreamFailedCallback is executed on the alternative job.
   // Request shouldn't be notified as the main job is still pending status.
   EXPECT_CALL(request_delegate_, OnStreamFailed(_, _)).Times(0);
   EXPECT_CALL(*job_factory_.main_job(), Resume()).Times(1);
 
   base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(HttpStreamFactoryImplJobControllerTest, DelayedTCP) {
@@ skipping 242 matching lines @@
   // Reset the request as it's been successfully served.
   request_.reset();
   EXPECT_TRUE(HttpStreamFactoryImplPeer::IsJobControllerDeleted(factory_));
 
   histogram_tester.ExpectUniqueSample("Net.QuicAlternativeProxy.Usage",
                                       2 /* ALTERNATIVE_PROXY_USAGE_LOST_RACE */,
                                       1);
 }
 
 }  // namespace net