Allow content layer to pass ProtocolInterceptors when we create URLRequestContext

chrome/browser/profiles/profile_impl.cc

Index: chrome/browser/profiles/profile_impl.cc
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index 52acc0c0809f06fc6990de2410754feb35098613..6c3c172a3d368f2154d6c1dd48ca898dcba691f7 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -864,11 +864,13 @@ PrefService* ProfileImpl::GetOffTheRecordPrefs() {
 }
 
 net::URLRequestContextGetter* ProfileImpl::CreateRequestContext(
-    content::ProtocolHandlerMap* protocol_handlers) {
-  return io_data_
-      .CreateMainRequestContextGetter(protocol_handlers,
-                                      g_browser_process->local_state(),
-                                      g_browser_process->io_thread()).get();
+    content::ProtocolHandlerMap* protocol_handlers,
+    content::ProtocolHandlerScopedVector protocol_interceptors) {
+  return io_data_.CreateMainRequestContextGetter(
+                      protocol_handlers,
+                      protocol_interceptors.Pass(),
+                      g_browser_process->local_state(),
+                      g_browser_process->io_thread()).get();

[mmenke, 2014/03/06 19:28:22]

See earlier indentation comment (x2)

[kinuko, 2014/03/07 08:25:01]

Done. (Here and below)

 }
 
 net::URLRequestContextGetter* ProfileImpl::GetRequestContext() {
@@ -977,9 +979,13 @@ net::URLRequestContextGetter*
 ProfileImpl::CreateRequestContextForStoragePartition(
     const base::FilePath& partition_path,
     bool in_memory,
-    content::ProtocolHandlerMap* protocol_handlers) {
+    content::ProtocolHandlerMap* protocol_handlers,
+    content::ProtocolHandlerScopedVector protocol_interceptors) {
   return io_data_.CreateIsolatedAppRequestContextGetter(
-                      partition_path, in_memory, protocol_handlers).get();
+                      partition_path,
+                      in_memory,
+                      protocol_handlers,
+                      protocol_interceptors.Pass()).get();
 }
 
 net::SSLConfigService* ProfileImpl::GetSSLConfigService() {