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

chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_unittest.cc

 // Copyright 2015 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 <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/testing_pref_service.h"
 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h"
@@ skipping 69 matching lines @@
   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, 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");
   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());
 
   base::DictionaryValue* value =
       (base::DictionaryValue*)test_context_->pref_service()->GetUserPref(
           prefs::kProxy);
   std::string mode;
   EXPECT_TRUE(value->GetString("mode", &mode));
   EXPECT_EQ("fixed_servers", mode);
   std::string server;
   EXPECT_TRUE(value->GetString("server", &server));
   EXPECT_EQ("http=https://youtube.com", server);
 }