Merge FavoriteState into NetworkState

chromeos/network/managed_state.cc

Index: chromeos/network/managed_state.cc
diff --git a/chromeos/network/managed_state.cc b/chromeos/network/managed_state.cc
index 2c417817f8e734e964b480db3450d27209febd9c..75fce5bed3864bb0e955df26fabc7aaf100bc027 100644
--- a/chromeos/network/managed_state.cc
+++ b/chromeos/network/managed_state.cc
@@ -7,7 +7,6 @@
 #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"
@@ -24,8 +23,6 @@ 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";
   }
@@ -46,8 +43,6 @@ 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);
   }
@@ -66,12 +61,6 @@ DeviceState* ManagedState::AsDeviceState() {
   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;