Moved data reduction proxy initialization logic to ProfileImplIOData

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 76 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)
+#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_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
+#endif  // defined(SPDY_PROXY_AUTH_ORIGIN)
 
 #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";
 const char kQuicFieldTrialHttpsEnabledGroupName[] = "HttpsEnabled";
@@ 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;
-  if (DataReductionProxyParams::IsIncludedInAlternativeFieldTrial())
-    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);
+  int drp_flags = 0;
+  if (data_reduction_proxy::DataReductionProxyParams::
+          IsIncludedInFieldTrial()) {
+    drp_flags |=
+        (data_reduction_proxy::DataReductionProxyParams::kAllowed |
+         data_reduction_proxy::DataReductionProxyParams::kFallbackAllowed);

[willchan no longer on Chromium, 2014/08/04 23:13:46]

Is this an intentional behavior change? Specifically, kFallbackAllowed is now
not set by default. It looks like most of this change is a refactoring. In
general, it's best not to combine refactoring and behavior changes in the same
CL.

[bengr, 2014/08/05 02:35:07]

This is intentional. I believe this change is first introduced in a change that
landed after I last rebased. I'll confirm. If not, are you ok with me landing it
in this CL?

[willchan no longer on Chromium, 2014/08/05 03:03:52]

Oh, if it's from a rebase, that's fine. If not, I think you should probably make
that change separately. If you pull that change out to a separate CL, I'm happy
to approve that one quickly (just ping me on IM).

+  }
+  if (data_reduction_proxy::DataReductionProxyParams::
+          IsIncludedInAlternativeFieldTrial())

[willchan no longer on Chromium, 2014/08/04 23:13:46]

Nit: Now that this is multi-line, please add braces.

[bengr, 2014/08/05 02:35:07]

Done.

+    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 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);
+      new data_reduction_proxy::DataReductionProxyAuthRequestHandler(
+          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(
-      globals_->on_resolve_proxy_handler);
+      base::Bind(data_reduction_proxy::OnResolveProxyHandler));
 #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 channel ID store.
@@ skipping 699 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;
 }