Moved data reduction proxy initialization logic to ProfileImplIOData

chrome/browser/profiles/profile_io_data.cc

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 798c122e92f7e87cd22a2579abfdade517c2905a..59f836c984db528526969f465a017ef0040398f6 100644
--- a/chrome/browser/profiles/profile_io_data.cc
+++ b/chrome/browser/profiles/profile_io_data.cc
@@ -95,8 +95,6 @@
 #endif
 
 #if defined(OS_ANDROID)
-#include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h"
-#include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_factory_android.h"
 #include "components/data_reduction_proxy/common/data_reduction_proxy_switches.h"
 #endif  // defined(OS_ANDROID)
 
@@ -136,7 +134,6 @@
 using content::BrowserContext;
 using content::BrowserThread;
 using content::ResourceContext;
-using data_reduction_proxy::DataReductionProxyUsageStats;
 
 namespace {
 
@@ -487,47 +484,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)) {
-    DataReductionProxySettingsAndroid* proxySettingsAndroid =
-        DataReductionProxySettingsFactoryAndroid::GetForBrowserContext(profile);
-    if (proxySettingsAndroid)
-      proxySettingsAndroid->SetDataReductionProxyUsageStats(usage_stats);
-  }
-}
-#endif
-#endif
-
 ProfileIOData::MediaRequestContext::MediaRequestContext() {
 }
 
@@ -1008,14 +970,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(