Componentize proxy code from chrome/browser/net

chrome/browser/renderer_context_menu/render_view_context_menu_unittest.cc

Index: chrome/browser/renderer_context_menu/render_view_context_menu_unittest.cc
diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu_unittest.cc b/chrome/browser/renderer_context_menu/render_view_context_menu_unittest.cc
index 2f82aa31e49f1893cc405b43f46d62c760064624..c3a1e4fabbb8c45cb11b1402b59f915c7486e301 100644
--- a/chrome/browser/renderer_context_menu/render_view_context_menu_unittest.cc
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu_unittest.cc
@@ -19,7 +19,6 @@
 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_factory.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/renderer_context_menu/render_view_context_menu_test_util.h"
-#include "chrome/common/pref_names.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_test_utils.h"
@@ -27,6 +26,7 @@
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_headers.h"
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h"
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.h"
+#include "components/proxy_config/proxy_config_pref_names.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/web_contents_tester.h"
 
@@ -377,11 +377,11 @@ class RenderViewContextMenuPrefsTest : public ChromeRenderViewHostTestHarness {
         DataReductionProxyChromeSettingsFactory::GetForBrowserContext(
             profile());
 
-    // TODO(bengr): Remove prefs::kProxy registration after M46. See
+    // TODO(bengr): Remove ProxyPrefs::prefs::kProxy registration after M46. See
     // http://crbug.com/445599.
     PrefRegistrySimple* registry =
         drp_test_context_->pref_service()->registry();
-    registry->RegisterDictionaryPref(prefs::kProxy);
+    registry->RegisterDictionaryPref(ProxyPrefs::prefs::kProxy);
 
     drp_test_context_->pref_service()->SetBoolean(
         data_reduction_proxy::prefs::kDataReductionProxyEnabled,