Merge FavoriteState into NetworkState

chromeos/network/network_configuration_handler.cc

 // Copyright (c) 2012 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_configuration_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 156 matching lines @@
   void ProfileEntryDeletedCallback(const std::string& profile_path,
                                    const std::string& entry) {
     NET_LOG_DEBUG("Profile Entry Deleted", base::StringPrintf(
         "%s: %s", profile_path.c_str(), entry.c_str()));
     profile_delete_entries_.erase(profile_path);
     if (!profile_delete_entries_.empty())
       return;
     // Run the callback if this is the last pending deletion.
     if (!callback_.is_null())
       callback_.Run();
-    // Request NetworkStateHandler manager update to update ServiceCompleteList.
-    owner_->network_state_handler_->UpdateManagerProperties();
     owner_->ProfileEntryDeleterCompleted(service_path_);  // Deletes this.
   }
 
   void ShillErrorCallback(const std::string& profile_path,
                           const std::string& entry,
                           const std::string& dbus_error_name,
                           const std::string& dbus_error_message) {
     // Any Shill Error triggers a failure / error.
     network_handler::ShillErrorCallbackFunction(
         "GetLoadableProfileEntries Failed", profile_path, error_callback_,
@@ skipping 241 matching lines @@
 
 // static
 NetworkConfigurationHandler* NetworkConfigurationHandler::InitializeForTest(
     NetworkStateHandler* network_state_handler) {
   NetworkConfigurationHandler* handler = new NetworkConfigurationHandler();
   handler->Init(network_state_handler);
   return handler;
 }
 
 }  // namespace chromeos