Make URLRequestFilter use URLRequestInterceptors.

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/message_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/threading/thread_restrictions.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/url_constants.h"
 #include "net/base/filename_util.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request_filter.h"
+#include "net/url_request/url_request_interceptor.h"
 
 const char kMockHostname[] = "mock.http";
 const base::FilePath::CharType kMockHeaderFileSuffix[] =
     FILE_PATH_LITERAL(".mock-http-headers");
 
 namespace content {
 
 namespace {
 
-class ProtocolHandler : public net::URLRequestJobFactory::ProtocolHandler {
+class MockJobInterceptor : public net::URLRequestInterceptor {
  public:
   // When |map_all_requests_to_base_path| is true, all request should return the
   // contents of the file at |base_path|. When |map_all_requests_to_base_path|
   // is false, |base_path| is the file path leading to the root of the directory
   // to use as the root of the HTTP server.
-  explicit ProtocolHandler(const base::FilePath& base_path,
-                           bool map_all_requests_to_base_path)
+  MockJobInterceptor(const base::FilePath& base_path,
+                     bool map_all_requests_to_base_path)
       : base_path_(base_path),
         map_all_requests_to_base_path_(map_all_requests_to_base_path) {}
-  virtual ~ProtocolHandler() {}
+  virtual ~MockJobInterceptor() {}
 
   // net::URLRequestJobFactory::ProtocolHandler implementation
-  virtual net::URLRequestJob* MaybeCreateJob(
+  virtual net::URLRequestJob* MaybeInterceptRequest(
       net::URLRequest* request,
       net::NetworkDelegate* network_delegate) const OVERRIDE {
     return new URLRequestMockHTTPJob(request, network_delegate,
         map_all_requests_to_base_path_ ? base_path_ : GetOnDiskPath(request));
   }
 
  private:
   base::FilePath GetOnDiskPath(net::URLRequest* request) const {
     // Conceptually we just want to "return base_path_ + request->url().path()".
     // 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();
     base::FilePath file_path;
     net::FileURLToFilePath(GURL(url), &file_path);
     return file_path;
   }
 
   const base::FilePath base_path_;
   const bool map_all_requests_to_base_path_;
 
-  DISALLOW_COPY_AND_ASSIGN(ProtocolHandler);
+  DISALLOW_COPY_AND_ASSIGN(MockJobInterceptor);
 };
 
 }  // namespace
 
 // static
 void URLRequestMockHTTPJob::AddUrlHandler(const base::FilePath& base_path) {
   // Add kMockHostname to net::URLRequestFilter.
   net::URLRequestFilter* filter = net::URLRequestFilter::GetInstance();
-  filter->AddHostnameProtocolHandler("http", kMockHostname,
-      CreateProtocolHandler(base_path));
+  filter->AddHostnameInterceptor(
+      "http", kMockHostname, CreateInterceptor(base_path));
 }
 
 // static
 void URLRequestMockHTTPJob::AddHostnameToFileHandler(
     const std::string& hostname,
     const base::FilePath& file) {
   net::URLRequestFilter* filter = net::URLRequestFilter::GetInstance();
-  filter->AddHostnameProtocolHandler(
-      "http", hostname, CreateProtocolHandlerForSingleFile(file));
+  filter->AddHostnameInterceptor(
+      "http", hostname, CreateInterceptorForSingleFile(file));
 }
 
 // static
 GURL URLRequestMockHTTPJob::GetMockUrl(const base::FilePath& path) {
   std::string url = "http://";
   url.append(kMockHostname);
   url.append("/");
   std::string path_str = path.MaybeAsASCII();
   DCHECK(!path_str.empty());  // We only expect ASCII paths in tests.
   url.append(path_str);
   return GURL(url);
 }
 
 // static
 GURL URLRequestMockHTTPJob::GetMockViewSourceUrl(const base::FilePath& path) {
   std::string url = kViewSourceScheme;
   url.append(":");
   url.append(GetMockUrl(path).spec());
   return GURL(url);
 }
 
 // static
-scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
-URLRequestMockHTTPJob::CreateProtocolHandler(const base::FilePath& base_path) {
-  return scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>(
-      new ProtocolHandler(base_path, false));
+scoped_ptr<net::URLRequestInterceptor>
+URLRequestMockHTTPJob::CreateInterceptor(const base::FilePath& base_path) {
+  return scoped_ptr<net::URLRequestInterceptor>(
+      new MockJobInterceptor(base_path, false));
 }
 
 // static
-scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
-URLRequestMockHTTPJob::CreateProtocolHandlerForSingleFile(
+scoped_ptr<net::URLRequestInterceptor>
+URLRequestMockHTTPJob::CreateInterceptorForSingleFile(
     const base::FilePath& file) {
-  return scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>(
-      new ProtocolHandler(file, true));
+  return scoped_ptr<net::URLRequestInterceptor>(
+      new MockJobInterceptor(file, true));
 }
 
 URLRequestMockHTTPJob::URLRequestMockHTTPJob(
     net::URLRequest* request, net::NetworkDelegate* network_delegate,
     const base::FilePath& file_path)
     : net::URLRequestFileJob(
           request, network_delegate, file_path,
           content::BrowserThread::GetBlockingPool()->
               GetTaskRunnerWithShutdownBehavior(
                   base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)) {}
@@ skipping 53 matching lines @@
   return net::URLRequestJob::GetResponseCode();
 }
 
 bool URLRequestMockHTTPJob::GetCharset(std::string* charset) {
   net::HttpResponseInfo info;
   GetResponseInfo(&info);
   return info.headers.get() && info.headers->GetCharset(charset);
 }
 
 }  // namespace content