Check for *.googlezip.net proxies when migrating proxy pref for DRP.

chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.cc

Index: chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.cc
diff --git a/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.cc b/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.cc
index d819d78abac955e3c631593d0534b995f522480a..abd13b8a9b23505ad7d6f5f3321f3fbd3ab1b866 100644
--- a/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.cc
+++ b/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.cc
@@ -9,6 +9,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
+#include "base/strings/string_util.h"
 #include "base/time/time.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
@@ -22,8 +23,40 @@
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_service.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.h"
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h"
+#include "net/base/host_port_pair.h"
+#include "net/proxy/proxy_config.h"
+#include "net/proxy/proxy_list.h"
+#include "net/proxy/proxy_server.h"
 #include "net/url_request/url_request_context_getter.h"
 
+namespace {
+
+// Assume that any proxy host ending with this suffix is a Data Reduction Proxy.
+const char kDataReductionProxyHostSuffix[] = ".googlezip.net";
+
+// Searches |proxy_list| for any Data Reduction Proxies, even if they don't
+// match a currently configured Data Reduction Proxy.
+bool ContainsDataReductionProxy(const net::ProxyList& proxy_list) {
+  for (const net::ProxyServer& proxy : proxy_list.GetAll()) {
+    if (proxy.is_valid() && !proxy.is_direct() &&
+        EndsWith(proxy.host_port_pair().host(), kDataReductionProxyHostSuffix,
+                 true)) {
+      return true;
+    }
+  }
+  return false;
+}
+
+// Searches |proxy_rules| for any Data Reduction Proxies, even if they don't
+// match a currently configured Data Reduction Proxy.
+bool ContainsDataReductionProxy(
+    const net::ProxyConfig::ProxyRules& proxy_rules) {
+  return ContainsDataReductionProxy(proxy_rules.proxies_for_http) ||
+         ContainsDataReductionProxy(proxy_rules.proxies_for_https);
+}
+
+}  // namespace
+
 // The Data Reduction Proxy has been turned into a "best effort" proxy,
 // meaning it is used only if the effective proxy configuration resolves to
 // DIRECT for a URL. It no longer can be a ProxyConfig in the proxy preference
@@ -58,7 +91,12 @@ void DataReductionProxyChromeSettings::MigrateDataReductionProxyOffProxyPrefs(
     return;
   net::ProxyConfig::ProxyRules proxy_rules;
   proxy_rules.ParseFromString(proxy_server);
-  if (!Config()->ContainsDataReductionProxy(proxy_rules)) {
+  // Clear the proxy pref if it matches a currently configured Data Reduction
+  // Proxy, or if the proxy host ends with ".googlezip.net", in order to ensure
+  // that any DRP in the pref is cleared even if the DRP configuration was
+  // changed. See http://crbug.com/476610.
+  if (!Config()->ContainsDataReductionProxy(proxy_rules) &&
+      !ContainsDataReductionProxy(proxy_rules)) {

[bengr, 2015/04/28 16:52:27]

You might want to rename this method to be clearer, e.g.,
ContainsDataReductionProxyDefaultHostSuffix. Might also be better to move it to
Config, and I'd even consider adding these rules to Config's
ContainsDataReductionProxy, since no one else calls that method.

[sclittle, 2015/04/28 18:27:57]

Renamed.

I'd lean toward keeping this here. Config only cares about the currently
configured Data Reduction Proxies - this method specifically doesn't care about
the currently configured DRPs and just looks for .googlezip.net.

Also, this method is somewhat slow, which doesn't really matter here because we
just loaded a pref and parsed the proxy rules from a string anyways, but that
slowness could be significant if it were run on every request like most of the
stuff in Config is.

It's also easier to merge if it's just in this file.

     return;
   }
   prefs->ClearPref(prefs::kProxy);