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 835 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
846 chromeos::DBusThreadManager::Get()->GetShillServiceClient() | 846 chromeos::DBusThreadManager::Get()->GetShillServiceClient() |
847 ->GetTestInterface(); | 847 ->GetTestInterface(); |
848 | 848 |
849 profile_test->AddProfile(kUserProfilePath, "user"); | 849 profile_test->AddProfile(kUserProfilePath, "user"); |
850 | 850 |
851 service_test->ClearServices(); | 851 service_test->ClearServices(); |
852 service_test->AddService("stub_ethernet", | 852 service_test->AddService("stub_ethernet", |
853 "eth0", | 853 "eth0", |
854 shill::kTypeEthernet, | 854 shill::kTypeEthernet, |
855 shill::kStateOnline, | 855 shill::kStateOnline, |
856 true, // add to visible | 856 true /* add_to_visible */ ); |
857 true); // add to watchlist | |
858 service_test->SetServiceProperty("stub_ethernet", | 857 service_test->SetServiceProperty("stub_ethernet", |
859 shill::kGuidProperty, | 858 shill::kGuidProperty, |
860 base::StringValue("stub_ethernet")); | 859 base::StringValue("stub_ethernet")); |
861 service_test->SetServiceProperty("stub_ethernet", | 860 service_test->SetServiceProperty("stub_ethernet", |
862 shill::kProfileProperty, | 861 shill::kProfileProperty, |
863 base::StringValue(kUserProfilePath)); | 862 base::StringValue(kUserProfilePath)); |
864 profile_test->AddService(kUserProfilePath, "stub_wifi2"); | 863 profile_test->AddService(kUserProfilePath, "stub_wifi2"); |
865 } | 864 } |
866 | 865 |
867 void SetONCPolicy(const char* policy_name, policy::PolicyScope scope) { | 866 void SetONCPolicy(const char* policy_name, policy::PolicyScope scope) { |
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1084 SetProxyPref(chromeos::kProxyHttpsPort, base::FundamentalValue(2)); | 1083 SetProxyPref(chromeos::kProxyHttpsPort, base::FundamentalValue(2)); |
1085 SetProxyPref(chromeos::kProxyFtpPort, base::FundamentalValue(3)); | 1084 SetProxyPref(chromeos::kProxyFtpPort, base::FundamentalValue(3)); |
1086 SetProxyPref(chromeos::kProxySocksPort, base::FundamentalValue(4)); | 1085 SetProxyPref(chromeos::kProxySocksPort, base::FundamentalValue(4)); |
1087 | 1086 |
1088 VerifyCurrentProxyServer( | 1087 VerifyCurrentProxyServer( |
1089 "http=a.com:1;https=4.3.2.1:2;ftp=c.com:3;socks=socks4://d.com:4", | 1088 "http=a.com:1;https=4.3.2.1:2;ftp=c.com:3;socks=socks4://d.com:4", |
1090 onc::ONC_SOURCE_NONE); | 1089 onc::ONC_SOURCE_NONE); |
1091 } | 1090 } |
1092 | 1091 |
1093 #endif | 1092 #endif |
OLD | NEW |