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

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

Issue 15899015: Add CheckPortalList manager property to NetworkStateHandler (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: force manager property update in shill manager client stub implementation Created 7 years, 6 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
« no previous file with comments | « chromeos/network/shill_property_handler.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 const std::string& device_path, 64 const std::string& device_path,
65 const std::string& key, 65 const std::string& key,
66 const base::Value& value) OVERRIDE { 66 const base::Value& value) OVERRIDE {
67 AddPropertyUpdate(flimflam::kDevicesProperty, device_path); 67 AddPropertyUpdate(flimflam::kDevicesProperty, device_path);
68 } 68 }
69 69
70 virtual void NotifyManagerPropertyChanged() OVERRIDE { 70 virtual void NotifyManagerPropertyChanged() OVERRIDE {
71 ++manager_updates_; 71 ++manager_updates_;
72 } 72 }
73 73
74 virtual void CheckPortalListChanged(
75 const std::string& check_portal_list) OVERRIDE {
76 }
77
74 virtual void ManagedStateListChanged( 78 virtual void ManagedStateListChanged(
75 ManagedState::ManagedType type) OVERRIDE { 79 ManagedState::ManagedType type) OVERRIDE {
76 AddStateListUpdate(GetTypeString(type)); 80 AddStateListUpdate(GetTypeString(type));
77 } 81 }
78 82
79 std::vector<std::string>& entries(const std::string& type) { 83 std::vector<std::string>& entries(const std::string& type) {
80 return entries_[type]; 84 return entries_[type];
81 } 85 }
82 std::map<std::string, int>& property_updates(const std::string& type) { 86 std::map<std::string, int>& property_updates(const std::string& type) {
83 return property_updates_[type]; 87 return property_updates_[type];
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
418 AddServiceWithIPConfig(flimflam::kTypeWifi, kTestServicePath2, 422 AddServiceWithIPConfig(flimflam::kTypeWifi, kTestServicePath2,
419 flimflam::kStateIdle, kTestIPConfigPath, true); 423 flimflam::kStateIdle, kTestIPConfigPath, true);
420 message_loop_.RunUntilIdle(); 424 message_loop_.RunUntilIdle();
421 // A watched service with the IPConfig property already set must 425 // A watched service with the IPConfig property already set must
422 // trigger property updates for IP Address and DNS when added. 426 // trigger property updates for IP Address and DNS when added.
423 EXPECT_EQ(3, listener_-> 427 EXPECT_EQ(3, listener_->
424 property_updates(flimflam::kServicesProperty)[kTestServicePath2]); 428 property_updates(flimflam::kServicesProperty)[kTestServicePath2]);
425 } 429 }
426 430
427 } // namespace chromeos 431 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/network/shill_property_handler.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698