Switch over MobileActivator to use Network*Handler

chromeos/network/network_connection_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_connection_handler.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "chromeos/chromeos_switches.h"
@@ skipping 301 matching lines @@
   if (!network) {
     InvokeErrorCallback(service_path, error_callback, kErrorNotFound);
     return;
   }
   if (!network->IsConnectedState()) {
     InvokeErrorCallback(service_path, error_callback, kErrorNotConnected);
     return;
   }
   CallShillDisconnect(service_path, success_callback, error_callback);
 }
 

[armansito, 2013/08/14 00:49:51]

A small suggestion: now that there is a NetworkActivationHandler, it might make
sense to move the "NetworkRequiresActivation" function, which is defined in this
file in an anonymous namespace, over there.

[gauravsh, 2013/08/14 21:42:29]

NetworkRequiresActivation() is used by ConnectToNetwork in
NetworkConnectionHandler. I guess we could make it static in
NetworkActivationHandler. What do you think?

[armansito, 2013/08/14 22:46:34]

sgtm.

-void NetworkConnectionHandler::ActivateNetwork(
-    const std::string& service_path,
-    const std::string& carrier,
-    const base::Closure& success_callback,
-    const network_handler::ErrorCallback& error_callback) {
-  NET_LOG_USER("DisconnectNetwork", service_path);
-  const NetworkState* network =
-      network_state_handler_->GetNetworkState(service_path);
-  if (!network) {
-    InvokeErrorCallback(service_path, error_callback, kErrorNotFound);
-    return;
-  }
-  CallShillActivate(service_path, carrier, success_callback, error_callback);
-}
-
 bool NetworkConnectionHandler::HasConnectingNetwork(
     const std::string& service_path) {
   return pending_requests_.count(service_path) != 0;
 }
 
 void NetworkConnectionHandler::NetworkListChanged() {
   CheckAllPendingRequests();
 }
 
 void NetworkConnectionHandler::NetworkPropertiesUpdated(
@@ skipping 312 matching lines @@
 }
 
 void NetworkConnectionHandler::HandleShillDisconnectSuccess(
     const std::string& service_path,
     const base::Closure& success_callback) {
   NET_LOG_EVENT("Disconnect Request Sent", service_path);
   if (!success_callback.is_null())
     success_callback.Run();
 }
 
-// Activate
-
-void NetworkConnectionHandler::CallShillActivate(
-    const std::string& service_path,
-    const std::string& carrier,
-    const base::Closure& success_callback,
-    const network_handler::ErrorCallback& error_callback) {
-  NET_LOG_USER("Activate Request", service_path + ": '" + carrier + "'");
-  DBusThreadManager::Get()->GetShillServiceClient()->ActivateCellularModem(
-      dbus::ObjectPath(service_path),
-      carrier,
-      base::Bind(&NetworkConnectionHandler::HandleShillActivateSuccess,
-                 AsWeakPtr(), service_path, success_callback),
-      base::Bind(&network_handler::ShillErrorCallbackFunction,
-                 kErrorShillError, service_path, error_callback));
-}
-
-void NetworkConnectionHandler::HandleShillActivateSuccess(
-    const std::string& service_path,
-    const base::Closure& success_callback) {
-  NET_LOG_EVENT("Activate Request Sent", service_path);
-  if (!success_callback.is_null())
-    success_callback.Run();
-}
-
 }  // namespace chromeos