Merge FavoriteState into NetworkState

chromeos/network/network_profile_handler.cc

Index: chromeos/network/network_profile_handler.cc
diff --git a/chromeos/network/network_profile_handler.cc b/chromeos/network/network_profile_handler.cc
index f4f381e12416034de4414f7bdee8c5ed15cd01de..c8353cc622532a5b74e00e52ff142de5b4a6d1f3 100644
--- a/chromeos/network/network_profile_handler.cc
+++ b/chromeos/network/network_profile_handler.cc
@@ -13,7 +13,6 @@
 #include "chromeos/dbus/shill_manager_client.h"
 #include "chromeos/dbus/shill_profile_client.h"
 #include "chromeos/network/network_profile_observer.h"
-#include "chromeos/network/network_state_handler.h"
 #include "dbus/object_path.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
@@ -132,11 +131,6 @@ void NetworkProfileHandler::OnPropertyChanged(const std::string& name,
                    *it),
         base::Bind(&LogProfileRequestError, *it));
   }
-
-  // When the profile list changes, ServiceCompleteList may also change, so
-  // trigger a Manager update to request the updated list.
-  if (network_state_handler_)
-    network_state_handler_->UpdateManagerProperties();
 }
 
 void NetworkProfileHandler::GetProfilePropertiesCallback(
@@ -200,13 +194,10 @@ const NetworkProfile* NetworkProfileHandler::GetDefaultUserProfile() const {
 }
 
 NetworkProfileHandler::NetworkProfileHandler()
-    : network_state_handler_(NULL),
-      weak_ptr_factory_(this) {
+    : weak_ptr_factory_(this) {
 }
 
-void NetworkProfileHandler::Init(NetworkStateHandler* network_state_handler) {
-  network_state_handler_ = network_state_handler;
-
+void NetworkProfileHandler::Init() {
   DBusThreadManager::Get()->GetShillManagerClient()->
       AddPropertyChangedObserver(this);