Moved data reduction proxy initialization logic to ProfileImplIOData

chrome/browser/profiles/profile_io_data.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_io_data.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 77 matching lines @@
 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
 #endif
 
 #if defined(ENABLE_MANAGED_USERS)
 #include "chrome/browser/supervised_user/supervised_user_service.h"
 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
 #include "chrome/browser/supervised_user/supervised_user_url_filter.h"
 #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)
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/drive/drive_protocol_handler.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/users/user.h"
 #include "chrome/browser/chromeos/login/users/user_manager.h"
 #include "chrome/browser/chromeos/net/cert_verify_proc_chromeos.h"
 #include "chrome/browser/chromeos/policy/policy_cert_service.h"
@@ skipping 19 matching lines @@
 #include "net/ssl/client_cert_store_win.h"
 #endif
 
 #if defined(OS_MACOSX)
 #include "net/ssl/client_cert_store_mac.h"
 #endif
 
 using content::BrowserContext;
 using content::BrowserThread;
 using content::ResourceContext;
-using data_reduction_proxy::DataReductionProxyUsageStats;
 
 namespace {
 
 #if defined(DEBUG_DEVTOOLS)
 bool IsSupportedDevToolsURL(const GURL& url, base::FilePath* path) {
   std::string bundled_path_prefix(chrome::kChromeUIDevToolsBundledPath);
   bundled_path_prefix = "/" + bundled_path_prefix + "/";
 
   if (!url.SchemeIs(content::kChromeDevToolsScheme) ||
       url.host() != chrome::kChromeUIDevToolsHost ||
@@ skipping 330 matching lines @@
     }
   }
 #endif
 
   incognito_availibility_pref_.Init(
       prefs::kIncognitoModeAvailability, pref_service);
   incognito_availibility_pref_.MoveToThread(io_message_loop_proxy);
 
   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() {
 }
 
 void ProfileIOData::MediaRequestContext::SetHttpTransactionFactory(
     scoped_ptr<net::HttpTransactionFactory> http_factory) {
   http_factory_ = http_factory.Pass();
   set_http_transaction_factory(http_factory_.get());
 }
 
 ProfileIOData::MediaRequestContext::~MediaRequestContext() {
@@ skipping 460 matching lines @@
   extensions_request_context_.reset(new ChromeURLRequestContext());
 
   ChromeNetworkDelegate* network_delegate =
       new ChromeNetworkDelegate(
 #if defined(ENABLE_EXTENSIONS)
           io_thread_globals->extension_event_router_forwarder.get(),
 #else
           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(
       profile_params_->extension_info_map.get());
 #if defined(ENABLE_CONFIGURATION_POLICY)
   network_delegate->set_url_blacklist_manager(url_blacklist_manager_.get());
 #endif
   network_delegate->set_profile(profile_params_->profile);
   network_delegate->set_profile_path(profile_params_->path);
   network_delegate->set_cookie_settings(profile_params_->cookie_settings.get());
@@ skipping 240 matching lines @@
 void ProfileIOData::SetCookieSettingsForTesting(
     CookieSettings* cookie_settings) {
   DCHECK(!cookie_settings_.get());
   cookie_settings_ = cookie_settings;
 }
 
 void ProfileIOData::set_signin_names_for_testing(
     SigninNamesOnIOThread* signin_names) {
   signin_names_.reset(signin_names);
 }