Componentize proxy code from chrome/browser/net

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 "base/test/histogram_tester.h"
 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h"
-#include "chrome/common/pref_names.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_config_test_utils.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_test_utils.h"
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h"
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_params_test_utils.h"
+#include "components/proxy_config/proxy_config_pref_names.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::_;
 using testing::Return;
 
 class DataReductionProxyChromeSettingsTest : public testing::Test {
  public:
   void SetUp() override {
     drp_chrome_settings_ =
         make_scoped_ptr(new DataReductionProxyChromeSettings());
     test_context_ =
         data_reduction_proxy::DataReductionProxyTestContext::Builder()
             .WithMockConfig()
             .SkipSettingsInitialization()
             .Build();
     config_ = test_context_->mock_config();
     drp_chrome_settings_->ResetConfigForTest(config_);
     dict_ = make_scoped_ptr(new base::DictionaryValue());
 
     PrefRegistrySimple* registry = test_context_->pref_service()->registry();
-    registry->RegisterDictionaryPref(prefs::kProxy);
+    registry->RegisterDictionaryPref(ProxyPrefs::prefs::kProxy);
   }
 
   base::MessageLoopForIO message_loop_;
   scoped_ptr<DataReductionProxyChromeSettings> drp_chrome_settings_;
   scoped_ptr<base::DictionaryValue> dict_;
   scoped_ptr<data_reduction_proxy::DataReductionProxyTestContext> test_context_;
   data_reduction_proxy::MockDataReductionProxyConfig* config_;
 };
 
 TEST_F(DataReductionProxyChromeSettingsTest, MigrateNonexistentProxyPref) {
   base::HistogramTester histogram_tester;
   EXPECT_CALL(*config_, ContainsDataReductionProxy(_)).Times(0);
   drp_chrome_settings_->MigrateDataReductionProxyOffProxyPrefs(
       test_context_->pref_service());
 
-  EXPECT_EQ(NULL, test_context_->pref_service()->GetUserPref(prefs::kProxy));
+  EXPECT_EQ(NULL, test_context_->pref_service()->GetUserPref(
+                      ProxyPrefs::prefs::kProxy));
   histogram_tester.ExpectUniqueSample(
       "DataReductionProxy.ProxyPrefMigrationResult",
       DataReductionProxyChromeSettings::PROXY_PREF_NOT_CLEARED, 1);
 }
 
 TEST_F(DataReductionProxyChromeSettingsTest, MigrateBadlyFormedProxyPref) {
   const struct {
     // NULL indicates that mode is unset.
     const char* proxy_mode_string;
     // NULL indicates that server is unset.
     const char* proxy_server_string;
   } test_cases[] = {
       // The pref should not be cleared if mode is unset.
       {nullptr, "http=compress.googlezip.net"},
       // The pref should not be cleared for modes other than "fixed_servers" and
       // "pac_script".
       {"auto_detect", "http=compress.googlezip.net"},
       // The pref should not be cleared when the server field is unset.
       {"fixed_servers", nullptr},
   };
 
   for (const auto& test : test_cases) {
     base::HistogramTester histogram_tester;
     dict_.reset(new base::DictionaryValue());
     if (test.proxy_mode_string)
       dict_->SetString("mode", test.proxy_mode_string);
     if (test.proxy_server_string)
       dict_->SetString("server", test.proxy_server_string);
-    test_context_->pref_service()->Set(prefs::kProxy, *dict_.get());
+    test_context_->pref_service()->Set(ProxyPrefs::prefs::kProxy, *dict_.get());
 
     EXPECT_CALL(*config_, ContainsDataReductionProxy(_)).Times(0);
     drp_chrome_settings_->MigrateDataReductionProxyOffProxyPrefs(
         test_context_->pref_service());
 
     const base::DictionaryValue* final_value;
     test_context_->pref_service()
-        ->GetUserPref(prefs::kProxy)
+        ->GetUserPref(ProxyPrefs::prefs::kProxy)
         ->GetAsDictionary(&final_value);
     EXPECT_NE(nullptr, final_value);
     EXPECT_TRUE(dict_->Equals(final_value));
 
     histogram_tester.ExpectUniqueSample(
         "DataReductionProxy.ProxyPrefMigrationResult",
         DataReductionProxyChromeSettings::PROXY_PREF_NOT_CLEARED, 1);
   }
 }
 
 TEST_F(DataReductionProxyChromeSettingsTest, MigrateEmptyProxy) {
   base::HistogramTester histogram_tester;
-  test_context_->pref_service()->Set(prefs::kProxy, *dict_.get());
+  test_context_->pref_service()->Set(ProxyPrefs::prefs::kProxy, *dict_.get());
   EXPECT_CALL(*config_, ContainsDataReductionProxy(_)).Times(0);
   drp_chrome_settings_->MigrateDataReductionProxyOffProxyPrefs(
       test_context_->pref_service());
 
-  EXPECT_EQ(NULL, test_context_->pref_service()->GetUserPref(prefs::kProxy));
+  EXPECT_EQ(NULL, test_context_->pref_service()->GetUserPref(
+                      ProxyPrefs::prefs::kProxy));
   histogram_tester.ExpectUniqueSample(
       "DataReductionProxy.ProxyPrefMigrationResult",
       DataReductionProxyChromeSettings::PROXY_PREF_CLEARED_EMPTY, 1);
 }
 
 TEST_F(DataReductionProxyChromeSettingsTest, MigrateSystemProxy) {
   base::HistogramTester histogram_tester;
   dict_->SetString("mode", "system");
-  test_context_->pref_service()->Set(prefs::kProxy, *dict_.get());
+  test_context_->pref_service()->Set(ProxyPrefs::prefs::kProxy, *dict_.get());
   EXPECT_CALL(*config_, ContainsDataReductionProxy(_)).Times(0);
 
   drp_chrome_settings_->MigrateDataReductionProxyOffProxyPrefs(
       test_context_->pref_service());
 
-  EXPECT_EQ(NULL, test_context_->pref_service()->GetUserPref(prefs::kProxy));
+  EXPECT_EQ(NULL, test_context_->pref_service()->GetUserPref(
+                      ProxyPrefs::prefs::kProxy));
   histogram_tester.ExpectUniqueSample(
       "DataReductionProxy.ProxyPrefMigrationResult",
       DataReductionProxyChromeSettings::PROXY_PREF_CLEARED_MODE_SYSTEM, 1);
 }
 
 TEST_F(DataReductionProxyChromeSettingsTest, MigrateDataReductionProxy) {
   const std::string kTestServers[] = {"http=http://proxy.googlezip.net",
                                       "http=https://my-drp.org",
                                       "https=https://tunneldrp.com"};
 
   for (const std::string& test_server : kTestServers) {
     base::HistogramTester histogram_tester;
     dict_.reset(new base::DictionaryValue());
     dict_->SetString("mode", "fixed_servers");
     dict_->SetString("server", test_server);
-    test_context_->pref_service()->Set(prefs::kProxy, *dict_.get());
+    test_context_->pref_service()->Set(ProxyPrefs::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));
+    EXPECT_EQ(NULL, test_context_->pref_service()->GetUserPref(
+                        ProxyPrefs::prefs::kProxy));
     histogram_tester.ExpectUniqueSample(
         "DataReductionProxy.ProxyPrefMigrationResult",
         DataReductionProxyChromeSettings::PROXY_PREF_CLEARED_DRP, 1);
   }
 }
 
 TEST_F(DataReductionProxyChromeSettingsTest,
        MigrateGooglezipDataReductionProxy) {
   const std::string kTestServers[] = {
       "http=http://proxy-dev.googlezip.net",
       "http=https://arbitraryprefix.googlezip.net",
       "https=https://tunnel.googlezip.net"};
 
   for (const std::string& test_server : kTestServers) {
     base::HistogramTester histogram_tester;
     dict_.reset(new base::DictionaryValue());
     // 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", test_server);
-    test_context_->pref_service()->Set(prefs::kProxy, *dict_.get());
+    test_context_->pref_service()->Set(ProxyPrefs::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));
+    EXPECT_EQ(NULL, test_context_->pref_service()->GetUserPref(
+                        ProxyPrefs::prefs::kProxy));
     histogram_tester.ExpectUniqueSample(
         "DataReductionProxy.ProxyPrefMigrationResult",
         DataReductionProxyChromeSettings::PROXY_PREF_CLEARED_GOOGLEZIP, 1);
   }
 }
 
 TEST_F(DataReductionProxyChromeSettingsTest,
        MigratePacGooglezipDataReductionProxy) {
   const struct {
     const char* pac_url;
@@ skipping 63 matching lines @@
        false},
       // PAC URL that doesn't embed a script.
       {"http://compress.googlezip.net/pac", false},
   };
 
   for (const auto& test : test_cases) {
     base::HistogramTester histogram_tester;
     dict_.reset(new base::DictionaryValue());
     dict_->SetString("mode", "pac_script");
     dict_->SetString("pac_url", test.pac_url);
-    test_context_->pref_service()->Set(prefs::kProxy, *dict_.get());
+    test_context_->pref_service()->Set(ProxyPrefs::prefs::kProxy, *dict_.get());
     EXPECT_CALL(*config_, ContainsDataReductionProxy(_)).Times(0);
 
     drp_chrome_settings_->MigrateDataReductionProxyOffProxyPrefs(
         test_context_->pref_service());
 
     if (test.expect_pref_cleared) {
-      EXPECT_EQ(NULL,
-                test_context_->pref_service()->GetUserPref(prefs::kProxy));
+      EXPECT_EQ(NULL, test_context_->pref_service()->GetUserPref(
+                          ProxyPrefs::prefs::kProxy));
       histogram_tester.ExpectUniqueSample(
           "DataReductionProxy.ProxyPrefMigrationResult",
           DataReductionProxyChromeSettings::PROXY_PREF_CLEARED_PAC_GOOGLEZIP,
           1);
     } else {
       const base::DictionaryValue* value;
       EXPECT_TRUE(test_context_->pref_service()
-                      ->GetUserPref(prefs::kProxy)
+                      ->GetUserPref(ProxyPrefs::prefs::kProxy)
                       ->GetAsDictionary(&value));
       std::string mode;
       EXPECT_TRUE(value->GetString("mode", &mode));
       EXPECT_EQ("pac_script", mode);
       std::string pac_url;
       EXPECT_TRUE(value->GetString("pac_url", &pac_url));
       EXPECT_EQ(test.pac_url, pac_url);
 
       histogram_tester.ExpectUniqueSample(
           "DataReductionProxy.ProxyPrefMigrationResult",
           DataReductionProxyChromeSettings::PROXY_PREF_NOT_CLEARED, 1);
     }
   }
 }
 
 TEST_F(DataReductionProxyChromeSettingsTest, MigrateIgnoreOtherProxy) {
   const std::string kTestServers[] = {
       "http=https://youtube.com",
       "http=http://googlezip.net",
       "http=http://thisismyproxynotgooglezip.net",
       "https=http://arbitraryprefixgooglezip.net"};
 
   for (const std::string& test_server : kTestServers) {
     base::HistogramTester histogram_tester;
     dict_.reset(new base::DictionaryValue());
     dict_->SetString("mode", "fixed_servers");
     dict_->SetString("server", test_server);
-    test_context_->pref_service()->Set(prefs::kProxy, *dict_.get());
+    test_context_->pref_service()->Set(ProxyPrefs::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);
+            ProxyPrefs::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(test_server, server);
 
     histogram_tester.ExpectUniqueSample(
         "DataReductionProxy.ProxyPrefMigrationResult",
         DataReductionProxyChromeSettings::PROXY_PREF_NOT_CLEARED, 1);
   }
 }