Refactoring: ProtocolHandler::MaybeCreateJob takes NetworkDelegate as argument

chrome/browser/captive_portal/captive_portal_browsertest.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 <map>
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 116 matching lines @@
 
  private:
   friend class URLRequestMockCaptivePortalJobFactory;
 
   // Operation to perform on jobs when removing them from |job_list_|.
   enum EndJobOperation {
     FAIL_JOBS,
     ABANDON_JOBS,
   };
 
-  explicit URLRequestTimeoutOnDemandJob(net::URLRequest* request);
+  URLRequestTimeoutOnDemandJob(net::URLRequest* request,
+                               net::NetworkDelegate* network_delegate);
   virtual ~URLRequestTimeoutOnDemandJob();
 
   // Attempts to removes |this| from |jobs_|.  Returns true if it was removed
   // from the list.
   bool RemoveFromList();
 
   static void WaitForJobsOnIOThread(int num_jobs);
   static void FailOrAbandonJobsOnIOThread(
       int expected_num_jobs,
       EndJobOperation end_job_operation);
@@ skipping 71 matching lines @@
 // static
 void URLRequestTimeoutOnDemandJob::AbandonJobs(int expected_num_jobs) {
   content::BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE,
       base::Bind(&URLRequestTimeoutOnDemandJob::FailOrAbandonJobsOnIOThread,
                  expected_num_jobs,
                  ABANDON_JOBS));
 }
 
 URLRequestTimeoutOnDemandJob::URLRequestTimeoutOnDemandJob(
-    net::URLRequest* request)
-    : net::URLRequestJob(request, request->context()->network_delegate()),
+    net::URLRequest* request, net::NetworkDelegate* network_delegate)
+    : net::URLRequestJob(request, network_delegate),
       next_job_(NULL) {
 }
 
 URLRequestTimeoutOnDemandJob::~URLRequestTimeoutOnDemandJob() {
   // All hanging jobs should have failed or been abandoned before being
   // destroyed.
   EXPECT_FALSE(RemoveFromList());
 }
 
 bool URLRequestTimeoutOnDemandJob::RemoveFromList() {
@@ skipping 95 matching lines @@
   // These do all the work of the corresponding public functions, with the only
   // difference being that they must be called on the IO thread.
   static void AddUrlHandlersOnIOThread();
   static void SetBehindCaptivePortalOnIOThread(bool behind_captive_portal);
 
   // Returns a URLRequestJob that reflects the current captive portal state
   // for the URLs: kMockCaptivePortalTestUrl, kMockHttpsUrl, and
   // kMockHttpsQuickTimeoutUrl.  See documentation of individual URLs for
   // actual behavior.
   static net::URLRequestJob* Factory(net::URLRequest* request,
+                                     net::NetworkDelegate* network_delegate,
                                      const std::string& scheme);
 
   static bool behind_captive_portal_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(URLRequestMockCaptivePortalJobFactory);
 };
 
 bool URLRequestMockCaptivePortalJobFactory::behind_captive_portal_ = true;
 
 // static
@@ skipping 35 matching lines @@
 // static
 void URLRequestMockCaptivePortalJobFactory::SetBehindCaptivePortalOnIOThread(
     bool behind_captive_portal) {
   EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::IO));
   behind_captive_portal_ = behind_captive_portal;
 }
 
 // static
 net::URLRequestJob* URLRequestMockCaptivePortalJobFactory::Factory(
     net::URLRequest* request,
+    net::NetworkDelegate* network_delegate,
     const std::string& scheme) {
   EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   // The PathService is threadsafe.
   FilePath root_http;
   PathService::Get(chrome::DIR_TEST_DATA, &root_http);
 
   if (request->url() == GURL(kMockHttpsUrl) ||
       request->url() == GURL(kMockHttpsUrl2)) {
     if (behind_captive_portal_)
-      return new URLRequestTimeoutOnDemandJob(request);
+      return new URLRequestTimeoutOnDemandJob(request, network_delegate);
     // Once logged in to the portal, HTTPS requests return the page that was
     // actually requested.
     return new URLRequestMockHTTPJob(
         request,
+        network_delegate,
         root_http.Append(FILE_PATH_LITERAL("title2.html")));
   } else if (request->url() == GURL(kMockHttpsQuickTimeoutUrl)) {
     if (behind_captive_portal_)
-      return new URLRequestFailedJob(request, net::ERR_CONNECTION_TIMED_OUT);
+      return new URLRequestFailedJob(
+          request, network_delegate, net::ERR_CONNECTION_TIMED_OUT);
     // Once logged in to the portal, HTTPS requests return the page that was
     // actually requested.
     return new URLRequestMockHTTPJob(
         request,
+        network_delegate,
         root_http.Append(FILE_PATH_LITERAL("title2.html")));
   } else {
     // The URL should be the captive portal test URL.
     EXPECT_EQ(GURL(kMockCaptivePortalTestUrl), request->url());
 
     if (behind_captive_portal_) {
       // Prior to logging in to the portal, HTTP requests go to the login page.
       return new URLRequestMockHTTPJob(
           request,
+          network_delegate,
           root_http.Append(FILE_PATH_LITERAL("captive_portal/login.html")));
     }
 
     // After logging in to the portal, the test URL returns a 204 response.
     return new URLRequestMockHTTPJob(
         request,
+        network_delegate,
         root_http.Append(FILE_PATH_LITERAL("captive_portal/page204.html")));
   }
 }
 
 // Creates a server-side redirect for use with the TestServer.
 std::string CreateServerRedirect(const std::string& dest_url) {
   const char* const kServerRedirectBase = "server-redirect?";
   return kServerRedirectBase + dest_url;
 }
 
@@ skipping 1620 matching lines @@
       base::Bind(&AddHstsHost,
                  make_scoped_refptr(browser()->profile()->GetRequestContext()),
                  http_timeout_url.host()));
 
   SlowLoadBehindCaptivePortal(browser(), true, http_timeout_url);
   Login(browser(), 1, 0);
   FailLoadsAfterLogin(browser(), 1);
 }
 
 }  // namespace captive_portal