Add data reduction functionality to all platforms.

chrome/browser/io_thread.cc

Index: chrome/browser/io_thread.cc
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index 3abfe74886bc1a3f0d374a5134350a90736bafee..af54db51e4f387adc82e0f348ca7408ea6f5b539 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -39,7 +39,11 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/pref_names.h"
+#include "components/data_reduction_proxy/browser/data_reduction_proxy_auth_request_handler.h"
+#include "components/data_reduction_proxy/browser/data_reduction_proxy_params.h"
 #include "components/data_reduction_proxy/browser/data_reduction_proxy_prefs.h"
+#include "components/data_reduction_proxy/browser/data_reduction_proxy_protocol.h"
+#include "components/data_reduction_proxy/browser/data_reduction_proxy_settings.h"
 #include "components/policy/core/common/policy_service.h"
 #include "components/variations/variations_associated_data.h"
 #include "content/public/browser/browser_thread.h"
@@ -94,13 +98,6 @@
 #include "net/ocsp/nss_ocsp.h"
 #endif
 
-#if defined(SPDY_PROXY_AUTH_ORIGIN)
-#include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h"
-#include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_factory.h"
-#include "components/data_reduction_proxy/browser/data_reduction_proxy_auth_request_handler.h"
-#include "components/data_reduction_proxy/browser/data_reduction_proxy_protocol.h"
-#endif  // defined(SPDY_PROXY_AUTH_ORIGIN)
-
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/net/cert_verify_proc_chromeos.h"
 #include "chromeos/network/host_resolver_impl_chromeos.h"
@@ -625,44 +622,7 @@ void IOThread::InitAsync() {
   }
 
   globals_->ssl_config_service = GetSSLConfigService();
-
-#if defined(SPDY_PROXY_AUTH_ORIGIN)
-  int drp_flags = 0;
-  if (data_reduction_proxy::DataReductionProxyParams::
-          IsIncludedInFieldTrial()) {
-    drp_flags |=
-        (data_reduction_proxy::DataReductionProxyParams::kAllowed |
-         data_reduction_proxy::DataReductionProxyParams::kFallbackAllowed);
-  }
-  if (data_reduction_proxy::DataReductionProxyParams::
-          IsIncludedInAlternativeFieldTrial()) {
-    drp_flags |=
-        data_reduction_proxy::DataReductionProxyParams::kAlternativeAllowed;
-  }
-  if (data_reduction_proxy::DataReductionProxyParams::
-          IsIncludedInPromoFieldTrial())
-    drp_flags |= data_reduction_proxy::DataReductionProxyParams::kPromoAllowed;
-  if (data_reduction_proxy::DataReductionProxyParams::
-          IsIncludedInHoldbackFieldTrial())
-    drp_flags |= data_reduction_proxy::DataReductionProxyParams::kHoldback;
-  globals_->data_reduction_proxy_params.reset(
-      new data_reduction_proxy::DataReductionProxyParams(drp_flags));
-  globals_->data_reduction_proxy_auth_request_handler.reset(
-      new data_reduction_proxy::DataReductionProxyAuthRequestHandler(
-          DataReductionProxyChromeSettings::GetClient(),
-          chrome::VersionInfo().Version(),
-          globals_->data_reduction_proxy_params.get(),
-          BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)));
-  // This is the same as in ProfileImplIOData except that we do not collect
-  // usage stats.
-  network_delegate->set_data_reduction_proxy_params(
-      globals_->data_reduction_proxy_params.get());
-  network_delegate->set_data_reduction_proxy_auth_request_handler(
-      globals_->data_reduction_proxy_auth_request_handler.get());
-  network_delegate->set_on_resolve_proxy_handler(
-      base::Bind(data_reduction_proxy::OnResolveProxyHandler));
-#endif  // defined(SPDY_PROXY_AUTH_ORIGIN)
-
+  SetupDataReductionProxy(network_delegate);
   globals_->http_auth_handler_factory.reset(CreateDefaultAuthHandlerFactory(
       globals_->host_resolver.get()));
   globals_->http_server_properties.reset(new net::HttpServerPropertiesImpl());
@@ -1102,6 +1062,7 @@ void IOThread::InitSystemRequestContextOnIOThread() {
           system_proxy_config_service_.release(),
           command_line,
           quick_check_enabled_.GetValue()));
+  DCHECK(globals_->data_reduction_proxy_params);
 
   net::HttpNetworkSession::Params system_params;
   InitializeNetworkSessionParams(&system_params);
@@ -1139,6 +1100,44 @@ void IOThread::ConfigureQuic(const CommandLine& command_line) {
   ConfigureQuicGlobals(command_line, group, params, globals_);
 }
 
+void IOThread::SetupDataReductionProxy(
+    ChromeNetworkDelegate* network_delegate) {
+  // TODO(kundaji): Move flags initialization to DataReductionProxyParams and
+  // merge with flag initialization in
+  // data_reduction_proxy_chrome_settings_factory.cc.
+  int flags = data_reduction_proxy::DataReductionProxyParams::kAllowed |
+      data_reduction_proxy::DataReductionProxyParams::kFallbackAllowed;
+  if (data_reduction_proxy::DataReductionProxyParams::
+      IsIncludedInAlternativeFieldTrial()) {
+    flags |=
+        data_reduction_proxy::DataReductionProxyParams::kAlternativeAllowed;
+  }
+  if (data_reduction_proxy::DataReductionProxyParams::
+      IsIncludedInPromoFieldTrial()) {
+    flags |= data_reduction_proxy::DataReductionProxyParams::kPromoAllowed;
+  }
+  if (data_reduction_proxy::DataReductionProxyParams::
+      IsIncludedInHoldbackFieldTrial()) {
+    flags |= data_reduction_proxy::DataReductionProxyParams::kHoldback;
+  }
+  globals_->data_reduction_proxy_params.reset(
+      new data_reduction_proxy::DataReductionProxyParams(flags));
+  globals_->data_reduction_proxy_auth_request_handler.reset(
+      new data_reduction_proxy::DataReductionProxyAuthRequestHandler(
+          DataReductionProxyChromeSettings::GetClient(),
+          chrome::VersionInfo().Version(),
+          globals_->data_reduction_proxy_params.get(),
+          BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)));
+  // This is the same as in ProfileImplIOData except that we do not collect
+  // usage stats.
+  network_delegate->set_data_reduction_proxy_params(
+      globals_->data_reduction_proxy_params.get());
+  network_delegate->set_data_reduction_proxy_auth_request_handler(
+      globals_->data_reduction_proxy_auth_request_handler.get());
+  network_delegate->set_on_resolve_proxy_handler(
+      base::Bind(data_reduction_proxy::OnResolveProxyHandler));
+}
+
 // static
 void IOThread::ConfigureQuicGlobals(
     const base::CommandLine& command_line,