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

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

Issue 412143009: Moved data reduction proxy initialization logic to ProfileImplIOData (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 5 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_io_data.cc
diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
index 786e3db7dc4d7bc7bb36c00e0c6d6a082b03571b..eab65d187748c7b5c5bb1ec2e6687f3f69d833da 100644
--- a/chrome/browser/profiles/profile_io_data.cc
+++ b/chrome/browser/profiles/profile_io_data.cc
@@ -136,7 +136,6 @@
using content::BrowserContext;
using content::BrowserThread;
using content::ResourceContext;
-using data_reduction_proxy::DataReductionProxyUsageStats;
namespace {
@@ -487,49 +486,12 @@ void ProfileIOData::InitializeOnUIThread(Profile* profile) {
initialized_on_UI_thread_ = true;
-#if defined(OS_ANDROID)
-#if defined(SPDY_PROXY_AUTH_ORIGIN)
- BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
- base::Bind(&ProfileIOData::SetDataReductionProxyUsageStatsOnIOThread,
- base::Unretained(this), g_browser_process->io_thread(), profile));
-#endif
-#endif
-
// We need to make sure that content initializes its own data structures that
// are associated with each ResourceContext because we might post this
// object to the IO thread after this function.
BrowserContext::EnsureResourceContextInitialized(profile);
}
-#if defined(OS_ANDROID)
-#if defined(SPDY_PROXY_AUTH_ORIGIN)
-void ProfileIOData::SetDataReductionProxyUsageStatsOnIOThread(
- IOThread* io_thread, Profile* profile) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
- IOThread::Globals* globals = io_thread->globals();
- DataReductionProxyUsageStats* usage_stats =
- globals->data_reduction_proxy_usage_stats.get();
- BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
- base::Bind(&ProfileIOData::SetDataReductionProxyUsageStatsOnUIThread,
- base::Unretained(this), profile, usage_stats));
-}
-
-void ProfileIOData::SetDataReductionProxyUsageStatsOnUIThread(
- Profile* profile,
- DataReductionProxyUsageStats* usage_stats) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- if (g_browser_process->profile_manager()->IsValidProfile(profile)) {
- DataReductionProxyChromeSettings* data_reduction_proxy_chrome_settings =
- DataReductionProxyChromeSettingsFactory::GetForBrowserContext(profile);
- if (data_reduction_proxy_chrome_settings) {
- data_reduction_proxy_chrome_settings->SetDataReductionProxyUsageStats(
- usage_stats);
- }
- }
-}
-#endif
-#endif
-
ProfileIOData::MediaRequestContext::MediaRequestContext() {
}
@@ -1010,14 +972,6 @@ void ProfileIOData::Init(
NULL,
#endif
&enable_referrers_);
- network_delegate->set_data_reduction_proxy_params(
- io_thread_globals->data_reduction_proxy_params.get());
- network_delegate->set_data_reduction_proxy_usage_stats(
- io_thread_globals->data_reduction_proxy_usage_stats.get());
- network_delegate->set_data_reduction_proxy_auth_request_handler(
- io_thread_globals->data_reduction_proxy_auth_request_handler.get());
- network_delegate->set_on_resolve_proxy_handler(
- io_thread_globals->on_resolve_proxy_handler);
if (command_line.HasSwitch(switches::kEnableClientHints))
network_delegate->SetEnableClientHints();
network_delegate->set_extension_info_map(

Powered by Google App Engine
This is Rietveld 408576698