Refactoring: ProtocolHandler::MaybeCreateJob takes NetworkDelegate as argument

chrome/browser/printing/print_dialog_cloud_interative_uitest.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/printing/print_dialog_cloud.h"
 #include "chrome/browser/printing/print_dialog_cloud_internal.h"
 
 #include <functional>
 
 #include "base/bind.h"
@@ skipping 11 matching lines @@
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/test_browser_thread.h"
+#include "net/url_request/url_request.h"
 #include "net/url_request/url_request_filter.h"
 #include "net/url_request/url_request_test_job.h"
 #include "net/url_request/url_request_test_util.h"
 #include "ui/ui_controls/ui_controls.h"
 
 using content::BrowserThread;
 
 namespace {
 
 class TestData {
@@ skipping 21 matching lines @@
 
   std::string test_data_;
 
   friend struct DefaultSingletonTraits<TestData>;
 };
 
 // A simple test net::URLRequestJob. We don't care what it does, only that
 // whether it starts and finishes.
 class SimpleTestJob : public net::URLRequestTestJob {
  public:
-  explicit SimpleTestJob(net::URLRequest* request)
-      : net::URLRequestTestJob(request, test_headers(),
-                               TestData::GetInstance()->GetTestData(), true) {}
+  SimpleTestJob(net::URLRequest* request,
+                net::NetworkDelegate* network_delegate)
+      : net::URLRequestTestJob(request,
+                               network_delegate,
+                               test_headers(),
+                               TestData::GetInstance()->GetTestData(),
+                               true) {}
 
   virtual void GetResponseInfo(net::HttpResponseInfo* info) {
     net::URLRequestTestJob::GetResponseInfo(info);
     if (request_->url().SchemeIsSecure()) {
       // Make up a fake certificate for this response since we don't have
       // access to the real SSL info.
       const char* kCertIssuer = "Chrome Internal";
       const int kLifetimeDays = 100;
 
       info->ssl_info.cert =
@@ skipping 127 matching lines @@
                    std::string("application/pdf"), false));
   }
 
   bool handler_added_;
   std::string scheme_;
   std::string host_name_;
   FilePath test_data_directory_;
   AutoQuitDelegate delegate_;
 };
 
-net::URLRequestJob* PrintDialogCloudTest::Factory(net::URLRequest* request,
-                                                  const std::string& scheme) {
+net::URLRequestJob* PrintDialogCloudTest::Factory(
+    net::URLRequest* request,
+    net::NetworkDelegate* network_delegate,
+    const std::string& scheme) {
   if (request &&
       (request->url() == TestController::GetInstance()->expected_url())) {
     if (TestController::GetInstance()->use_delegate())
       request->set_delegate(TestController::GetInstance()->delegate());
     TestController::GetInstance()->set_result(true);
-    return new SimpleTestJob(request);
+    return new SimpleTestJob(request, network_delegate);
   }
   return new net::URLRequestTestJob(request,
+                                    network_delegate,
                                     net::URLRequestTestJob::test_headers(),
-                                    "", true);
+                                    "",
+                                    true);
 }
 
 #if defined(OS_WIN)
 #define MAYBE_HandlersRegistered FLAKY_HandlersRegistered
 #else
 #define MAYBE_HandlersRegistered HandlersRegistered
 #endif
 IN_PROC_BROWSER_TEST_F(PrintDialogCloudTest, MAYBE_HandlersRegistered) {
   AddTestHandlers();
 
@@ skipping 14 matching lines @@
   BrowserWindow* window = browser()->window();
   ASSERT_TRUE(window);
   gfx::NativeWindow native_window = window->GetNativeWindow();
   ASSERT_TRUE(native_window);
   bool key_sent = ui_controls::SendKeyPress(native_window, ui::VKEY_ESCAPE,
                                             false, false, false, false);
   EXPECT_TRUE(key_sent);
   if (key_sent)
     tab_closed_observer.Wait();
 }