Allow content layer to pass ProtocolInterceptors when we create URLRequestContext

apps/shell/browser/shell_content_browser_client.cc

 // Copyright 2013 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 "apps/shell/browser/shell_content_browser_client.h"
 
 #include "apps/shell/browser/shell_browser_context.h"
 #include "apps/shell/browser/shell_browser_main_parts.h"
 #include "apps/shell/browser/shell_extension_system.h"
 #include "base/command_line.h"
@@ skipping 42 matching lines @@
 bool ShellContentBrowserClient::ShouldUseProcessPerSite(
     content::BrowserContext* browser_context,
     const GURL& effective_url) {
   // This ensures that all render views created for a single app will use the
   // same render process (see content::SiteInstance::GetProcess). Otherwise the
   // default behavior of ContentBrowserClient will lead to separate render
   // processes for the background page and each app window view.
   return true;
 }
 
-net::URLRequestContextGetter*
-ShellContentBrowserClient::CreateRequestContext(
+net::URLRequestContextGetter* ShellContentBrowserClient::CreateRequestContext(
     content::BrowserContext* content_browser_context,
-    content::ProtocolHandlerMap* protocol_handlers) {
+    content::ProtocolHandlerMap* protocol_handlers,
+    content::ProtocolHandlerScopedVector protocol_interceptors) {
   // Handle chrome-extension: and chrome-extension-resource: requests.
   extensions::InfoMap* extension_info_map =
       browser_main_parts_->extension_system()->info_map();
   (*protocol_handlers)[extensions::kExtensionScheme] =
       linked_ptr<net::URLRequestJobFactory::ProtocolHandler>(
           CreateExtensionProtocolHandler(false /*is_incognito*/,
                                          extension_info_map));
   (*protocol_handlers)[extensions::kExtensionResourceScheme] =
       linked_ptr<net::URLRequestJobFactory::ProtocolHandler>(
           CreateExtensionResourceProtocolHandler());
   // Let content::ShellBrowserContext handle the rest of the setup.
   return browser_main_parts_->browser_context()->CreateRequestContext(
-      protocol_handlers);
+      protocol_handlers, protocol_interceptors.Pass());
 }
 
 bool ShellContentBrowserClient::IsHandledURL(const GURL& url) {
   if (!url.is_valid())
     return false;
   // Keep in sync with ProtocolHandlers added in CreateRequestContext() and in
   // content::ShellURLRequestContextGetter::GetURLRequestContext().
   static const char* const kProtocolList[] = {
       content::kBlobScheme,
       content::kChromeDevToolsScheme,
@@ skipping 76 matching lines @@
 
 const extensions::Extension* ShellContentBrowserClient::GetExtension(
     content::SiteInstance* site_instance) {
   ExtensionRegistry* registry =
       ExtensionRegistry::Get(site_instance->GetBrowserContext());
   return registry->enabled_extensions().GetExtensionOrAppByURL(
       site_instance->GetSiteURL());
 }
 
 }  // namespace apps