enable protocol interceptors

rogerwang · rogerwang · commit 14bc8807b06a · 2015-05-21T09:19:46.000+08:00
diff --git a/src/net/shell_url_request_context_getter.cc b/src/net/shell_url_request_context_getter.cc
@@ -60,6 +60,7 @@
 #include "net/url_request/static_http_user_agent_settings.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_storage.h"
+#include "net/url_request/url_request_intercepting_job_factory.h"
 #include "net/url_request/url_request_job_factory_impl.h"
 #include "ui/base/l10n/l10n_util.h"
 
@@ -132,6 +133,7 @@ ShellURLRequestContextGetter::ShellURLRequestContextGetter(
     MessageLoop* file_loop,
     ProtocolHandlerMap* protocol_handlers,
     ShellBrowserContext* browser_context,
+    URLRequestInterceptorScopedVector request_interceptors,
     const std::string& auth_schemes,
     const std::string& auth_server_whitelist,
     const std::string& auth_delegate_whitelist,
@@ -149,6 +151,7 @@ ShellURLRequestContextGetter::ShellURLRequestContextGetter(
       io_loop_(io_loop),
       file_loop_(file_loop),
       browser_context_(browser_context),
+      request_interceptors_(request_interceptors.Pass()),
       extension_info_map_(extension_info_map){
   // Must first be created on the UI thread.
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ -244,7 +247,7 @@ net::URLRequestContext* ShellURLRequestContextGetter::GetURLRequestContext() {
     net::HttpCache::DefaultBackend* main_backend =
         new net::HttpCache::DefaultBackend(
             net::DISK_CACHE,
-            net::CACHE_BACKEND_SIMPLE,
+            net::CACHE_BACKEND_BLOCKFILE,
             cache_path,
             10 * 1024 * 1024,  // 10M
             BrowserThread::GetMessageLoopProxyForThread(
@@ -292,8 +295,19 @@ net::URLRequestContext* ShellURLRequestContextGetter::GetURLRequestContext() {
                                     new net::AppProtocolHandler(root_path_));
     job_factory->SetProtocolHandler("nw", new nw::NwProtocolHandler());
 
-    storage_->set_job_factory(job_factory.release());
+    // Set up interceptors in the reverse order.
+    scoped_ptr<net::URLRequestJobFactory> top_job_factory =
+        job_factory.Pass();
+    for (URLRequestInterceptorScopedVector::reverse_iterator i =
+             request_interceptors_.rbegin();
+         i != request_interceptors_.rend();
+         ++i) {
+      top_job_factory.reset(new net::URLRequestInterceptingJobFactory(
+          top_job_factory.Pass(), make_scoped_ptr(*i)));
+    }
+    request_interceptors_.weak_clear();
 
+    storage_->set_job_factory(top_job_factory.release());
   }
 
   return url_request_context_.get();
diff --git a/src/net/shell_url_request_context_getter.h b/src/net/shell_url_request_context_getter.h
@@ -62,6 +62,7 @@ class ShellBrowserContext;
       base::MessageLoop* file_loop,
       ProtocolHandlerMap* protocol_handlers,
       ShellBrowserContext*,
+      URLRequestInterceptorScopedVector request_interceptors,
       const std::string& auth_schemes,
       const std::string& auth_server_whitelist,
       const std::string& auth_delegate_whitelist,
@@ -108,6 +109,7 @@ class ShellBrowserContext;
   scoped_ptr<net::URLSecurityManager> url_security_manager_;
   ProtocolHandlerMap protocol_handlers_;
   ShellBrowserContext* browser_context_;
+  URLRequestInterceptorScopedVector request_interceptors_;
   extensions::InfoMap* extension_info_map_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellURLRequestContextGetter);
diff --git a/src/shell_browser_context.cc b/src/shell_browser_context.cc
@@ -185,7 +185,7 @@ net::URLRequestContextGetter* ShellBrowserContext::CreateRequestContext(
       package_->path(),
       BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::IO),
       BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::FILE),
-      protocol_handlers, this,
+      protocol_handlers, this, protocol_interceptors.Pass(),
       auth_schemes, auth_server_whitelist, auth_delegate_whitelist,
       gssapi_library_name, extension_info_map);
 
