Moved data reduction proxy initialization logic to ProfileImplIOData

components/data_reduction_proxy/browser/data_reduction_proxy_settings.cc

 // Copyright 2014 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 "components/data_reduction_proxy/browser/data_reduction_proxy_settings.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
@@ skipping 69 matching lines @@
 
 }  // namespace
 
 namespace data_reduction_proxy {
 
 DataReductionProxySettings::DataReductionProxySettings(
     DataReductionProxyParams* params)
     : restricted_by_carrier_(false),
       enabled_by_user_(false),
       disabled_on_vpn_(false),
+      unreachable_(false),
       prefs_(NULL),
       local_state_prefs_(NULL),
       url_request_context_getter_(NULL) {
   DCHECK(params);
   params_.reset(params);
 }
 
 DataReductionProxySettings::~DataReductionProxySettings() {
   if (params_->allowed())
     spdy_proxy_auth_enabled_.Destroy();
@@ skipping 100 matching lines @@
   base::Time last_update = base::Time::FromInternalValue(last_update_internal);
   return static_cast<int64>(last_update.ToJsTime());
 }
 
 DataReductionProxySettings::ContentLengthList
 DataReductionProxySettings::GetDailyOriginalContentLengths() {
   DCHECK(thread_checker_.CalledOnValidThread());
   return GetDailyContentLengths(prefs::kDailyHttpOriginalContentLength);
 }
 
+void DataReductionProxySettings::SetUnreachable(bool unreachable) {
+  unreachable_ = unreachable;
+}
+
 bool DataReductionProxySettings::IsDataReductionProxyUnreachable() {
   DCHECK(thread_checker_.CalledOnValidThread());
-  return usage_stats_ && usage_stats_->isDataReductionProxyUnreachable();
-}
-
-void DataReductionProxySettings::SetDataReductionProxyUsageStats(
-    DataReductionProxyUsageStats* usage_stats) {
-  usage_stats_ = usage_stats;
+  return unreachable_;
 }
 
 DataReductionProxySettings::ContentLengthList
 DataReductionProxySettings::GetDailyReceivedContentLengths() {
   DCHECK(thread_checker_.CalledOnValidThread());
   return GetDailyContentLengths(prefs::kDailyHttpReceivedContentLength);
 }
 
 void DataReductionProxySettings::OnURLFetchComplete(
     const net::URLFetcher* source) {
@@ skipping 58 matching lines @@
   return prefs_;
 }
 
 PrefService* DataReductionProxySettings::GetLocalStatePrefs() {
   DCHECK(thread_checker_.CalledOnValidThread());
   return local_state_prefs_;
 }
 
 void DataReductionProxySettings::AddDefaultProxyBypassRules() {
   // localhost
+  DCHECK(configurator_);
   configurator_->AddHostPatternToBypass("<local>");
   // RFC1918 private addresses.
   configurator_->AddHostPatternToBypass("10.0.0.0/8");
   configurator_->AddHostPatternToBypass("172.16.0.0/12");
   configurator_->AddHostPatternToBypass("192.168.0.0/16");
   // RFC4193 private addresses.
   configurator_->AddHostPatternToBypass("fc00::/7");
   // IPV6 probe addresses.
   configurator_->AddHostPatternToBypass("*-ds.metric.gstatic.com");
   configurator_->AddHostPatternToBypass("*-v4.metric.gstatic.com");
+#if defined(OS_ANDROID)
+  // Chrome cannot authenticate with the data reduction proxy when fetching URLs
+  // from the settings menu.
+  configurator_->AddURLPatternToBypass(
+      "http://www.google.com/policies/privacy*");
+  configurator_->AddHostPatternToBypass("*freezone.google.com");
+  configurator_->AddHostPatternToBypass("freezone.googleusercontent.com");
+  configurator_->AddURLPatternToBypass("http://g.co/gms/*");
+  configurator_->AddURLPatternToBypass("http://g.co/freezone*");
+#endif
 }
 
 void DataReductionProxySettings::LogProxyState(
     bool enabled, bool restricted, bool at_startup) {
   // This must stay a LOG(WARNING); the output is used in processing customer
   // feedback.
   const char kAtStartup[] = "at startup";
   const char kByUser[] = "by user action";
   const char kOn[] = "ON";
   const char kOff[] = "OFF";
@@ skipping 71 matching lines @@
     ProbeWhetherDataReductionProxyIsAvailable();
     WarmProxyConnection();
   }
 }
 
 void DataReductionProxySettings::SetProxyConfigs(bool enabled,
                                                  bool alternative_enabled,
                                                  bool restricted,
                                                  bool at_startup) {
   DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK(configurator_);
+
   LogProxyState(enabled, restricted, at_startup);
   // The alternative is only configured if the standard configuration is
   // is enabled.
   if (enabled & !params_->holdback()) {
     if (alternative_enabled) {
       configurator_->Enable(restricted,
                             !params_->fallback_allowed(),
                             params_->alt_origin().spec(),
                             params_->alt_fallback_origin().spec(),
                             params_->ssl_origin().spec());
@@ skipping 173 matching lines @@
     SetProxyConfigs(enabled_by_user_,
                     IsDataReductionProxyAlternativeEnabled(),
                     restricted_by_carrier_,
                     false);
   }
   disabled_on_vpn_ = false;
   return false;
 }
 
 }  // namespace data_reduction_proxy