Componentize proxy code from chrome/browser/net

chrome/browser/extensions/api/proxy/proxy_apitest.cc

 // Copyright (c) 2012 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 "base/prefs/pref_service.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/pref_names.h"
 #include "components/proxy_config/proxy_config_dictionary.h"
+#include "components/proxy_config/proxy_config_pref_names.h"
 #include "extensions/common/extension.h"
 #include "extensions/test/result_catcher.h"
 
 namespace extensions {
 
 namespace {
 
 const char kNoServer[] = "";
 const char kNoBypass[] = "";
 const char kNoPac[] = "";
 
 }  // namespace
 
 class ProxySettingsApiTest : public ExtensionApiTest {
  protected:
   void ValidateSettings(int expected_mode,
                         const std::string& expected_server,
                         const std::string& bypass,
                         const std::string& expected_pac_url,
                         PrefService* pref_service) {
     const PrefService::Preference* pref =
-        pref_service->FindPreference(prefs::kProxy);
+        pref_service->FindPreference(proxy_config::prefs::kProxy);
     ASSERT_TRUE(pref != NULL);
     EXPECT_TRUE(pref->IsExtensionControlled());
 
-    ProxyConfigDictionary dict(pref_service->GetDictionary(prefs::kProxy));
+    ProxyConfigDictionary dict(
+        pref_service->GetDictionary(proxy_config::prefs::kProxy));
 
     ProxyPrefs::ProxyMode mode;
     ASSERT_TRUE(dict.GetMode(&mode));
     EXPECT_EQ(expected_mode, mode);
 
     std::string value;
     if (!bypass.empty()) {
        ASSERT_TRUE(dict.GetBypassList(&value));
        EXPECT_EQ(bypass, value);
      } else {
@@ skipping 10 matching lines @@
     if (!expected_server.empty()) {
       ASSERT_TRUE(dict.GetProxyServer(&value));
       EXPECT_EQ(expected_server, value);
     } else {
       EXPECT_FALSE(dict.GetProxyServer(&value));
     }
   }
 
   void ExpectNoSettings(PrefService* pref_service) {
     const PrefService::Preference* pref =
-        pref_service->FindPreference(prefs::kProxy);
+        pref_service->FindPreference(proxy_config::prefs::kProxy);
     ASSERT_TRUE(pref != NULL);
     EXPECT_FALSE(pref->IsExtensionControlled());
   }
 
   bool SetIsIncognitoEnabled(bool enabled) {
     ResultCatcher catcher;
     extensions::util::SetIsIncognitoEnabled(
         GetSingleLoadedExtension()->id(), browser()->profile(), enabled);
     if (!catcher.GetNextResult()) {
       message_ = catcher.message();
@@ skipping 243 matching lines @@
       RunExtensionSubtest("proxy/events", "invalid_proxy.html")) << message_;
 }
 
 // Tests error events: PAC script parse error.
 IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, ProxyEventsParseError) {
   ASSERT_TRUE(
       RunExtensionSubtest("proxy/events", "parse_error.html")) << message_;
 }
 
 }  // namespace extensions