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

Unified Diff: chrome/browser/profiles/profile_impl.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: chrome/browser/profiles/profile_impl.cc
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index 6b1932f1567dc563119adb121399eae1894838b9..b76c9b5ae12b3bc48023b5a6806d8053e243d8ff 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();
}
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() {

Powered by Google App Engine
This is Rietveld 408576698