Merge FavoriteState into NetworkState

chromeos/network/network_handler.cc

 // Copyright 2013 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/network_handler.h"
 
 #include "base/threading/worker_pool.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/network/client_cert_resolver.h"
 #include "chromeos/network/geolocation_handler.h"
@@ skipping 36 matching lines @@
   geolocation_handler_.reset(new GeolocationHandler());
 }
 
 NetworkHandler::~NetworkHandler() {
   network_event_log::Shutdown();
 }
 
 void NetworkHandler::Init() {
   network_state_handler_->InitShillPropertyHandler();
   network_device_handler_->Init(network_state_handler_.get());
-  network_profile_handler_->Init(network_state_handler_.get());
+  network_profile_handler_->Init();
   network_configuration_handler_->Init(network_state_handler_.get());
   managed_network_configuration_handler_->Init(
       network_state_handler_.get(),
       network_profile_handler_.get(),
       network_configuration_handler_.get(),
       network_device_handler_.get());
   network_connection_handler_->Init(
       network_state_handler_.get(),
       network_configuration_handler_.get(),
       managed_network_configuration_handler_.get());
@@ skipping 64 matching lines @@
 
 NetworkSmsHandler* NetworkHandler::network_sms_handler() {
   return network_sms_handler_.get();
 }
 
 GeolocationHandler* NetworkHandler::geolocation_handler() {
   return geolocation_handler_.get();
 }
 
 }  // namespace chromeos