Switch over MobileActivator to use Network*Handler

chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc

Index: chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc
diff --git a/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc b/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc
index 634679d1f52aa551e054bb91333b47d699baaca0..1ad33289c84deaeff5a01d57476174d6a73fa1c1 100644
--- a/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc
+++ b/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc
@@ -23,15 +23,13 @@
 #include "ui/views/widget/widget.h"
 #include "ui/web_dialogs/web_dialog_delegate.h"
 
-using chromeos::CellularNetwork;
 using chromeos::MobileActivator;
 using content::BrowserThread;
 using content::WebContents;
 using content::WebUIMessageHandler;
 using ui::WebDialogDelegate;
 
-class MobileSetupDialogDelegate : public WebDialogDelegate,
-                                  public MobileActivator::Observer {
+class MobileSetupDialogDelegate : public WebDialogDelegate {
  public:
   static MobileSetupDialogDelegate* GetInstance();
   void ShowDialog(const std::string& service_path);
@@ -62,12 +60,6 @@ class MobileSetupDialogDelegate : public WebDialogDelegate,
   virtual bool HandleContextMenu(
       const content::ContextMenuParams& params) OVERRIDE;
 
-  // MobileActivator::Observer overrides.
-  virtual void OnActivationStateChanged(
-      CellularNetwork* network,
-      MobileActivator::PlanActivationState state,
-      const std::string& error_description) OVERRIDE;
-
  private:
   gfx::NativeWindow dialog_window_;
   // Cellular network service path.
@@ -91,7 +83,6 @@ MobileSetupDialogDelegate::MobileSetupDialogDelegate() : dialog_window_(NULL) {
 }
 
 MobileSetupDialogDelegate::~MobileSetupDialogDelegate() {
-  MobileActivator::GetInstance()->RemoveObserver(this);
 }
 
 void MobileSetupDialogDelegate::ShowDialog(const std::string& service_path) {
@@ -142,12 +133,10 @@ std::string MobileSetupDialogDelegate::GetDialogArgs() const {
 
 void MobileSetupDialogDelegate::OnDialogShown(
     content::WebUI* webui, content::RenderViewHost* render_view_host) {
-  MobileActivator::GetInstance()->AddObserver(this);
 }
 
 
 void MobileSetupDialogDelegate::OnDialogClosed(const std::string& json_retval) {
-  MobileActivator::GetInstance()->RemoveObserver(this);
   dialog_window_ = NULL;
 }
 
@@ -178,9 +167,3 @@ bool MobileSetupDialogDelegate::HandleContextMenu(
     const content::ContextMenuParams& params) {
   return true;
 }
-
-void MobileSetupDialogDelegate::OnActivationStateChanged(
-    CellularNetwork* network,
-    MobileActivator::PlanActivationState state,
-    const std::string& error_description) {
-}