| 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, "" /* guid */, id /* name */, |
| 233 type, state, |
| 233 ipconfig_path, | 234 ipconfig_path, |
| 234 true /* visible */, | 235 true /* visible */, |
| 235 add_to_watch_list); | 236 add_to_watch_list); |
| 236 } | 237 } |
| 237 | 238 |
| 238 void AddServiceToProfile(const std::string& type, | 239 void AddServiceToProfile(const std::string& type, |
| 239 const std::string& id, | 240 const std::string& id, |
| 240 bool visible) { | 241 bool visible) { |
| 241 service_test_->AddService(id, id, type, shill::kStateIdle, | 242 service_test_->AddService(id, id, type, shill::kStateIdle, |
| 242 visible, false /* watch */); | 243 visible, false /* watch */); |
| (...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 541 message_loop_.RunUntilIdle(); | 542 message_loop_.RunUntilIdle(); |
| 542 // Property change should trigger an update for the Network only; no | 543 // Property change should trigger an update for the Network only; no |
| 543 // property updates pushed by Shill affect Favorites. | 544 // property updates pushed by Shill affect Favorites. |
| 544 EXPECT_EQ(2, listener_->property_updates( | 545 EXPECT_EQ(2, listener_->property_updates( |
| 545 shill::kServicesProperty)[kTestServicePath2]); | 546 shill::kServicesProperty)[kTestServicePath2]); |
| 546 EXPECT_EQ(0, listener_->property_updates( | 547 EXPECT_EQ(0, listener_->property_updates( |
| 547 shill::kServiceCompleteListProperty)[kTestServicePath2]); | 548 shill::kServiceCompleteListProperty)[kTestServicePath2]); |
| 548 } | 549 } |
| 549 | 550 |
| 550 } // namespace chromeos | 551 } // namespace chromeos |
| OLD | NEW |