Switch over MobileActivator to use Network*Handler

chromeos/network/network_connection_handler.h

Index: chromeos/network/network_connection_handler.h
diff --git a/chromeos/network/network_connection_handler.h b/chromeos/network/network_connection_handler.h
index b1855c8e324d2bf524b18c8b76773db77925ed56..8268b6b761a9389318e9c10723920c54933e1b27 100644
--- a/chromeos/network/network_connection_handler.h
+++ b/chromeos/network/network_connection_handler.h
@@ -101,18 +101,6 @@ class CHROMEOS_EXPORT NetworkConnectionHandler
                          const base::Closure& success_callback,
                          const network_handler::ErrorCallback& error_callback);
 
-  // ActivateNetwork() will start an asynchronous activation attempt.
-  // |carrier| may be empty or may specify a carrier to activate.
-  // On success, |success_callback| will be called.
-  // On failure, |error_callback| will be called with |error_name| one of:
-  //  kErrorNotFound if no network matching |service_path| is found.
-  //  kErrorShillError if a DBus or Shill error occurred.
-  // TODO(stevenjb/armansito): Move this to a separate NetworkActivationHandler.
-  void ActivateNetwork(const std::string& service_path,
-                       const std::string& carrier,
-                       const base::Closure& success_callback,
-                       const network_handler::ErrorCallback& error_callback);
-
   // Returns true if ConnectToNetwork has been called with |service_path| and
   // has not completed (i.e. success or error callback has been called).
   bool HasConnectingNetwork(const std::string& service_path);
@@ -184,16 +172,6 @@ class CHROMEOS_EXPORT NetworkConnectionHandler
   void HandleShillDisconnectSuccess(const std::string& service_path,
                                     const base::Closure& success_callback);
 
-  // Calls Shill.Manager.Activate asynchronously.
-  void CallShillActivate(
-      const std::string& service_path,
-      const std::string& carrier,
-      const base::Closure& success_callback,
-      const network_handler::ErrorCallback& error_callback);
-
-  // Handle success from Shill.Service.ActivateCellularModem.
-  void HandleShillActivateSuccess(const std::string& service_path,
-                                  const base::Closure& success_callback);
 
   // Local references to the associated handler instances.
   CertLoader* cert_loader_;