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 "chromeos/network/shill_property_handler.h" | 5 #include "chromeos/network/shill_property_handler.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <set> | 8 #include <set> |
9 #include <string> | 9 #include <string> |
10 | 10 |
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
222 service_test_->AddService(id, id, type, state, | 222 service_test_->AddService(id, id, type, state, |
223 true /* visible */, add_to_watch_list); | 223 true /* visible */, add_to_watch_list); |
224 } | 224 } |
225 | 225 |
226 void AddServiceWithIPConfig(const std::string& type, | 226 void AddServiceWithIPConfig(const std::string& type, |
227 const std::string& id, | 227 const std::string& id, |
228 const std::string& state, | 228 const std::string& state, |
229 const std::string& ipconfig_path, | 229 const std::string& ipconfig_path, |
230 bool add_to_watch_list) { | 230 bool add_to_watch_list) { |
231 ASSERT_TRUE(IsValidType(type)); | 231 ASSERT_TRUE(IsValidType(type)); |
232 service_test_->AddServiceWithIPConfig(id, id, type, state, | 232 service_test_->AddServiceWithIPConfig(id, /* service_path */ |
| 233 "" /* guid */, |
| 234 id /* name */, |
| 235 type, |
| 236 state, |
233 ipconfig_path, | 237 ipconfig_path, |
234 true /* visible */, | 238 true /* visible */, |
235 add_to_watch_list); | 239 add_to_watch_list); |
236 } | 240 } |
237 | 241 |
238 void AddServiceToProfile(const std::string& type, | 242 void AddServiceToProfile(const std::string& type, |
239 const std::string& id, | 243 const std::string& id, |
240 bool visible) { | 244 bool visible) { |
241 service_test_->AddService(id, id, type, shill::kStateIdle, | 245 service_test_->AddService(id, id, type, shill::kStateIdle, |
242 visible, false /* watch */); | 246 visible, false /* watch */); |
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
541 message_loop_.RunUntilIdle(); | 545 message_loop_.RunUntilIdle(); |
542 // Property change should trigger an update for the Network only; no | 546 // Property change should trigger an update for the Network only; no |
543 // property updates pushed by Shill affect Favorites. | 547 // property updates pushed by Shill affect Favorites. |
544 EXPECT_EQ(2, listener_->property_updates( | 548 EXPECT_EQ(2, listener_->property_updates( |
545 shill::kServicesProperty)[kTestServicePath2]); | 549 shill::kServicesProperty)[kTestServicePath2]); |
546 EXPECT_EQ(0, listener_->property_updates( | 550 EXPECT_EQ(0, listener_->property_updates( |
547 shill::kServiceCompleteListProperty)[kTestServicePath2]); | 551 shill::kServiceCompleteListProperty)[kTestServicePath2]); |
548 } | 552 } |
549 | 553 |
550 } // namespace chromeos | 554 } // namespace chromeos |
OLD | NEW |