Componentize proxy code from chrome/browser/net

chrome/browser/chromeos/proxy_config_service_impl_unittest.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 "chrome/browser/chromeos/proxy_config_service_impl.h"
 
 #include <vector>
 
 #include "base/format_macros.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/testing_pref_service.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/chromeos/net/proxy_config_handler.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
 #include "chrome/browser/chromeos/ui_proxy_config.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/shill_profile_client.h"
 #include "chromeos/dbus/shill_service_client.h"
 #include "chromeos/network/network_handler.h"
 #include "chromeos/network/network_profile_handler.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "chromeos/network/onc/onc_utils.h"
 #include "components/pref_registry/testing_pref_service_syncable.h"
+#include "components/proxy_config/proxy_config_pref_names.h"
 #include "content/public/test/test_browser_thread.h"
 #include "net/proxy/proxy_config.h"
 #include "net/proxy/proxy_config_service_common_unittest.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 using content::BrowserThread;
 
 namespace chromeos {
 
@@ skipping 395 matching lines @@
     base::DictionaryValue managed_config;
     InitConfigWithTestInput(managed_params.input, &managed_config);
     base::DictionaryValue recommended_config;
     InitConfigWithTestInput(recommended_params.input, &recommended_config);
     base::DictionaryValue network_config;
     InitConfigWithTestInput(network_params.input, &network_config);
 
     // Managed proxy pref should take effect over recommended proxy and
     // non-existent network proxy.
     SetUserConfigInShill(nullptr);
-    pref_service_.SetManagedPref(prefs::kProxy, managed_config.DeepCopy());
-    pref_service_.SetRecommendedPref(prefs::kProxy,
+    pref_service_.SetManagedPref(ProxyPrefs::prefs::kProxy,
+                                 managed_config.DeepCopy());
+    pref_service_.SetRecommendedPref(ProxyPrefs::prefs::kProxy,
                                      recommended_config.DeepCopy());
     net::ProxyConfig actual_config;
     SyncGetLatestProxyConfig(&actual_config);
     EXPECT_EQ(managed_params.auto_detect, actual_config.auto_detect());
     EXPECT_EQ(managed_params.pac_url, actual_config.pac_url());
     EXPECT_TRUE(managed_params.proxy_rules.Matches(
         actual_config.proxy_rules()));
 
     // Recommended proxy pref should take effect when managed proxy pref is
     // removed.
-    pref_service_.RemoveManagedPref(prefs::kProxy);
+    pref_service_.RemoveManagedPref(ProxyPrefs::prefs::kProxy);
     SyncGetLatestProxyConfig(&actual_config);
     EXPECT_EQ(recommended_params.auto_detect, actual_config.auto_detect());
     EXPECT_EQ(recommended_params.pac_url, actual_config.pac_url());
     EXPECT_TRUE(recommended_params.proxy_rules.Matches(
         actual_config.proxy_rules()));
 
     // Network proxy should take take effect over recommended proxy pref.
     SetUserConfigInShill(&network_config);
     SyncGetLatestProxyConfig(&actual_config);
     EXPECT_EQ(network_params.auto_detect, actual_config.auto_detect());
     EXPECT_EQ(network_params.pac_url, actual_config.pac_url());
     EXPECT_TRUE(network_params.proxy_rules.Matches(
         actual_config.proxy_rules()));
 
     // Managed proxy pref should take effect over network proxy.
-    pref_service_.SetManagedPref(prefs::kProxy, managed_config.DeepCopy());
+    pref_service_.SetManagedPref(ProxyPrefs::prefs::kProxy,
+                                 managed_config.DeepCopy());
     SyncGetLatestProxyConfig(&actual_config);
     EXPECT_EQ(managed_params.auto_detect, actual_config.auto_detect());
     EXPECT_EQ(managed_params.pac_url, actual_config.pac_url());
     EXPECT_TRUE(managed_params.proxy_rules.Matches(
         actual_config.proxy_rules()));
 
     // Network proxy should take effect over recommended proxy pref when managed
     // proxy pref is removed.
-    pref_service_.RemoveManagedPref(prefs::kProxy);
+    pref_service_.RemoveManagedPref(ProxyPrefs::prefs::kProxy);
     SyncGetLatestProxyConfig(&actual_config);
     EXPECT_EQ(network_params.auto_detect, actual_config.auto_detect());
     EXPECT_EQ(network_params.pac_url, actual_config.pac_url());
     EXPECT_TRUE(network_params.proxy_rules.Matches(
         actual_config.proxy_rules()));
 
     // Removing recommended proxy pref should have no effect on network proxy.
-    pref_service_.RemoveRecommendedPref(prefs::kProxy);
+    pref_service_.RemoveRecommendedPref(ProxyPrefs::prefs::kProxy);
     SyncGetLatestProxyConfig(&actual_config);
     EXPECT_EQ(network_params.auto_detect, actual_config.auto_detect());
     EXPECT_EQ(network_params.pac_url, actual_config.pac_url());
     EXPECT_TRUE(network_params.proxy_rules.Matches(
         actual_config.proxy_rules()));
   }
 }
 
 // Tests whether the proxy settings from user policy are used for ethernet even
 // if 'UseSharedProxies' is set to false.
@@ skipping 14 matching lines @@
                                 network_configs.release());
 
   net::ProxyConfig actual_config;
   SyncGetLatestProxyConfig(&actual_config);
   net::ProxyConfig expected_config =
       net::ProxyConfig::CreateFromCustomPacURL(GURL("http://domain.com/x"));
   EXPECT_TRUE(expected_config.Equals(actual_config));
 }
 
 }  // namespace chromeos