Merge FavoriteState into NetworkState

chromeos/dbus/fake_shill_manager_client.h

 // Copyright 2013 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_DBUS_FAKE_SHILL_MANAGER_CLIENT_H_
 #define CHROMEOS_DBUS_FAKE_SHILL_MANAGER_CLIENT_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 75 matching lines @@
   virtual void AddTechnology(const std::string& type, bool enabled) OVERRIDE;
   virtual void RemoveTechnology(const std::string& type) OVERRIDE;
   virtual void SetTechnologyInitializing(const std::string& type,
                                          bool initializing) OVERRIDE;
   virtual void AddGeoNetwork(const std::string& technology,
                              const base::DictionaryValue& network) OVERRIDE;
   virtual void AddProfile(const std::string& profile_path) OVERRIDE;
   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(
       const std::string& service_path) OVERRIDE;
 
   // Constants used for testing.
   static const char kFakeEthernetNetworkPath[];
 
  private:
   // |property| should be kServicesProperty or kServiceCompleteListProperty.
   void SortServiceList(const std::string& property);
 
   void SetDefaultProperties();
   void PassStubProperties(const DictionaryValueCallback& callback) const;
   void PassStubGeoNetworks(const DictionaryValueCallback& callback) const;
   void CallNotifyObserversPropertyChanged(const std::string& property);
   void NotifyObserversPropertyChanged(const std::string& property);
   base::ListValue* GetListProperty(const std::string& property);
   bool TechnologyEnabled(const std::string& type) const;
   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);
 
   // Parses the command line for Shill stub switches and sets initial states.
   // Uses comma-separated name-value pairs (see SplitStringIntoKeyValuePairs):
   // interactive={delay} - sets delay in seconds for interactive UI
   // {wifi,cellular,etc}={on,off,disabled,none} - sets initial state for type
   void ParseCommandLineSwitch();
   bool ParseOption(const std::string& arg0, const std::string& arg1);
   bool SetInitialNetworkState(std::string type_arg, std::string state_arg);
@@ skipping 23 matching lines @@
 
   // 'Best' service to connect to on ConnectToBestServices() calls.
   std::string best_service_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeShillManagerClient);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_FAKE_SHILL_MANAGER_CLIENT_H_