Merge FavoriteState into NetworkState

chromeos/network/network_profile_handler.cc

 // Copyright (c) 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_profile_handler.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #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"
 
 namespace chromeos {
 
 namespace {
 
 bool ConvertListValueToStringVector(const base::ListValue& string_list,
                                     std::vector<std::string>* result) {
   for (size_t i = 0; i < string_list.GetSize(); ++i) {
@@ skipping 98 matching lines @@
       continue;
 
     VLOG(2) << "Requesting properties of profile path " << *it << ".";
     DBusThreadManager::Get()->GetShillProfileClient()->GetProperties(
         dbus::ObjectPath(*it),
         base::Bind(&NetworkProfileHandler::GetProfilePropertiesCallback,
                    weak_ptr_factory_.GetWeakPtr(),
                    *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(
     const std::string& profile_path,
     const base::DictionaryValue& properties) {
   std::string userhash;
   properties.GetStringWithoutPathExpansion(shill::kUserHashProperty, &userhash);
 
   AddProfile(NetworkProfile(profile_path, userhash));
 }
@@ skipping 43 matching lines @@
   for (NetworkProfileHandler::ProfileList::const_iterator it =
            profiles_.begin();
        it != profiles_.end(); ++it) {
     if (!it->userhash.empty())
       return &*it;
   }
   return NULL;
 }
 
 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);
 
   // Request the initial profile list.
   DBusThreadManager::Get()->GetShillManagerClient()->GetProperties(
       base::Bind(&NetworkProfileHandler::GetManagerPropertiesCallback,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 NetworkProfileHandler::~NetworkProfileHandler() {
   DBusThreadManager::Get()->GetShillManagerClient()->
       RemovePropertyChangedObserver(this);
 }
 
 }  // namespace chromeos