Merge FavoriteState into NetworkState

chromeos/network/managed_state.cc

 // 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.
 
 #include "chromeos/network/managed_state.h"
 
 #include "base/logging.h"
 #include "base/values.h"
 #include "chromeos/network/device_state.h"
-#include "chromeos/network/favorite_state.h"
 #include "chromeos/network/network_event_log.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_type_pattern.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 
 bool ManagedState::Matches(const NetworkTypePattern& pattern) const {
   return pattern.MatchesType(type());
 }
 
 // static
 std::string ManagedState::TypeToString(ManagedType type) {
   switch (type) {
     case MANAGED_TYPE_NETWORK:
       return "Network";
-    case MANAGED_TYPE_FAVORITE:
-      return "Favorite";
     case MANAGED_TYPE_DEVICE:
       return "Device";
   }
   return "Unknown";
 }
 
 ManagedState::ManagedState(ManagedType type, const std::string& path)
     : managed_type_(type),
       path_(path),
       update_received_(false),
       update_requested_(false) {
 }
 
 ManagedState::~ManagedState() {
 }
 
 ManagedState* ManagedState::Create(ManagedType type, const std::string& path) {
   switch (type) {
     case MANAGED_TYPE_NETWORK:
       return new NetworkState(path);
-    case MANAGED_TYPE_FAVORITE:
-      return new FavoriteState(path);
     case MANAGED_TYPE_DEVICE:
       return new DeviceState(path);
   }
   return NULL;
 }
 
 NetworkState* ManagedState::AsNetworkState() {
   if (managed_type() == MANAGED_TYPE_NETWORK)
     return static_cast<NetworkState*>(this);
   return NULL;
 }
 
 DeviceState* ManagedState::AsDeviceState() {
   if (managed_type() == MANAGED_TYPE_DEVICE)
     return static_cast<DeviceState*>(this);
   return NULL;
 }
 
-FavoriteState* ManagedState::AsFavoriteState() {
-  if (managed_type() == MANAGED_TYPE_FAVORITE)
-    return static_cast<FavoriteState*>(this);
-  return NULL;
-}
-
 bool ManagedState::InitialPropertiesReceived(
     const base::DictionaryValue& properties) {
   return false;
 }
 
 void ManagedState::GetStateProperties(base::DictionaryValue* dictionary) const {
   dictionary->SetStringWithoutPathExpansion(shill::kNameProperty, name());
   dictionary->SetStringWithoutPathExpansion(shill::kTypeProperty, type());
 }
 
@@ skipping 62 matching lines @@
     return false;
   }
   new_value = static_cast<uint32>(double_value);
   if (*out_value == new_value)
     return false;
   *out_value = new_value;
   return true;
 }
 
 }  // namespace chromeos