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

chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_unittest.cc

Index: chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_unittest.cc
diff --git a/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_unittest.cc b/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_unittest.cc
index c9de4084b69156078e759fa7b7604520d3da12b7..6e2f359a7c0064d35aa0ee45c888f008c4d8ae2b 100644
--- a/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_unittest.cc
+++ b/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_unittest.cc
@@ -87,6 +87,36 @@ TEST_F(DataReductionProxyChromeSettingsTest, MigrateDataReductionProxy) {
   EXPECT_EQ(NULL, test_context_->pref_service()->GetUserPref(prefs::kProxy));
 }
 
+TEST_F(DataReductionProxyChromeSettingsTest, MigrateCustomDataReductionProxy) {
+  dict_->SetString("mode", "fixed_servers");
+  dict_->SetString("server", "http=https://my-drp.net");
+  test_context_->pref_service()->Set(prefs::kProxy, *dict_.get());
+  EXPECT_CALL(*config_, ContainsDataReductionProxy(_))
+      .Times(1)
+      .WillOnce(Return(true));
+
+  drp_chrome_settings_->MigrateDataReductionProxyOffProxyPrefs(
+      test_context_->pref_service());
+
+  EXPECT_EQ(NULL, test_context_->pref_service()->GetUserPref(prefs::kProxy));
+}
+
+TEST_F(DataReductionProxyChromeSettingsTest, MigrateDevDataReductionProxy) {
+  // The proxy pref is set to a Data Reduction Proxy that doesn't match the
+  // currently configured DRP, but the pref should still be cleared.
+  dict_->SetString("mode", "fixed_servers");
+  dict_->SetString("server", "http=http://proxy-dev.googlezip.net");

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

Add a few more strings to test. E.g "http://googlezip.net"

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

Sure, added some more.

"http://googlezip.net" doesn't actually get matched here, since this only
matches "*.googlezip.net" (note the leading ".").

The idea was that someone might have a proxy at a domain name ending in
"googlezip.net", such as "thisismyproxynotgooglezip.net" or
"arbitraryprefixgooglezip.net", and we wouldn't want to delete those proxy prefs
inadvertently.

[bengr, 2015/04/28 18:31:53]

I understand the intention, but please also test http://googlezip.net to make it
clear that it would not match.

[sclittle, 2015/04/28 19:25:20]

Done.

+  test_context_->pref_service()->Set(prefs::kProxy, *dict_.get());
+  EXPECT_CALL(*config_, ContainsDataReductionProxy(_))
+      .Times(1)
+      .WillOnce(Return(false));
+
+  drp_chrome_settings_->MigrateDataReductionProxyOffProxyPrefs(
+      test_context_->pref_service());
+
+  EXPECT_EQ(NULL, test_context_->pref_service()->GetUserPref(prefs::kProxy));
+}
+
 TEST_F(DataReductionProxyChromeSettingsTest, MigrateIgnoreOtherProxy) {
   dict_->SetString("mode", "fixed_servers");
   dict_->SetString("server", "http=https://youtube.com");