Merge FavoriteState into NetworkState

chromeos/network/shill_property_handler.h

Index: chromeos/network/shill_property_handler.h
diff --git a/chromeos/network/shill_property_handler.h b/chromeos/network/shill_property_handler.h
index 5a78f190fa5e18eeee111234856ae60419a740ea..812ff6dd45afa590ef6992c7492708faae76781d 100644
--- a/chromeos/network/shill_property_handler.h
+++ b/chromeos/network/shill_property_handler.h
@@ -46,9 +46,14 @@ class CHROMEOS_EXPORT ShillPropertyHandler
 
   class CHROMEOS_EXPORT Listener {
    public:
-    // Called when the entries in a managed list have changed.
-    virtual void UpdateManagedList(ManagedState::ManagedType type,
-                                   const base::ListValue& entries) = 0;
+    // Called when the entries in the device list have changed.
+    virtual void UpdateManagedDevices(const base::ListValue& entries) = 0;
+
+    // Called when the entries in the service list have changed. If
+    // |complete_list| is true then |entries| represent the complete list of
+    // network services, otherwise it includes just the visible services.
+    virtual void UpdateManagedNetworks(const base::ListValue& entries,
+                                       bool complete_list) = 0;
 
     // Called when the properties for a managed state have changed.
     virtual void UpdateManagedStateProperties(
@@ -156,13 +161,7 @@ class CHROMEOS_EXPORT ShillPropertyHandler
   void ManagerPropertyChanged(const std::string& key,
                               const base::Value& value);
 
-  // Requests properties for new entries in the list for |type| as follows:
-  // * Any new Device objects for MANAGED_TYPE_DEVICE
-  // * Any new Service objects for MANAGED_TYPE_NETWORK
-  // * Additional new Service objects for MANAGED_TYPE_FAVORITE that were not
-  //   requested for MANAGED_TYPE_NETWORK (i.e. only request objects once).
-  // For this to avoid duplicate requests, this must be called with
-  // MANAGED_TYPE_NETWORK before MANAGED_TYPE_FAVORITE.
+  // Requests properties for new entries in the list for |type|.
   void UpdateProperties(ManagedState::ManagedType type,
                         const base::ListValue& entries);
 
@@ -234,6 +233,7 @@ class CHROMEOS_EXPORT ShillPropertyHandler
 
   // List of network services with Shill property changed observers
   ShillPropertyObserverMap observed_networks_;
+  size_t new_observed_networks_;
 
   // List of network devices with Shill property changed observers
   ShillPropertyObserverMap observed_devices_;