Refactoring: ProtocolHandler::MaybeCreateJob takes NetworkDelegate as argument

chrome/browser/automation/url_request_automation_job.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 "chrome/browser/automation/url_request_automation_job.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/time.h"
@@ skipping 34 matching lines @@
 int URLRequestAutomationJob::instance_count_ = 0;
 bool URLRequestAutomationJob::is_protocol_factory_registered_ = false;
 
 net::URLRequest::ProtocolFactory* URLRequestAutomationJob::old_http_factory_
     = NULL;
 net::URLRequest::ProtocolFactory* URLRequestAutomationJob::old_https_factory_
     = NULL;
 
 URLRequestAutomationJob::URLRequestAutomationJob(
     net::URLRequest* request,
+    net::NetworkDelegate* network_delegate,
     int tab,
     int request_id,
     AutomationResourceMessageFilter* filter,
     bool is_pending)
-    : net::URLRequestJob(request, request->context()->network_delegate()),
+    : net::URLRequestJob(request, network_delegate),
       id_(0),
       tab_(tab),
       message_filter_(filter),
       pending_buf_size_(0),
       redirect_status_(0),
       request_id_(request_id),
       is_pending_(is_pending),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
   DVLOG(1) << "URLRequestAutomationJob create. Count: " << ++instance_count_;
   DCHECK(message_filter_ != NULL);
@@ skipping 18 matching lines @@
             "http", &URLRequestAutomationJob::Factory);
     old_https_factory_ =
         net::URLRequest::Deprecated::RegisterProtocolFactory(
             "https", &URLRequestAutomationJob::Factory);
     is_protocol_factory_registered_ = true;
   }
 }
 
 net::URLRequestJob* URLRequestAutomationJob::Factory(
     net::URLRequest* request,
+    net::NetworkDelegate* network_delegate,
     const std::string& scheme) {
   bool scheme_is_http = request->url().SchemeIs("http");
   bool scheme_is_https = request->url().SchemeIs("https");
 
   // Returning null here just means that the built-in handler will be used.
   if (scheme_is_http || scheme_is_https) {
     const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request);
     if (info) {
       int child_id = info->GetChildID();
       int route_id = info->GetRouteID();
       AutomationResourceMessageFilter::AutomationDetails details;
       if (AutomationResourceMessageFilter::LookupRegisteredRenderView(
               child_id, route_id, &details)) {
-        URLRequestAutomationJob* job = new URLRequestAutomationJob(request,
+        URLRequestAutomationJob* job = new URLRequestAutomationJob(
+            request, network_delegate,
             details.tab_handle, info->GetRequestID(), details.filter,
             details.is_pending_render_view);
         return job;
       }
     }
 
     if (scheme_is_http && old_http_factory_)
-      return old_http_factory_(request, scheme);
+      return old_http_factory_(request, network_delegate, scheme);
     else if (scheme_is_https && old_https_factory_)
-      return old_https_factory_(request, scheme);
+      return old_https_factory_(request, network_delegate, scheme);
   }
   return NULL;
 }
 
 // net::URLRequestJob Implementation.
 void URLRequestAutomationJob::Start() {
   if (!is_pending()) {
     // Start reading asynchronously so that all error reporting and data
     // callbacks happen as they would for network requests.
     MessageLoop::current()->PostTask(
@@ skipping 353 matching lines @@
   if (!is_done()) {
     NotifyDone(request_status_);
   }
   // Reset any pending reads.
   if (pending_buf_) {
     pending_buf_ = NULL;
     pending_buf_size_ = 0;
     NotifyReadComplete(0);
   }
 }