Merge FavoriteState into NetworkState

chrome/browser/ui/webui/chromeos/network_config_message_handler.cc

Index: chrome/browser/ui/webui/chromeos/network_config_message_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/network_config_message_handler.cc b/chrome/browser/ui/webui/chromeos/network_config_message_handler.cc
index cbc8d8d61b2ea46e22739f96e4b12f29367537e6..c70779abdf78f4e10b076b3844ad15ef0abe4160 100644
--- a/chrome/browser/ui/webui/chromeos/network_config_message_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/network_config_message_handler.cc
@@ -10,7 +10,6 @@
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/values.h"
-#include "chromeos/network/favorite_state.h"
 #include "chromeos/network/managed_network_configuration_handler.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
@@ -28,8 +27,8 @@ namespace {
 
 bool GetServicePathFromGuid(const std::string& guid,
                             std::string* service_path) {
-  const FavoriteState* network =
-      NetworkHandler::Get()->network_state_handler()->GetFavoriteStateFromGuid(
+  const NetworkState* network =
+      NetworkHandler::Get()->network_state_handler()->GetNetworkStateFromGuid(
           guid);
   if (!network)
     return false;