Move onc and proxy pref names to components.

chrome/browser/ui/webui/options/preferences_browsertest.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/ui/webui/options/preferences_browsertest.h"
 
 #include <stddef.h>
 
 #include <iostream>
 #include <memory>
@@ skipping 34 matching lines @@
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/proxy_cros_settings_parser.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/stub_install_attributes.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_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "chromeos/settings/cros_settings_names.h"
+#include "components/onc/onc_pref_names.h"
 #include "components/proxy_config/proxy_config_dictionary.h"
+#include "components/proxy_config/proxy_config_pref_names.h"
 #include "content/public/test/test_utils.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #endif
 
 using testing::AllOf;
 using testing::Mock;
 using testing::Property;
 using testing::Return;
 using testing::_;
 
@@ skipping 863 matching lines @@
     EXPECT_TRUE(proxy_dict->GetProxyServer(&actual_proxy_server));
     EXPECT_EQ(expected_server, actual_proxy_server);
     EXPECT_EQ(expected_source, actual_source);
   }
 };
 
 // Verifies that proxy settings are correctly pushed to JavaScript during
 // initialization of the proxy settings page.
 IN_PROC_BROWSER_TEST_F(ProxyPreferencesBrowserTest, ChromeOSInitializeProxy) {
   // Boolean pref.
-  pref_names_.push_back(chromeos::kProxySingle);
+  pref_names_.push_back(chromeos::proxy_cros_settings_parser::kProxySingle);
   non_default_values_.push_back(new base::FundamentalValue(true));
 
   // Integer prefs.
-  pref_names_.push_back(chromeos::kProxySingleHttpPort);
+  pref_names_.push_back(
+      chromeos::proxy_cros_settings_parser::kProxySingleHttpPort);
   non_default_values_.push_back(new base::FundamentalValue(8080));
 
   // String pref.
-  pref_names_.push_back(chromeos::kProxySingleHttp);
+  pref_names_.push_back(chromeos::proxy_cros_settings_parser::kProxySingleHttp);
   non_default_values_.push_back(new base::StringValue("127.0.0.1"));
 
   // List pref.
-  pref_names_.push_back(chromeos::kProxyIgnoreList);
+  pref_names_.push_back(chromeos::proxy_cros_settings_parser::kProxyIgnoreList);
   base::ListValue* list = new base::ListValue();
   list->AppendString("*.google.com");
   list->AppendString("1.2.3.4:22");
   non_default_values_.push_back(list);
 
   // Verify that no policy is presented to the UI. This must be verified on the
   // kProxyType and the kUseSharedProxies prefs.
-  pref_names_.push_back(chromeos::kProxyType);
+  pref_names_.push_back(chromeos::proxy_cros_settings_parser::kProxyType);
   non_default_values_.push_back(new base::FundamentalValue(2));
 
-  pref_names_.push_back(prefs::kUseSharedProxies);
+  pref_names_.push_back(proxy_config::prefs::kUseSharedProxies);
   non_default_values_.push_back(new base::FundamentalValue(false));
 
   std::string observed_json;
   SetupJavaScriptTestEnvironment(pref_names_, &observed_json);
   VerifyObservedPrefs(
       observed_json, pref_names_, non_default_values_.get(), "", false, false);
 }
 
 IN_PROC_BROWSER_TEST_F(ProxyPreferencesBrowserTest, ONCPolicy) {
   SetONCPolicy(policy::key::kOpenNetworkConfiguration,
                policy::POLICY_SCOPE_USER);
 
   // Verify that per-network policy is presented to the UI. This must be
   // verified on the kProxyType.
-  pref_names_.push_back(chromeos::kProxyType);
+  pref_names_.push_back(chromeos::proxy_cros_settings_parser::kProxyType);
   non_default_values_.push_back(new base::FundamentalValue(3));
 
   std::string observed_json;
   SetupJavaScriptTestEnvironment(pref_names_, &observed_json);
   VerifyObservedPrefs(
       observed_json, pref_names_, non_default_values_.get(),
       "policy", true, false);
 
   // Verify that 'use-shared-proxies' is not affected by per-network policy.
   pref_names_.clear();
   non_default_values_.clear();
-  pref_names_.push_back(prefs::kUseSharedProxies);
+  pref_names_.push_back(proxy_config::prefs::kUseSharedProxies);
   non_default_values_.push_back(new base::FundamentalValue(false));
 
   SetupJavaScriptTestEnvironment(pref_names_, &observed_json);
   VerifyObservedPrefs(
       observed_json, pref_names_, non_default_values_.get(), "", false, false);
 }
 
 IN_PROC_BROWSER_TEST_F(ProxyPreferencesBrowserTest, DeviceONCPolicy) {
   SetONCPolicy(policy::key::kDeviceOpenNetworkConfiguration,
                policy::POLICY_SCOPE_MACHINE);
 
   // Verify that the policy is presented to the UI. This verification must be
   // done on the kProxyType pref.
-  pref_names_.push_back(chromeos::kProxyType);
+  pref_names_.push_back(chromeos::proxy_cros_settings_parser::kProxyType);
   non_default_values_.push_back(new base::FundamentalValue(3));
 
   std::string observed_json;
   SetupJavaScriptTestEnvironment(pref_names_, &observed_json);
   VerifyObservedPrefs(
       observed_json, pref_names_, non_default_values_.get(),
       "policy", true, false);
 
   // Verify that 'use-shared-proxies' is not affected by per-network policy.
   pref_names_.clear();
   non_default_values_.clear();
-  pref_names_.push_back(prefs::kUseSharedProxies);
+  pref_names_.push_back(proxy_config::prefs::kUseSharedProxies);
   non_default_values_.push_back(new base::FundamentalValue(false));
 
   SetupJavaScriptTestEnvironment(pref_names_, &observed_json);
   VerifyObservedPrefs(
       observed_json, pref_names_, non_default_values_.get(), "", false, false);
 }
 
 IN_PROC_BROWSER_TEST_F(ProxyPreferencesBrowserTest, UserProxyPolicy) {
   policy_names_.push_back(policy::key::kProxyMode);
   default_values_.push_back(
       new base::StringValue(ProxyPrefs::kAutoDetectProxyModeName));
   SetUserPolicies(
       policy_names_, default_values_.get(), policy::POLICY_LEVEL_MANDATORY);
   content::RunAllPendingInMessageLoop();
 
   // Verify that the policy is presented to the UI. This verification must be
   // done on the kProxyType pref.
-  pref_names_.push_back(chromeos::kProxyType);
+  pref_names_.push_back(chromeos::proxy_cros_settings_parser::kProxyType);
   non_default_values_.push_back(new base::FundamentalValue(3));
 
   // Verify that 'use-shared-proxies' is controlled by the policy.
-  pref_names_.push_back(prefs::kUseSharedProxies);
+  pref_names_.push_back(proxy_config::prefs::kUseSharedProxies);
   non_default_values_.push_back(new base::FundamentalValue(false));
 
   std::string observed_json;
   SetupJavaScriptTestEnvironment(pref_names_, &observed_json);
   VerifyObservedPrefs(
       observed_json, pref_names_, non_default_values_.get(),
       "policy", true, false);
 }
 
 // Verifies that modifications to the proxy settings are correctly pushed from
 // JavaScript to the ProxyConfig property stored in the network configuration.
 IN_PROC_BROWSER_TEST_F(ProxyPreferencesBrowserTest, ChromeOSSetProxy) {
   ASSERT_NO_FATAL_FAILURE(SetupJavaScriptTestEnvironment(pref_names_, NULL));
 
-  SetProxyPref(chromeos::kProxySingleHttpPort, base::FundamentalValue(123));
-  SetProxyPref(chromeos::kProxySingleHttp, base::StringValue("www.adomain.xy"));
+  SetProxyPref(chromeos::proxy_cros_settings_parser::kProxySingleHttpPort,
+               base::FundamentalValue(123));
+  SetProxyPref(chromeos::proxy_cros_settings_parser::kProxySingleHttp,
+               base::StringValue("www.adomain.xy"));
 
   VerifyCurrentProxyServer("www.adomain.xy:123",
                            onc::ONC_SOURCE_NONE);
 }
 
 // Verify that default proxy ports are used and that ports can be updated
 // without affecting the previously set hosts.
 IN_PROC_BROWSER_TEST_F(ProxyPreferencesBrowserTest, ChromeOSProxyDefaultPorts) {
   ASSERT_NO_FATAL_FAILURE(SetupJavaScriptTestEnvironment(pref_names_, NULL));
 
   // Set to manual, per scheme proxy.
-  SetProxyPref(chromeos::kProxySingle, base::FundamentalValue(false));
+  SetProxyPref(chromeos::proxy_cros_settings_parser::kProxySingle,
+               base::FundamentalValue(false));
 
   // Set hosts but no ports.
-  SetProxyPref(chromeos::kProxyHttpUrl, base::StringValue("a.com"));
-  SetProxyPref(chromeos::kProxyHttpsUrl, base::StringValue("4.3.2.1"));
-  SetProxyPref(chromeos::kProxyFtpUrl, base::StringValue("c.com"));
-  SetProxyPref(chromeos::kProxySocks, base::StringValue("d.com"));
+  SetProxyPref(chromeos::proxy_cros_settings_parser::kProxyHttpUrl,
+               base::StringValue("a.com"));
+  SetProxyPref(chromeos::proxy_cros_settings_parser::kProxyHttpsUrl,
+               base::StringValue("4.3.2.1"));
+  SetProxyPref(chromeos::proxy_cros_settings_parser::kProxyFtpUrl,
+               base::StringValue("c.com"));
+  SetProxyPref(chromeos::proxy_cros_settings_parser::kProxySocks,
+               base::StringValue("d.com"));
 
   // Verify default ports.
   VerifyCurrentProxyServer(
       "http=a.com:80;https=4.3.2.1:80;ftp=c.com:80;socks=socks4://d.com:1080",
       onc::ONC_SOURCE_NONE);
 
   // Set and verify the ports.
-  SetProxyPref(chromeos::kProxyHttpPort, base::FundamentalValue(1));
-  SetProxyPref(chromeos::kProxyHttpsPort, base::FundamentalValue(2));
-  SetProxyPref(chromeos::kProxyFtpPort, base::FundamentalValue(3));
-  SetProxyPref(chromeos::kProxySocksPort, base::FundamentalValue(4));
+  SetProxyPref(chromeos::proxy_cros_settings_parser::kProxyHttpPort,
+               base::FundamentalValue(1));
+  SetProxyPref(chromeos::proxy_cros_settings_parser::kProxyHttpsPort,
+               base::FundamentalValue(2));
+  SetProxyPref(chromeos::proxy_cros_settings_parser::kProxyFtpPort,
+               base::FundamentalValue(3));
+  SetProxyPref(chromeos::proxy_cros_settings_parser::kProxySocksPort,
+               base::FundamentalValue(4));
 
   VerifyCurrentProxyServer(
       "http=a.com:1;https=4.3.2.1:2;ftp=c.com:3;socks=socks4://d.com:4",
       onc::ONC_SOURCE_NONE);
 }
 
 #endif