Componentize proxy code from chrome/browser/net

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

Index: chrome/browser/extensions/api/proxy/proxy_apitest.cc
diff --git a/chrome/browser/extensions/api/proxy/proxy_apitest.cc b/chrome/browser/extensions/api/proxy/proxy_apitest.cc
index bd8041288e1930fd487e5a83e1546e0acd67e884..740efa54e8567c8561441bf8901281dadac018b0 100644
--- a/chrome/browser/extensions/api/proxy/proxy_apitest.cc
+++ b/chrome/browser/extensions/api/proxy/proxy_apitest.cc
@@ -8,8 +8,8 @@
 #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"
 
@@ -31,11 +31,12 @@ class ProxySettingsApiTest : public ExtensionApiTest {
                         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));
@@ -66,7 +67,7 @@ class ProxySettingsApiTest : public ExtensionApiTest {
 
   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());
   }