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

Unified Diff: chrome/browser/profiles/off_the_record_profile_io_data.cc

Issue 734263003: Move data reduction proxy logic out of chrome and android webview network delegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Test fix Created 6 years 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/off_the_record_profile_io_data.cc
diff --git a/chrome/browser/profiles/off_the_record_profile_io_data.cc b/chrome/browser/profiles/off_the_record_profile_io_data.cc
index b13a701e714297d12bc3dd77bfc2a41fea7af118..798bea3ed294f2eb8220b8f4feaee334f3a65daf 100644
--- a/chrome/browser/profiles/off_the_record_profile_io_data.cc
+++ b/chrome/browser/profiles/off_the_record_profile_io_data.cc
@@ -196,6 +196,7 @@ OffTheRecordProfileIOData::~OffTheRecordProfileIOData() {
}
void OffTheRecordProfileIOData::InitializeInternal(
+ scoped_ptr<ChromeNetworkDelegate> chrome_network_delegate,
ProfileParams* profile_params,
content::ProtocolHandlerMap* protocol_handlers,
content::URLRequestInterceptorScopedVector request_interceptors) const {
@@ -210,7 +211,9 @@ void OffTheRecordProfileIOData::InitializeInternal(
main_context->set_net_log(io_thread->net_log());
- main_context->set_network_delegate(network_delegate());
+ main_context->set_network_delegate(chrome_network_delegate.get());
+
+ network_delegate_ = chrome_network_delegate.Pass();
main_context->set_host_resolver(
io_thread_globals->host_resolver.get());
@@ -266,7 +269,7 @@ void OffTheRecordProfileIOData::InitializeInternal(
main_job_factory.Pass(),
request_interceptors.Pass(),
profile_params->protocol_handler_interceptor.Pass(),
- network_delegate(),
+ main_context->network_delegate(),
ftp_factory_.get());
main_context->set_job_factory(main_job_factory_.get());
@@ -364,7 +367,7 @@ net::URLRequestContext* OffTheRecordProfileIOData::InitializeAppRequestContext(
top_job_factory = SetUpJobFactoryDefaults(job_factory.Pass(),
request_interceptors.Pass(),
protocol_handler_interceptor.Pass(),
- network_delegate(),
+ main_context->network_delegate(),
ftp_factory_.get());
context->SetJobFactory(top_job_factory.Pass());
return context;
« no previous file with comments | « chrome/browser/profiles/off_the_record_profile_io_data.h ('k') | chrome/browser/profiles/profile_impl_io_data.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698