Eliminate NetworkManagerChanged

chromeos/network/network_state_handler.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROMEOS_NETWORK_NETWORK_STATE_HANDLER_H_
 #define CHROMEOS_NETWORK_NETWORK_STATE_HANDLER_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 181 matching lines @@
   void RequestUpdateForNetwork(const std::string& service_path);
 
   // Request an update for all existing NetworkState entries, e.g. after
   // loading an ONC configuration file that may have updated one or more
   // existing networks.
   void RequestUpdateForAllNetworks();
 
   // Set the list of devices on which portal check is enabled.
   void SetCheckPortalList(const std::string& check_portal_list);
 
-  const std::string& check_portal_list() const { return check_portal_list_; }
+  const std::string& GetCheckPortalListForTest() const {
+    return check_portal_list_;
+  }
 
   // Generates a DictionaryValue of all NetworkState properties. Currently
   // provided for debugging purposes only.
   void GetNetworkStatePropertiesForTest(
       base::DictionaryValue* dictionary) const;
 
   // Construct and initialize an instance for testing.
   static NetworkStateHandler* InitializeForTest();
 
   static const char kMatchTypeDefault[];
@@ skipping 37 matching lines @@
   virtual void UpdateDeviceProperty(
       const std::string& device_path,
       const std::string& key,
       const base::Value& value) OVERRIDE;
 
   // Called by ShillPropertyHandler when the portal check list manager property
   // changes.
   virtual void CheckPortalListChanged(
       const std::string& check_portal_list) OVERRIDE;
 
-  // Sends NetworkManagerChanged() to observers and logs an event.
-  virtual void NotifyManagerPropertyChanged() OVERRIDE;
+  // Called by ShillPropertyHandler when a technology list changes.
+  virtual void TechnologyListChanged() OVERRIDE;
 
   // Called by |shill_property_handler_| when the service or device list has
   // changed and all entries have been updated. This updates the list and
   // notifies observers. If |type| == TYPE_NETWORK this also calls
   // CheckDefaultNetworkChanged().
   virtual void ManagedStateListChanged(
       ManagedState::ManagedType type) OVERRIDE;
 
   // Called after construction. Called explicitly by tests after adding
   // test observers.
   void InitShillPropertyHandler();
 
  private:
   typedef std::list<base::Closure> ScanCallbackList;
   typedef std::map<std::string, ScanCallbackList> ScanCompleteCallbackMap;
   friend class NetworkStateHandlerTest;
   FRIEND_TEST_ALL_PREFIXES(NetworkStateHandlerTest, NetworkStateHandlerStub);
 
   // NetworkState specific method for UpdateManagedStateProperties which
   // notifies observers.
   void UpdateNetworkStateProperties(NetworkState* network,
                                     const base::DictionaryValue& properties);
 
+  // Sends DeviceListChanged() to observers and logs an event.
+  void NotifyDeviceListChanged();
+
   // Non-const getters for managed entries. These are const so that they can
   // be called by Get[Network|Device]State, even though they return non-const
   // pointers.
   DeviceState* GetModifiableDeviceState(const std::string& device_path) const;
   NetworkState* GetModifiableNetworkState(
       const std::string& service_path) const;
   ManagedState* GetModifiableManagedState(const ManagedStateList* managed_list,
                                           const std::string& path) const;
 
   // Gets the list specified by |type|.
@@ skipping 43 matching lines @@
 
   // Callbacks to run when a scan for the technology type completes.
   ScanCompleteCallbackMap scan_complete_callbacks_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkStateHandler);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_NETWORK_NETWORK_STATE_HANDLER_H_