Allow content layer to pass ProtocolInterceptors when we create URLRequestContext

chrome/browser/profiles/off_the_record_profile_io_data.h

Index: chrome/browser/profiles/off_the_record_profile_io_data.h
diff --git a/chrome/browser/profiles/off_the_record_profile_io_data.h b/chrome/browser/profiles/off_the_record_profile_io_data.h
index 771d52c539db7563613f14ba32954cb3f797a36b..f3407a7a20d74498715b6f8028664a7cc26155bd 100644
--- a/chrome/browser/profiles/off_the_record_profile_io_data.h
+++ b/chrome/browser/profiles/off_the_record_profile_io_data.h
@@ -47,9 +47,9 @@ class OffTheRecordProfileIOData : public ProfileIOData {
     // GetResourceContextNoInit() does not call LazyInitialize() so it can be
     // safely be used during initialization.
     content::ResourceContext* GetResourceContextNoInit() const;
-    scoped_refptr<ChromeURLRequestContextGetter>
-        CreateMainRequestContextGetter(
-            content::ProtocolHandlerMap* protocol_handlers) const;
+    scoped_refptr<ChromeURLRequestContextGetter> CreateMainRequestContextGetter(
+        content::ProtocolHandlerMap* protocol_handlers,
+        content::ProtocolHandlerScopedVector protocol_interceptors) const;
     scoped_refptr<ChromeURLRequestContextGetter>
         GetExtensionsRequestContextGetter() const;
     scoped_refptr<ChromeURLRequestContextGetter>
@@ -60,7 +60,8 @@ class OffTheRecordProfileIOData : public ProfileIOData {
         CreateIsolatedAppRequestContextGetter(
             const base::FilePath& partition_path,
             bool in_memory,
-            content::ProtocolHandlerMap* protocol_handlers) const;
+            content::ProtocolHandlerMap* protocol_handlers,
+            content::ProtocolHandlerScopedVector protocol_interceptors) const;
 
    private:
     typedef std::map<StoragePartitionDescriptor,
@@ -104,7 +105,9 @@ class OffTheRecordProfileIOData : public ProfileIOData {
 
   virtual void InitializeInternal(
       ProfileParams* profile_params,
-      content::ProtocolHandlerMap* protocol_handlers) const OVERRIDE;
+      content::ProtocolHandlerMap* protocol_handlers,
+      content::ProtocolHandlerScopedVector protocol_interceptors) const
+      OVERRIDE;

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

nit (x3):  I think const and OVERRIDE should be on the same line (Like
AcquireIsolatedMediaRequestContext).  AcquireIsolatedMediaRequestContext indents
them 4 more as well.  Should be consistent here, but I'm fine with either style.

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

This style didn't look very familiar to me either but this was done by git cl
format... to be consistent I changed the style to have const + OVERRIDE with 4
space indent.

   virtual void InitializeExtensionsRequestContext(
       ProfileParams* profile_params) const OVERRIDE;
   virtual ChromeURLRequestContext* InitializeAppRequestContext(
@@ -112,19 +115,22 @@ class OffTheRecordProfileIOData : public ProfileIOData {
       const StoragePartitionDescriptor& partition_descriptor,
       scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory>
           protocol_handler_interceptor,
-      content::ProtocolHandlerMap* protocol_handlers) const OVERRIDE;
+      content::ProtocolHandlerMap* protocol_handlers,
+      content::ProtocolHandlerScopedVector protocol_interceptors) const
+      OVERRIDE;
   virtual ChromeURLRequestContext* InitializeMediaRequestContext(
       ChromeURLRequestContext* original_context,
       const StoragePartitionDescriptor& partition_descriptor) const OVERRIDE;
   virtual ChromeURLRequestContext*
       AcquireMediaRequestContext() const OVERRIDE;
-  virtual ChromeURLRequestContext*
-      AcquireIsolatedAppRequestContext(
-          ChromeURLRequestContext* main_context,
-          const StoragePartitionDescriptor& partition_descriptor,
-          scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory>
-              protocol_handler_interceptor,
-          content::ProtocolHandlerMap* protocol_handlers) const OVERRIDE;
+  virtual ChromeURLRequestContext* AcquireIsolatedAppRequestContext(
+      ChromeURLRequestContext* main_context,
+      const StoragePartitionDescriptor& partition_descriptor,
+      scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory>
+          protocol_handler_interceptor,
+      content::ProtocolHandlerMap* protocol_handlers,
+      content::ProtocolHandlerScopedVector protocol_interceptors) const
+      OVERRIDE;
   virtual ChromeURLRequestContext*
       AcquireIsolatedMediaRequestContext(
           ChromeURLRequestContext* app_context,