| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/webui/options/preferences_browsertest.h" | 5 #include "chrome/browser/ui/webui/options/preferences_browsertest.h" |
| 6 | 6 |
| 7 #include <iostream> | 7 #include <iostream> |
| 8 #include <sstream> | 8 #include <sstream> |
| 9 | 9 |
| 10 #include "base/callback.h" | 10 #include "base/callback.h" |
| (...skipping 811 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 822 "*.google.com, 1.2.3.4:22")); | 822 "*.google.com, 1.2.3.4:22")); |
| 823 | 823 |
| 824 ProxyConfigDictionary proxy_config(proxy_config_dict.get()); | 824 ProxyConfigDictionary proxy_config(proxy_config_dict.get()); |
| 825 | 825 |
| 826 const chromeos::NetworkState* network = GetDefaultNetwork(); | 826 const chromeos::NetworkState* network = GetDefaultNetwork(); |
| 827 ASSERT_TRUE(network); | 827 ASSERT_TRUE(network); |
| 828 chromeos::proxy_config::SetProxyConfigForNetwork(proxy_config, *network); | 828 chromeos::proxy_config::SetProxyConfigForNetwork(proxy_config, *network); |
| 829 | 829 |
| 830 std::string url = base::StringPrintf("%s?network=%s", | 830 std::string url = base::StringPrintf("%s?network=%s", |
| 831 chrome::kChromeUIProxySettingsURL, | 831 chrome::kChromeUIProxySettingsURL, |
| 832 network->path().c_str()); | 832 network->guid().c_str()); |
| 833 | 833 |
| 834 ui_test_utils::NavigateToURL(browser(), GURL(url)); | 834 ui_test_utils::NavigateToURL(browser(), GURL(url)); |
| 835 SetUpPrefs(); | 835 SetUpPrefs(); |
| 836 } | 836 } |
| 837 | 837 |
| 838 protected: | 838 protected: |
| 839 void SetupNetworkEnvironment() { | 839 void SetupNetworkEnvironment() { |
| 840 chromeos::ShillProfileClient::TestInterface* profile_test = | 840 chromeos::ShillProfileClient::TestInterface* profile_test = |
| 841 chromeos::DBusThreadManager::Get()->GetShillProfileClient() | 841 chromeos::DBusThreadManager::Get()->GetShillProfileClient() |
| 842 ->GetTestInterface(); | 842 ->GetTestInterface(); |
| (...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1079 SetProxyPref(chromeos::kProxyHttpsPort, base::FundamentalValue(2)); | 1079 SetProxyPref(chromeos::kProxyHttpsPort, base::FundamentalValue(2)); |
| 1080 SetProxyPref(chromeos::kProxyFtpPort, base::FundamentalValue(3)); | 1080 SetProxyPref(chromeos::kProxyFtpPort, base::FundamentalValue(3)); |
| 1081 SetProxyPref(chromeos::kProxySocksPort, base::FundamentalValue(4)); | 1081 SetProxyPref(chromeos::kProxySocksPort, base::FundamentalValue(4)); |
| 1082 | 1082 |
| 1083 VerifyCurrentProxyServer( | 1083 VerifyCurrentProxyServer( |
| 1084 "http=a.com:1;https=4.3.2.1:2;ftp=c.com:3;socks=socks4://d.com:4", | 1084 "http=a.com:1;https=4.3.2.1:2;ftp=c.com:3;socks=socks4://d.com:4", |
| 1085 onc::ONC_SOURCE_NONE); | 1085 onc::ONC_SOURCE_NONE); |
| 1086 } | 1086 } |
| 1087 | 1087 |
| 1088 #endif | 1088 #endif |
| OLD | NEW |