Add data reduction functionality to all platforms.

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 24 matching lines @@
 #include "chrome/browser/extensions/extension_resource_protocols.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/media/media_device_id_salt.h"
 #include "chrome/browser/net/about_protocol_handler.h"
 #include "chrome/browser/net/chrome_fraudulent_certificate_reporter.h"
 #include "chrome/browser/net/chrome_http_user_agent_settings.h"
 #include "chrome/browser/net/chrome_net_log.h"
 #include "chrome/browser/net/chrome_network_delegate.h"
 #include "chrome/browser/net/cookie_store_util.h"
 #include "chrome/browser/net/proxy_service_factory.h"
+#include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/signin/signin_names_io_thread.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
+#include "components/data_reduction_proxy/browser/data_reduction_proxy_config_service.h"
+#include "components/data_reduction_proxy/browser/data_reduction_proxy_configurator.h"
+#include "components/data_reduction_proxy/browser/data_reduction_proxy_settings.h"
 #include "components/startup_metric_utils/startup_metric_utils.h"
 #include "components/sync_driver/pref_names.h"
 #include "components/url_fixer/url_fixer.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/host_zoom_map.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/resource_context.h"
 #include "extensions/browser/extension_protocols.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/info_map.h"
@@ skipping 67 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::DataReductionProxyParams;
+using data_reduction_proxy::DataReductionProxySettings;
 using data_reduction_proxy::DataReductionProxyUsageStats;

[Ryan Sleevi, 2014/07/22 01:56:31]

General consensus is that such using statements are bad, and hinder readability.

Please do not add these, and please consider removing the one that already
exists.

[Not at Google. Contact bengr, 2014/07/22 23:03:53]

Can you please clarify why using "using" for data_reduction_proxy::* is bad, but
not for content::*?

[Ryan Sleevi, 2014/07/23 00:54:44]

This thread (
https://groups.google.com/a/chromium.org/d/msg/chromium-dev/qSrl_UAqAkQ/mn5OV...
) has a much larger discussion, which Peter summarizes again in
https://groups.google.com/a/chromium.org/d/msg/chromium-dev/qSrl_UAqAkQ/SGDZG...


From a naming perspective, naming your classes "DataReductionX" within the
"data_reduction_proxy" namespace is something generally discouraged. 

data_reduction_proxy::Params (or ProxyParams) would be far more consistent with
respect to some of the other areas of code, but that's more of an aside.

[Not at Google. Contact bengr, 2014/08/26 17:31:08]

Done

 
 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::Bind(&ProfileIOData::SetupDataReductionProxyOnIOThread,
           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(
+void ProfileIOData::SetupDataReductionProxyOnIOThread(
     IOThread* io_thread, Profile* profile) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   IOThread::Globals* globals = io_thread->globals();
+  DataReductionProxyParams* params = globals->data_reduction_proxy_params.get();
   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));
+      base::Bind(&ProfileIOData::SetupDataReductionProxyOnUIThread,
+                 base::Unretained(this), profile, params, usage_stats));
 }
 
-void ProfileIOData::SetDataReductionProxyUsageStatsOnUIThread(
+void ProfileIOData::SetupDataReductionProxyOnUIThread(
     Profile* profile,
+    DataReductionProxyParams* params,
     DataReductionProxyUsageStats* usage_stats) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK(profile);
+  DCHECK(params);
+  DCHECK(usage_stats);
   if (g_browser_process->profile_manager()->IsValidProfile(profile)) {
+// TODO(kundaji): Combine code to initialize DRP on different platforms.
+#if defined(OS_ANDROID)
     DataReductionProxySettingsAndroid* proxySettingsAndroid =

[Ryan Sleevi, 2014/07/22 01:56:31]

STYLE: This variable name is wrong. Please fix to conform to Chrome style in a
separate CL.

proxy_settings_android

[Not at Google. Contact bengr, 2014/07/22 23:03:53]

Done.

         DataReductionProxySettingsFactoryAndroid::GetForBrowserContext(profile);
     if (proxySettingsAndroid)
       proxySettingsAndroid->SetDataReductionProxyUsageStats(usage_stats);
+#endif
   }
 }
-#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());
 }
 
@@ skipping 494 matching lines @@
   // NOTE: Proxy service uses the default io thread network delegate, not the
   // delegate just created.
   proxy_service_.reset(
       ProxyServiceFactory::CreateProxyService(
           io_thread->net_log(),
           io_thread_globals->proxy_script_fetcher_context.get(),
           io_thread_globals->system_network_delegate.get(),
           profile_params_->proxy_config_service.release(),
           command_line,
           quick_check_enabled_.GetValue()));
+  DCHECK(io_thread_globals->data_reduction_proxy_params);
+  proxy_service_->SetDataReductionProxyOrigins(
+      io_thread_globals->data_reduction_proxy_params->origin(),
+      io_thread_globals->data_reduction_proxy_params->fallback_origin());
 
   transport_security_state_.reset(new net::TransportSecurityState());
   transport_security_persister_.reset(
       new net::TransportSecurityPersister(
           transport_security_state_.get(),
           profile_params_->path,
           BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE),
           IsOffTheRecord()));
 
   // Take ownership over these parameters.
@@ skipping 211 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);
 }