Refactoring: ProtocolHandler::MaybeCreateJob and other functions take NetworkDelegate as argument

This change goes a long way to prepare for removing NetworkDelegate from URLRequestContext.

TBR=sky@chromium.org, michaeln@chromium.org, benjhayden@chromium.org, brettw@chromium.org, ben@chromium.org, davemoore@chromium.org, zelidrag@chromium.org, mnissler@chromium.org, thestig@chromium.org, asargent@chromium.org, jhawkins@chromium.org, bulach@chromium.org

BUG=crbug.com/142945

Review URL: https://chromiumcodereview.appspot.com/10855209

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153133 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 8 insertions, 3 deletions

diff --git a/chrome_frame/test/net/test_automation_provider.cc b/chrome_frame/test/net/test_automation_provider.cc
index 980b3e5..9012a19 100644
--- a/chrome_frame/test/net/test_automation_provider.cc
+++ b/chrome_frame/test/net/test_automation_provider.cc
@@ -69,8 +69,10 @@ bool TestAutomationProvider::Send(IPC::Message* msg) {
   return AutomationProvider::Send(msg);
 }
 
-net::URLRequestJob* TestAutomationProvider::Factory(net::URLRequest* request,
-                                                    const std::string& scheme) {
+net::URLRequestJob* TestAutomationProvider::Factory(
+    net::URLRequest* request,
+    net::NetworkDelegate* network_delegate,
+    const std::string& scheme) {
   if (CFTestsDisabled())
     return NULL;
 
@@ -89,7 +91,8 @@ net::URLRequestJob* TestAutomationProvider::Factory(net::URLRequest* request,
       // and without userdata, we're OK.  However, just to make debugging
       // a little easier, we have a significantly higher start value.
       static int new_id = 0x00100000;
-      URLRequestAutomationJob* job = new URLRequestAutomationJob(request,
+      URLRequestAutomationJob* job = new URLRequestAutomationJob(
+          request, network_delegate,
           g_provider_instance_->tab_handle_, new_id++,
           g_provider_instance_->automation_resource_message_filter_, false);
       return job;
diff --git a/chrome_frame/test/net/test_automation_provider.h b/chrome_frame/test/net/test_automation_provider.h
index 76c74b8..2c84d76 100644
--- a/chrome_frame/test/net/test_automation_provider.h
+++ b/chrome_frame/test/net/test_automation_provider.h
@@ -8,6 +8,7 @@
 #include "chrome/browser/automation/automation_provider.h"
 
 namespace net {
+class NetworkDelegate;
 class URLRequest;
 class URLRequestJob;
 }  // namespace net
@@ -42,6 +43,7 @@ class TestAutomationProvider
 
   // Protocol factory for handling http/https requests over automation.
   static net::URLRequestJob* Factory(net::URLRequest* request,
+                                     net::NetworkDelegate* network_delegate,
                                      const std::string& scheme);
 
   // Call to instantiate and initialize a new instance of