Merge FavoriteState into NetworkState

chromeos/dbus/fake_shill_manager_client.h

Index: chromeos/dbus/fake_shill_manager_client.h
diff --git a/chromeos/dbus/fake_shill_manager_client.h b/chromeos/dbus/fake_shill_manager_client.h
index e0f4a22daf7c830c94b45de551d613a47a1ed42b..97dd66383c0ea270df79629c05bbb567e83a8bc2 100644
--- a/chromeos/dbus/fake_shill_manager_client.h
+++ b/chromeos/dbus/fake_shill_manager_client.h
@@ -93,14 +93,12 @@ class CHROMEOS_EXPORT FakeShillManagerClient
   virtual void ClearProperties() OVERRIDE;
   virtual void SetManagerProperty(const std::string& key,
                                   const base::Value& value) OVERRIDE;
-  virtual void AddManagerService(const std::string& service_path,
-                                 bool add_to_visible_list) OVERRIDE;
-  virtual void RemoveManagerService(const std::string& service_path,
-                                    bool remove_from_complete_list) OVERRIDE;
+  virtual void AddManagerService(const std::string& service_path) OVERRIDE;
+  virtual void RemoveManagerService(const std::string& service_path) OVERRIDE;
   virtual void ClearManagerServices() OVERRIDE;
   virtual void ServiceStateChanged(const std::string& service_path,
                                    const std::string& state) OVERRIDE;
-  virtual void SortManagerServices() OVERRIDE;
+  virtual void SortManagerServices(bool notify) OVERRIDE;
   virtual void SetupDefaultEnvironment() OVERRIDE;
   virtual int GetInteractiveDelay() const OVERRIDE;
   virtual void SetBestServiceToConnect(
@@ -123,7 +121,6 @@ class CHROMEOS_EXPORT FakeShillManagerClient
   void SetTechnologyEnabled(const std::string& type,
                             const base::Closure& callback,
                             bool enabled);
-  base::ListValue* GetEnabledServiceList(const std::string& property) const;
   void ScanCompleted(const std::string& device_path,
                      const base::Closure& callback);