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/chrome_url_request_context.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/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 34 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(OS_ANDROID) || defined(OS_IOS)
-#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_protocol.h"
-#include "components/data_reduction_proxy/browser/data_reduction_proxy_settings.h"
-#endif
-
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/users/user_manager.h"
 #include "chrome/browser/chromeos/net/cert_verify_proc_chromeos.h"
 #include "chromeos/network/host_resolver_impl_chromeos.h"
 #endif
 
 using content::BrowserThread;
-
-#if defined(OS_ANDROID) || defined(OS_IOS)
 using data_reduction_proxy::DataReductionProxyAuthRequestHandler;
 using data_reduction_proxy::DataReductionProxyParams;
 using data_reduction_proxy::DataReductionProxyUsageStats;
 using data_reduction_proxy::DataReductionProxySettings;
-#endif
 
 class SafeBrowsingURLRequestContext;
 
 // The IOThread object must outlive any tasks posted to the IO thread before the
 // Quit task, so base::Bind() calls are not refcounted.
 
 namespace {
 
 const char kQuicFieldTrialName[] = "QUIC";
 const char kQuicFieldTrialEnabledGroupName[] = "Enabled";
@@ skipping 503 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(OS_ANDROID) || defined(OS_IOS)
-#if defined(SPDY_PROXY_AUTH_ORIGIN)
-  int drp_flags = DataReductionProxyParams::kFallbackAllowed;
-  if (DataReductionProxyParams::IsIncludedInFieldTrial())
-    drp_flags |= DataReductionProxyParams::kAllowed;
+  int drp_flags = 0;
+  // TODO(kundaji): Gate instantitation of all data reduction classes based
+  // on this method.
+  if (DataReductionProxyParams::IsIncludedInFieldTrial()) {

[bengr, 2014/07/21 22:45:14]

Please test that the code works when not part of the field trial.

[Not at Google. Contact bengr, 2014/07/22 00:12:09]

Good catch. Made other flags conditional on kAllowed.

+    drp_flags = DataReductionProxyParams::kAllowed |
+        DataReductionProxyParams::kFallbackAllowed;
+  }
   if (DataReductionProxyParams::IsIncludedInAlternativeFieldTrial())

[bengr, 2014/07/21 22:45:14]

We are accumulating a lot of code here. Would you mind factoring it into a
method called something like EmbedDataReductionProxy()?

[Not at Google. Contact bengr, 2014/07/22 00:12:09]

Done.

     drp_flags |= DataReductionProxyParams::kAlternativeAllowed;
   if (DataReductionProxyParams::IsIncludedInPromoFieldTrial())
     drp_flags |= DataReductionProxyParams::kPromoAllowed;
   DataReductionProxyParams* proxy_params =
       new DataReductionProxyParams(drp_flags);
   globals_->data_reduction_proxy_params.reset(proxy_params);
   globals_->data_reduction_proxy_auth_request_handler.reset(
       new DataReductionProxyAuthRequestHandler(proxy_params));
   globals_->on_resolve_proxy_handler =
       ChromeNetworkDelegate::OnResolveProxyHandler(
           base::Bind(data_reduction_proxy::OnResolveProxyHandler));
   DataReductionProxyUsageStats* proxy_usage_stats =
       new DataReductionProxyUsageStats(proxy_params,
           BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
           BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
   network_delegate->set_data_reduction_proxy_params(proxy_params);
   globals_->data_reduction_proxy_usage_stats.reset(proxy_usage_stats);
   network_delegate->set_data_reduction_proxy_usage_stats(proxy_usage_stats);
   network_delegate->set_data_reduction_proxy_auth_request_handler(
       globals_->data_reduction_proxy_auth_request_handler.get());
   network_delegate->set_on_resolve_proxy_handler(
       globals_->on_resolve_proxy_handler);
-#endif  // defined(SPDY_PROXY_AUTH_ORIGIN)
-#endif  // defined(OS_ANDROID) || defined(OS_IOS)
   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 server bound cert store.
@@ skipping 416 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);
+  globals_->system_proxy_service->SetDataReductionProxyOrigins(

[bengr, 2014/07/21 22:45:14]

Add a comment that this is temporary until the histogram code is factored out of
Proxy{Server|Service}

Also, why can't you use origin() and fallback_origin()?

[Not at Google. Contact bengr, 2014/07/22 00:12:09]

Acknowledged.

+      globals_->data_reduction_proxy_params->GetDefaultOrigin(),
+      globals_->data_reduction_proxy_params->GetDefaultFallbackOrigin());
 
   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 263 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;
 }