Allow content layer to pass ProtocolInterceptors when we create URLRequestContext

android_webview/browser/aw_content_browser_client.cc

Index: android_webview/browser/aw_content_browser_client.cc
diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc
index dcca91d26f281f49ee7ef5f82afcd8098bd8210d..691c047726c59fd231345514d3050e0d0c655eb5 100644
--- a/android_webview/browser/aw_content_browser_client.cc
+++ b/android_webview/browser/aw_content_browser_client.cc
@@ -209,10 +209,10 @@ void AwContentBrowserClient::RenderProcessWillLaunch(
   host->AddFilter(new AwContentsMessageFilter(host->GetID()));
 }
 
-net::URLRequestContextGetter*
-AwContentBrowserClient::CreateRequestContext(
+net::URLRequestContextGetter* AwContentBrowserClient::CreateRequestContext(
     content::BrowserContext* browser_context,
-    content::ProtocolHandlerMap* protocol_handlers) {
+    content::ProtocolHandlerMap* protocol_handlers,
+    content::ProtocolHandlerScopedVector protocol_interceptors) {

[mkosiba (inactive), 2014/03/06 16:13:49]

are we supposed to hook these up ourselves? if so please file a bug.

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

Sorry... I wanted this part to be separated from this CL. Filed a bug and added
TODO.

   DCHECK(browser_context_.get() == browser_context);
   return browser_context_->CreateRequestContext(protocol_handlers);
 }
@@ -222,7 +222,8 @@ AwContentBrowserClient::CreateRequestContextForStoragePartition(
     content::BrowserContext* browser_context,
     const base::FilePath& partition_path,
     bool in_memory,
-    content::ProtocolHandlerMap* protocol_handlers) {
+    content::ProtocolHandlerMap* protocol_handlers,
+    content::ProtocolHandlerScopedVector protocol_interceptors) {
   DCHECK(browser_context_.get() == browser_context);
   return browser_context_->CreateRequestContextForStoragePartition(
       partition_path, in_memory, protocol_handlers);