Add data reduction functionality to all platforms.

chrome/browser/io_thread.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/io_thread.h"
 
 #include <vector>
 
 #include "base/base64.h"
 #include "base/bind.h"
@@ skipping 21 matching lines @@
 #include "chrome/browser/net/chrome_network_delegate.h"
 #include "chrome/browser/net/connect_interceptor.h"
 #include "chrome/browser/net/dns_probe_service.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/common/chrome_content_client.h"
 #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"
 #include "content/public/browser/cookie_store_factory.h"
 #include "net/base/host_mapping_rules.h"
 #include "net/base/net_util.h"
 #include "net/cert/cert_verifier.h"
 #include "net/cert/cert_verify_proc.h"
 #include "net/cert/ct_known_logs.h"
 #include "net/cert/ct_verifier.h"
@@ skipping 37 matching lines @@
 
 #if !defined(USE_OPENSSL)
 #include "net/cert/ct_log_verifier.h"
 #include "net/cert/multi_log_ct_verifier.h"
 #endif
 
 #if defined(USE_NSS) || defined(OS_IOS)
 #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"
 #endif
 
 using content::BrowserThread;
 
 class SafeBrowsingURLRequestContext;
 
 // The IOThread object must outlive any tasks posted to the IO thread before the
@@ skipping 418 matching lines @@
     InitSystemRequestContext();
   }
   return system_url_request_context_getter_.get();
 }
 
 void IOThread::Init() {
   // Prefer to use InitAsync unless you need initialization to block
   // the UI thread
 }
 
+void IOThread::SetupDataReductionProxy(
+    ChromeNetworkDelegate* network_delegate) {
+  int flags = data_reduction_proxy::DataReductionProxyParams::kAllowed |
+            data_reduction_proxy::DataReductionProxyParams::kFallbackAllowed;

[Ryan Sleevi, 2014/08/28 17:21:01]

Reformat

[Not at Google. Contact bengr, 2014/08/28 18:59:27]

Done.

+  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(),
+          DataReductionProxyChromeSettings::GetBuildAndPatchNumber(),
+          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));
+}
+
 void IOThread::InitAsync() {
   TRACE_EVENT0("startup", "IOThread::InitAsync");
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
 #if defined(USE_NSS) || defined(OS_IOS)
   net::SetMessageLoopForNSSHttpIO();
 #endif
 
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
 
@@ skipping 73 matching lines @@
       ct_verifier->AddLog(external_log_verifier.Pass());
     }
   }
 #else
   if (command_line.HasSwitch(switches::kCertificateTransparencyLog)) {
     LOG(DFATAL) << "Certificate Transparency is not yet supported in Chrome "
                    "builds using OpenSSL.";
   }
 #endif
   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(),
-          DataReductionProxyChromeSettings::GetBuildAndPatchNumber(),
-          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());
   // For the ProxyScriptFetcher, we use a direct ProxyService.
   globals_->proxy_script_fetcher_proxy_service.reset(
       net::ProxyService::CreateDirectWithNetLog(net_log_));
   // In-memory cookie store.
   globals_->system_cookie_store =
         content::CreateCookieStore(content::CookieStoreConfig());
   // In-memory channel ID store.
@@ skipping 417 matching lines @@
 
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   globals_->system_proxy_service.reset(
       ProxyServiceFactory::CreateProxyService(
           net_log_,
           globals_->proxy_script_fetcher_context.get(),
           globals_->system_network_delegate.get(),
           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);
   system_params.net_log = net_log_;
   system_params.proxy_service = globals_->system_proxy_service.get();
 
   globals_->system_http_transaction_factory.reset(
       new net::HttpNetworkLayer(
           new net::HttpNetworkSession(system_params)));
   globals_->system_url_request_job_factory.reset(
@@ skipping 269 matching lines @@
   net::QuicVersionVector supported_versions = net::QuicSupportedVersions();
   for (size_t i = 0; i < supported_versions.size(); ++i) {
     net::QuicVersion version = supported_versions[i];
     if (net::QuicVersionToString(version) == quic_version) {
       return version;
     }
   }
 
   return net::QUIC_VERSION_UNSUPPORTED;
 }