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/chromeos/proxy_config_service_impl.h" | 5 #include "chrome/browser/chromeos/proxy_config_service_impl.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/format_macros.h" | 9 #include "base/format_macros.h" |
10 #include "base/json/json_writer.h" | 10 #include "base/json/json_writer.h" |
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
244 | 244 |
245 // Process any pending notifications before clearing services. | 245 // Process any pending notifications before clearing services. |
246 loop_.RunUntilIdle(); | 246 loop_.RunUntilIdle(); |
247 service_test->ClearServices(); | 247 service_test->ClearServices(); |
248 | 248 |
249 // Sends a notification about the added profile. | 249 // Sends a notification about the added profile. |
250 profile_test->AddProfile(kUserProfilePath, "user_hash"); | 250 profile_test->AddProfile(kUserProfilePath, "user_hash"); |
251 | 251 |
252 service_test->AddService("stub_wifi2", "wifi2_PSK", | 252 service_test->AddService("stub_wifi2", "wifi2_PSK", |
253 shill::kTypeWifi, shill::kStateOnline, | 253 shill::kTypeWifi, shill::kStateOnline, |
254 true /* visible */, true /* watch */); | 254 true /* visible */); |
255 service_test->SetServiceProperty("stub_wifi2", | 255 service_test->SetServiceProperty("stub_wifi2", |
256 shill::kGuidProperty, | 256 shill::kGuidProperty, |
257 base::StringValue("stub_wifi2")); | 257 base::StringValue("stub_wifi2")); |
258 profile_test->AddService(kUserProfilePath, "stub_wifi2"); | 258 profile_test->AddService(kUserProfilePath, "stub_wifi2"); |
259 | 259 |
260 loop_.RunUntilIdle(); | 260 loop_.RunUntilIdle(); |
261 } | 261 } |
262 | 262 |
263 virtual void TearDown() { | 263 virtual void TearDown() { |
264 config_service_impl_->DetachFromPrefService(); | 264 config_service_impl_->DetachFromPrefService(); |
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
446 pref_service_.RemoveRecommendedPref(prefs::kProxy); | 446 pref_service_.RemoveRecommendedPref(prefs::kProxy); |
447 SyncGetLatestProxyConfig(&actual_config); | 447 SyncGetLatestProxyConfig(&actual_config); |
448 EXPECT_EQ(network_params.auto_detect, actual_config.auto_detect()); | 448 EXPECT_EQ(network_params.auto_detect, actual_config.auto_detect()); |
449 EXPECT_EQ(network_params.pac_url, actual_config.pac_url()); | 449 EXPECT_EQ(network_params.pac_url, actual_config.pac_url()); |
450 EXPECT_TRUE(network_params.proxy_rules.Matches( | 450 EXPECT_TRUE(network_params.proxy_rules.Matches( |
451 actual_config.proxy_rules())); | 451 actual_config.proxy_rules())); |
452 } | 452 } |
453 } | 453 } |
454 | 454 |
455 } // namespace chromeos | 455 } // namespace chromeos |
OLD | NEW |