Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1901)

Side by Side Diff: chromeos/network/shill_property_handler_unittest.cc

Issue 175243004: Chrome OS: Use Manager.DefaultService for Default Network (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Set default path of '/' to empty Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 75
76 virtual void CheckPortalListChanged( 76 virtual void CheckPortalListChanged(
77 const std::string& check_portal_list) OVERRIDE { 77 const std::string& check_portal_list) OVERRIDE {
78 } 78 }
79 79
80 virtual void ManagedStateListChanged( 80 virtual void ManagedStateListChanged(
81 ManagedState::ManagedType type) OVERRIDE { 81 ManagedState::ManagedType type) OVERRIDE {
82 AddStateListUpdate(GetTypeString(type)); 82 AddStateListUpdate(GetTypeString(type));
83 } 83 }
84 84
85 virtual void DefaultNetworkServiceChanged(
86 const std::string& service_path) OVERRIDE {
87 }
88
85 std::vector<std::string>& entries(const std::string& type) { 89 std::vector<std::string>& entries(const std::string& type) {
86 return entries_[type]; 90 return entries_[type];
87 } 91 }
88 std::map<std::string, int>& property_updates(const std::string& type) { 92 std::map<std::string, int>& property_updates(const std::string& type) {
89 return property_updates_[type]; 93 return property_updates_[type];
90 } 94 }
91 std::map<std::string, int>& initial_property_updates( 95 std::map<std::string, int>& initial_property_updates(
92 const std::string& type) { 96 const std::string& type) {
93 return initial_property_updates_[type]; 97 return initial_property_updates_[type];
94 } 98 }
(...skipping 430 matching lines...) Expand 10 before | Expand all | Expand 10 after
525 message_loop_.RunUntilIdle(); 529 message_loop_.RunUntilIdle();
526 // Property change should trigger an update for the Network only; no 530 // Property change should trigger an update for the Network only; no
527 // property updates pushed by Shill affect Favorites. 531 // property updates pushed by Shill affect Favorites.
528 EXPECT_EQ(2, listener_->property_updates( 532 EXPECT_EQ(2, listener_->property_updates(
529 shill::kServicesProperty)[kTestServicePath2]); 533 shill::kServicesProperty)[kTestServicePath2]);
530 EXPECT_EQ(0, listener_->property_updates( 534 EXPECT_EQ(0, listener_->property_updates(
531 shill::kServiceCompleteListProperty)[kTestServicePath2]); 535 shill::kServiceCompleteListProperty)[kTestServicePath2]);
532 } 536 }
533 537
534 } // namespace chromeos 538 } // namespace chromeos
OLDNEW
« chromeos/network/network_state_handler.cc ('K') | « chromeos/network/shill_property_handler.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698