Merge FavoriteState into NetworkState

chromeos/network/managed_state.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_MANAGED_STATE_H_
 #define CHROMEOS_NETWORK_MANAGED_STATE_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "chromeos/chromeos_export.h"
 
 namespace base {
 class Value;
 class DictionaryValue;
 }
 
 namespace chromeos {
 
 class DeviceState;
-class FavoriteState;
 class NetworkState;
 class NetworkTypePattern;
 
 // Base class for states managed by NetworkStateManger which are associated
 // with a Shill path (e.g. service path or device path).
 class CHROMEOS_EXPORT ManagedState {
  public:
   enum ManagedType {
     MANAGED_TYPE_NETWORK,
-    MANAGED_TYPE_FAVORITE,
     MANAGED_TYPE_DEVICE
   };
 
   virtual ~ManagedState();
 
   // This will construct and return a new instance of the appropriate class
   // based on |type|.
   static ManagedState* Create(ManagedType type, const std::string& path);
 
   // Returns the specific class pointer if this is the correct type, or
   // NULL if it is not.
   NetworkState* AsNetworkState();
   DeviceState* AsDeviceState();
-  FavoriteState* AsFavoriteState();
 
   // Called by NetworkStateHandler when a property was received. The return
   // value indicates if the state changed and is used to reduce the number of
   // notifications. The only guarantee however is: If the return value is false
   // then the state wasn't modified. This might happen because of
   // * |key| was not recognized.
   // * |value| was not parsed successfully.
   // * |value| is equal to the cached property value.
   // If the return value is true, the state might or might not be modified.
   virtual bool PropertyChanged(const std::string& key,
@@ skipping 68 matching lines @@
 
   // Tracks when an update has been requested.
   bool update_requested_;
 
   DISALLOW_COPY_AND_ASSIGN(ManagedState);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_NETWORK_MANAGED_STATE_H_