Handle disabling data reduction proxy for all platforms.

chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator.cc

Index: chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator.cc
diff --git a/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator.cc b/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator.cc
index cb9e788a19141c70da51ee1a9136e3174f006b5a..b977809c1bc2c88a72db081da5d6340459c00e67 100644
--- a/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator.cc
+++ b/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator.cc
@@ -10,8 +10,10 @@
 #include "base/strings/string_util.h"
 #include "chrome/browser/prefs/proxy_prefs.h"
 #include "chrome/common/pref_names.h"
+#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_params.h"
 #include "net/proxy/proxy_config.h"
 #include "net/proxy/proxy_info.h"
+#include "net/proxy/proxy_list.h"
 #include "net/proxy/proxy_service.h"
 
 DataReductionProxyChromeConfigurator::DataReductionProxyChromeConfigurator(
@@ -23,6 +25,26 @@ DataReductionProxyChromeConfigurator::DataReductionProxyChromeConfigurator(
 DataReductionProxyChromeConfigurator::~DataReductionProxyChromeConfigurator() {
 }
 
+// static
+void DataReductionProxyChromeConfigurator::DisableInProxyConfigPref(
+    PrefService* prefs) {
+  DCHECK(prefs);
+  DictionaryPrefUpdate update(prefs, prefs::kProxy);
+  base::DictionaryValue* dict = update.Get();
+  std::string mode;
+  dict->GetString("mode", &mode);
+  std::string server;
+  dict->GetString("server", &server);
+  if (mode != ProxyModeToString(ProxyPrefs::MODE_FIXED_SERVERS)
+      || !ContainsDataReductionProxy(server)) {
+    return;
+  }
+
+  dict->SetString("mode", ProxyModeToString(ProxyPrefs::MODE_SYSTEM));
+  dict->SetString("server", "");
+  dict->SetString("bypass_list", "");
+}
+
 void DataReductionProxyChromeConfigurator::Enable(
     bool primary_restricted,
     bool fallback_restricted,
@@ -85,12 +107,7 @@ void DataReductionProxyChromeConfigurator::Enable(
 }
 
 void DataReductionProxyChromeConfigurator::Disable() {
-  DCHECK(prefs_);
-  DictionaryPrefUpdate update(prefs_, prefs::kProxy);
-  base::DictionaryValue* dict = update.Get();
-  dict->SetString("mode", ProxyModeToString(ProxyPrefs::MODE_SYSTEM));
-  dict->SetString("server", "");
-  dict->SetString("bypass_list", "");
+  DisableInProxyConfigPref(prefs_);
   net::ProxyConfig config = net::ProxyConfig::CreateDirect();
   network_task_runner_->PostTask(
       FROM_HERE,
@@ -120,6 +137,35 @@ void DataReductionProxyChromeConfigurator::AddURLPatternToBypass(
   AddHostPatternToBypass(host_pattern);
 }
 
+// static
+bool DataReductionProxyChromeConfigurator::ContainsDataReductionProxy(
+    const std::string& server) {
+  data_reduction_proxy::DataReductionProxyParams params(0);

[bengr, 2014/10/29 20:58:46]

How does this work? Nothing is allowed, so IsDataReductionProxy would always be
false.

[Not at Google. Contact bengr, 2014/10/29 22:30:14]

You are right. Added the correct parameters.

This was working because allowed() is not checked in the IsDataReductionProxy()
method. I added the checks for allowed() as well as alternative_allowed() to
IsDataReductionProxy().

+  net::ProxyConfig::ProxyRules proxy_rules;
+  proxy_rules.ParseFromString(server);
+  if (proxy_rules.type != net::ProxyConfig::ProxyRules::TYPE_PROXY_PER_SCHEME) {
+    return false;
+  }
+
+  const net::ProxyList* https_proxy_list =
+      proxy_rules.MapUrlSchemeToProxyList("https");
+  if (https_proxy_list && !https_proxy_list->IsEmpty() &&
+      params.IsDataReductionProxy(https_proxy_list->Get().host_port_pair(),
+                                  NULL)) {
+    return true;
+  }
+
+  const net::ProxyList* http_proxy_list =
+      proxy_rules.MapUrlSchemeToProxyList("http");
+  if (http_proxy_list && !http_proxy_list->IsEmpty() &&

[bengr, 2014/10/29 20:58:46]

// It is sufficient to check only the first proxy on the proxy list, because all
data reduction proxy configurations start with a data reduction proxy.

[Not at Google. Contact bengr, 2014/10/29 22:30:14]

Done.

+      params.IsDataReductionProxy(http_proxy_list->Get().host_port_pair(),
+                                  NULL)) {
+    return true;
+  }
+
+  return false;
+}
+
 void DataReductionProxyChromeConfigurator::UpdateProxyConfigOnIO(
     const net::ProxyConfig& config) {
   config_ = config;