Refactoring: ProtocolHandler::MaybeCreateJob takes NetworkDelegate as argument

content/test/net/url_request_mock_http_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 "content/test/net/url_request_mock_http_job.h"
 
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/utf_string_conversions.h"
 #include "content/public/common/url_constants.h"
 #include "net/base/net_util.h"
 #include "net/http/http_response_headers.h"
-#include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_filter.h"
 
 const char kMockHostname[] = "mock.http";
 const FilePath::CharType kMockHeaderFileSuffix[] =
     FILE_PATH_LITERAL(".mock-http-headers");
 
 namespace {
 
 // This is the file path leading to the root of the directory to use as the
 // root of the http server. This returns a reference that can be assigned to.
 FilePath& BasePath() {
   CR_DEFINE_STATIC_LOCAL(FilePath, base_path, ());
   return base_path;
 }
 
 }  // namespace
 
 // static
-net::URLRequestJob* URLRequestMockHTTPJob::Factory(net::URLRequest* request,
-                                                   const std::string& scheme) {
+net::URLRequestJob* URLRequestMockHTTPJob::Factory(
+    net::URLRequest* request,
+    net::NetworkDelegate* network_delegate,
+    const std::string& scheme) {
   return new URLRequestMockHTTPJob(request,
+                                   network_delegate,
                                    GetOnDiskPath(BasePath(), request, scheme));
 }
 
 // static
 void URLRequestMockHTTPJob::AddUrlHandler(const FilePath& base_path) {
   BasePath() = base_path;
 
   // Add kMockHostname to net::URLRequestFilter.
   net::URLRequestFilter* filter = net::URLRequestFilter::GetInstance();
   filter->AddHostnameHandler("http", kMockHostname,
@@ skipping 27 matching lines @@
   // But path in the request URL is in URL space (i.e. %-encoded spaces).
   // So first we convert base FilePath to a URL, then append the URL
   // path to that, and convert the final URL back to a FilePath.
   GURL file_url(net::FilePathToFileURL(base_path));
   std::string url = file_url.spec() + request->url().path();
   FilePath file_path;
   net::FileURLToFilePath(GURL(url), &file_path);
   return file_path;
 }
 
-URLRequestMockHTTPJob::URLRequestMockHTTPJob(net::URLRequest* request,
-                                             const FilePath& file_path)
-    : net::URLRequestFileJob(request,
-                             file_path,
-                             request->context()->network_delegate()) { }
+URLRequestMockHTTPJob::URLRequestMockHTTPJob(
+    net::URLRequest* request,
+    net::NetworkDelegate* network_delegate,
+    const FilePath& file_path)
+    : net::URLRequestFileJob(request, network_delegate, file_path) { }
 
 // Public virtual version.
 void URLRequestMockHTTPJob::GetResponseInfo(net::HttpResponseInfo* info) {
   // Forward to private const version.
   GetResponseInfoConst(info);
 }
 
 bool URLRequestMockHTTPJob::IsRedirectResponse(GURL* location,
                                                int* http_status_code) {
   // Override the net::URLRequestFileJob implementation to invoke the default
@@ skipping 31 matching lines @@
   if (info.headers)
     return info.headers->response_code();
   return net::URLRequestJob::GetResponseCode();
 }
 
 bool URLRequestMockHTTPJob::GetCharset(std::string* charset) {
   net::HttpResponseInfo info;
   GetResponseInfo(&info);
   return info.headers && info.headers->GetCharset(charset);
 }