Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3087)

Unified Diff: content/shell/browser/shell_content_browser_client.cc

Issue 187223003: Allow content layer to pass ProtocolInterceptors when we create URLRequestContext (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/shell/browser/shell_content_browser_client.cc
diff --git a/content/shell/browser/shell_content_browser_client.cc b/content/shell/browser/shell_content_browser_client.cc
index 84c2c976170f3822258e0e97c1d7057b32e2c26b..7fa6049ad5f768402c374402896f2cd89029647e 100644
--- a/content/shell/browser/shell_content_browser_client.cc
+++ b/content/shell/browser/shell_content_browser_client.cc
@@ -154,10 +154,12 @@ void ShellContentBrowserClient::RenderProcessWillLaunch(
net::URLRequestContextGetter* ShellContentBrowserClient::CreateRequestContext(
BrowserContext* content_browser_context,
- ProtocolHandlerMap* protocol_handlers) {
+ ProtocolHandlerMap* protocol_handlers,
+ ProtocolHandlerScopedVector protocol_interceptors) {
ShellBrowserContext* shell_browser_context =
ShellBrowserContextForBrowserContext(content_browser_context);
- return shell_browser_context->CreateRequestContext(protocol_handlers);
+ return shell_browser_context->CreateRequestContext(
+ protocol_handlers, protocol_interceptors.Pass());
}
net::URLRequestContextGetter*
@@ -165,11 +167,15 @@ ShellContentBrowserClient::CreateRequestContextForStoragePartition(
BrowserContext* content_browser_context,
const base::FilePath& partition_path,
bool in_memory,
- ProtocolHandlerMap* protocol_handlers) {
+ ProtocolHandlerMap* protocol_handlers,
+ ProtocolHandlerScopedVector protocol_interceptors) {
ShellBrowserContext* shell_browser_context =
ShellBrowserContextForBrowserContext(content_browser_context);
return shell_browser_context->CreateRequestContextForStoragePartition(
- partition_path, in_memory, protocol_handlers);
+ partition_path,
+ in_memory,
+ protocol_handlers,
+ protocol_interceptors.Pass());
}
bool ShellContentBrowserClient::IsHandledURL(const GURL& url) {

Powered by Google App Engine
This is Rietveld 408576698