Moved data reduction proxy initialization logic to ProfileImplIOData

chrome/browser/profiles/profile_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/profiles/profile_impl.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 28 matching lines @@
 #include "chrome/browser/domain_reliability/service_factory.h"
 #include "chrome/browser/download/chrome_download_manager_delegate.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/net/net_pref_observer.h"
 #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"
 #include "chrome/browser/policy/profile_policy_connector.h"
 #include "chrome/browser/policy/profile_policy_connector_factory.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/prefs/chrome_pref_service_factory.h"
 #include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/browser/prefs/tracked/tracked_preference_validation_delegate.h"
 #include "chrome/browser/prerender/prerender_manager_factory.h"
@@ skipping 45 matching lines @@
 #include "chrome/browser/media/protected_media_identifier_permission_context_factory.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/locale_change_guard.h"
 #include "chrome/browser/chromeos/login/users/user_manager.h"
 #include "chrome/browser/chromeos/preferences.h"
 #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"
 #include "components/policy/core/browser/browser_policy_connector.h"
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/login_utils.h"
 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h"
 #else
 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
@@ skipping 476 matching lines @@
 #endif
   content::CookieStoreConfig::SessionCookieMode session_cookie_mode =
       content::CookieStoreConfig::PERSISTANT_SESSION_COOKIES;
   if (GetLastSessionExitType() == Profile::EXIT_CRASHED ||
       startup_pref_type == SessionStartupPref::LAST) {
     session_cookie_mode = content::CookieStoreConfig::RESTORED_SESSION_COOKIES;
   }
 
   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)
+  InitDataReductionProxyForIO(&data_reduction_proxy_params,
+                         &data_reduction_proxy_unavailable);

[willchan no longer on Chromium, 2014/07/31 22:31:35]

indentation off

[bengr, 2014/08/02 01:10:31]

Done.

+#endif
+
   // Make sure we initialize the ProfileIOData after everything else has been
   // initialized that we might be reading from the IO thread.
 
   io_data_.Init(cookie_path, channel_id_path, cache_path,
                 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(SPDY_PROXY_AUTH_ORIGIN)
+  InitDataReductionProxySettings();
+#endif
 
 #if defined(ENABLE_PLUGINS)
   ChromePluginServiceFilter::GetInstance()->RegisterResourceContext(
       PluginPrefs::GetForProfile(this).get(),
       io_data_.GetResourceContextNoInit());
 #endif
 
   // Delay README creation to not impact startup performance.
   BrowserThread::PostDelayedTask(
         BrowserThread::FILE, FROM_HERE,
@@ skipping 81 matching lines @@
     for (std::vector<std::string>::const_iterator it = keys_to_remove.begin();
          it != keys_to_remove.end(); ++it) {
       host_zoom_dictionary->RemoveWithoutPathExpansion(*it, NULL);
     }
   }
 
   zoom_subscription_ = host_zoom_map->AddZoomLevelChangedCallback(
       base::Bind(&ProfileImpl::OnZoomLevelChanged, base::Unretained(this)));
 }
 
+#if defined(SPDY_PROXY_AUTH_ORIGIN)
+void ProfileImpl::InitDataReductionProxyForIO(

[willchan no longer on Chromium, 2014/07/31 22:31:34]

There's no reason for this to be a member function. Remove it from the header
and put this in an anonymous namespace here in the .cc file.

[marq (ping after 24h), 2014/07/31 23:54:32]

Nit: This doesn't actually initialize the data reduction proxy; it just
initializes some variables that get passed in to the io_data init. If this
weren't (I'm assuming) factored out to avoid a large #if block, it would
naturally just be inline code before the .Init call.

[bengr, 2014/08/02 01:10:31]

Done.

[bengr, 2014/08/02 01:10:31]

Done.

+    scoped_ptr<data_reduction_proxy::DataReductionProxyParams>* params,
+    base::Callback<void(bool)>* unavailable_callback) {
+  DataReductionProxyChromeSettings* data_reduction_proxy_chrome_settings =
+      DataReductionProxyChromeSettingsFactory::GetForBrowserContext(this);
+  DCHECK(params);
+  params->reset(data_reduction_proxy_chrome_settings->params()->Clone());

[marq (ping after 24h), 2014/07/31 23:54:32]

Params is cloned so there's a copy for the IO thread and a copy for the UI
thread, right? But isn't the params object immutable?

[bengr, 2014/08/02 01:10:31]

The issue is lifetime. The profile's IO data outlives the keyed service.

+  *unavailable_callback =
+      base::Bind(
+          &data_reduction_proxy::DataReductionProxySettings::SetUnreachable,
+          base::Unretained(data_reduction_proxy_chrome_settings));
+}
+
+void ProfileImpl::InitDataReductionProxySettings() {

[willchan no longer on Chromium, 2014/07/31 22:31:34]

Ditto, this doesn't need to be a member function.

[bengr, 2014/08/02 01:10:32]

Done.

+  scoped_ptr<data_reduction_proxy::DataReductionProxyConfigurator>
+      configurator(new DataReductionProxyChromeConfigurator(prefs_.get()));
+  DataReductionProxyChromeSettingsFactory::GetForBrowserContext(this)->

[marq (ping after 24h), 2014/07/31 23:54:32]

Right, so this will use the params created in
DataReductionProxyChromeSettingsFactory::BuildServiceInstanceFor(). So what are
the global params used for?

[bengr, 2014/08/02 01:10:31]

The global params are for the system context.

+      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);
 }
 
 void ProfileImpl::set_last_selected_directory(const base::FilePath& path) {
   GetPrefs()->SetFilePath(prefs::kSelectFileLastDirectory, path);
 }
 
 ProfileImpl::~ProfileImpl() {
   MaybeSendDestroyedNotification();
@@ skipping 611 matching lines @@
 ProfileImpl::CreateDomainReliabilityMonitor() {
   domain_reliability::DomainReliabilityService* service =
       domain_reliability::DomainReliabilityServiceFactory::GetInstance()->
           GetForBrowserContext(this);
   if (!service)
     return scoped_ptr<domain_reliability::DomainReliabilityMonitor>();
 
   return service->CreateMonitor(
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
 }