Merge FavoriteState into NetworkState

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

 // Copyright 2014 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 "chrome/browser/ui/webui/chromeos/network_config_message_handler.h"
 
 #include <string>
 
 #include "base/bind.h"
 #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"
 #include "chromeos/network/network_util.h"
 #include "chromeos/network/onc/onc_signature.h"
 #include "chromeos/network/onc/onc_utils.h"
 #include "chromeos/network/shill_property_util.h"
 #include "components/onc/onc_constants.h"
 #include "content/public/browser/web_ui.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 
 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;
   *service_path = network->path();
   return true;
 }
 
 }  // namespace
 
 NetworkConfigMessageHandler::NetworkConfigMessageHandler()
@@ skipping 93 matching lines @@
     scoped_ptr<base::DictionaryValue> error_data) const {
   LOG(ERROR) << "NetworkConfigMessageHandler Error: " << error_name;
   base::ListValue arg_list;
   arg_list.AppendInteger(callback_id);
   arg_list.AppendString(error_name);
   web_ui()->CallJavascriptFunction(
       "networkConfig.chromeCallbackError", arg_list);
 }
 
 }  // namespace chromeos