Moved data reduction proxy initialization logic to ProfileImplIOData

chrome/browser/profiles/profile_impl.cc

Index: chrome/browser/profiles/profile_impl.cc
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index 771d9f5af4a7c6362ab77acc2da1e27c2b0167f0..2865b8518dd562edee56413a1911a3f0e7763209 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -48,6 +48,7 @@
 #include "chrome/browser/net/predictor.h"
 #include "chrome/browser/net/pref_proxy_config_tracker.h"
 #include "chrome/browser/net/proxy_service_factory.h"
+#include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h"
 #include "chrome/browser/net/ssl_config_service_manager.h"
 #include "chrome/browser/plugins/chrome_plugin_service_filter.h"
 #include "chrome/browser/plugins/plugin_prefs.h"
@@ -118,6 +119,13 @@
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #endif
 
+#if defined(SPDY_PROXY_AUTH_ORIGIN)
+#include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator.h"
+#include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_factory.h"
+#include "components/data_reduction_proxy/browser/data_reduction_proxy_params.h"
+#include "components/data_reduction_proxy/browser/data_reduction_proxy_settings.h"
+#endif
+
 #if defined(ENABLE_CONFIGURATION_POLICY)
 #include "chrome/browser/policy/schema_registry_service.h"
 #include "chrome/browser/policy/schema_registry_service_factory.h"
@@ -383,7 +391,8 @@ ProfileImpl::ProfileImpl(
       last_session_exit_type_(EXIT_NORMAL),
       start_time_(Time::Now()),
       delegate_(delegate),
-      predictor_(NULL) {
+      predictor_(NULL),
+      data_reduction_proxy_chrome_settings_(NULL) {
   TRACE_EVENT0("browser", "ProfileImpl::ctor")
   DCHECK(!path.empty()) << "Using an empty path will attempt to write " <<
                             "profile files to the root directory!";
@@ -598,6 +607,14 @@ void ProfileImpl::DoFinalInit() {
 
   InitHostZoomMap();
 
+  base::Callback<void(bool)> data_reduction_proxy_unavailable;
+  scoped_ptr<data_reduction_proxy::DataReductionProxyParams>
+      data_reduction_proxy_params;
+#if defined(SPDY_PROXY_AUTH_ORIGIN)
+  InitDataReductionProxy(&data_reduction_proxy_params,
+                         &data_reduction_proxy_unavailable);
+#endif
+
   // Make sure we initialize the ProfileIOData after everything else has been
   // initialized that we might be reading from the IO thread.
 
@@ -605,7 +622,9 @@ void ProfileImpl::DoFinalInit() {
                 cache_max_size, media_cache_path, media_cache_max_size,
                 extensions_cookie_path, GetPath(), infinite_cache_path,
                 predictor_, session_cookie_mode, GetSpecialStoragePolicy(),
-                CreateDomainReliabilityMonitor());
+                CreateDomainReliabilityMonitor(),
+                data_reduction_proxy_unavailable,
+                data_reduction_proxy_params.Pass());
 
 #if defined(ENABLE_PLUGINS)
   ChromePluginServiceFilter::GetInstance()->RegisterResourceContext(
@@ -707,6 +726,37 @@ void ProfileImpl::InitHostZoomMap() {
       base::Bind(&ProfileImpl::OnZoomLevelChanged, base::Unretained(this)));
 }
 
+#if defined(SPDY_PROXY_AUTH_ORIGIN)
+void ProfileImpl::InitDataReductionProxy(
+    scoped_ptr<data_reduction_proxy::DataReductionProxyParams>* params,
+    base::Callback<void(bool)>* unavailable_callback) {
+  data_reduction_proxy_chrome_settings_ =
+      DataReductionProxyChromeSettingsFactory::GetForBrowserContext(this);
+  DCHECK(params);
+  params->reset(new data_reduction_proxy::DataReductionProxyParams(
+      *(data_reduction_proxy_chrome_settings_->params())));
+  *unavailable_callback =
+      base::Bind(
+          &data_reduction_proxy::DataReductionProxySettings::SetUnreachable,
+          base::Unretained(data_reduction_proxy_chrome_settings_));
+  // Post to prevent a Profile initialization loop.
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
+      base::Bind(&ProfileImpl::RunInitDataReductionProxyTask,
+                 base::Unretained(this)));
+}
+
+void ProfileImpl::RunInitDataReductionProxyTask() {
+  scoped_ptr<data_reduction_proxy::DataReductionProxyConfigurator>
+      configurator(new DataReductionProxyChromeConfigurator(prefs_.get()));
+  data_reduction_proxy_chrome_settings_->InitDataReductionProxySettings(
+      configurator.Pass(),
+      prefs_.get(),
+      g_browser_process->local_state(),
+      GetRequestContext());
+}
+#endif  // defined(SPDY_PROXY_AUTH_ORIGIN)
+
 base::FilePath ProfileImpl::last_selected_directory() {
   return GetPrefs()->GetFilePath(prefs::kSelectFileLastDirectory);
 }