Refactor: Make PyAuto InstallExtension() take a string. Delete dead code.

chrome/browser/automation/automation_provider_observers.cc

 // Copyright (c) 2011 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 "chrome/browser/automation/automation_provider_observers.h"
 
 #include <deque>
 #include <string>
 #include <vector>
 
@@ skipping 446 matching lines @@
 
 bool DidExtensionHostsStopLoading(ExtensionProcessManager* manager) {
   for (ExtensionProcessManager::const_iterator iter = manager->begin();
        iter != manager->end(); ++iter) {
     if (!(*iter)->did_stop_loading())
       return false;
   }
   return true;
 }
 
-ExtensionInstallNotificationObserver::ExtensionInstallNotificationObserver(
-    AutomationProvider* automation, int id, IPC::Message* reply_message)
-    : automation_(automation->AsWeakPtr()),
-      id_(id),
-      reply_message_(reply_message) {
-  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,
-                 NotificationService::AllSources());
-  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_INSTALL_ERROR,
-                 NotificationService::AllSources());
-  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UPDATE_DISABLED,
-                 NotificationService::AllSources());
-}
-
-ExtensionInstallNotificationObserver::~ExtensionInstallNotificationObserver() {
-}
-
-void ExtensionInstallNotificationObserver::Observe(
-    int type, const NotificationSource& source,
-    const NotificationDetails& details) {
-  switch (type) {
-    case chrome::NOTIFICATION_EXTENSION_LOADED:
-      SendResponse(AUTOMATION_MSG_EXTENSION_INSTALL_SUCCEEDED);
-      break;
-    case chrome::NOTIFICATION_EXTENSION_INSTALL_ERROR:
-    case chrome::NOTIFICATION_EXTENSION_UPDATE_DISABLED:
-      SendResponse(AUTOMATION_MSG_EXTENSION_INSTALL_FAILED);
-      break;
-    default:
-      NOTREACHED();
-      break;
-  }
-
-  delete this;
-}
-
-void ExtensionInstallNotificationObserver::SendResponse(
-    AutomationMsg_ExtensionResponseValues response) {
-  if (!automation_ || !reply_message_.get()) {
-    delete this;
-    return;
-  }
-
-  switch (id_) {
-    case AutomationMsg_InstallExtension::ID:
-      AutomationMsg_InstallExtension::WriteReplyParams(reply_message_.get(),
-                                                       response);
-      break;
-    default:
-      NOTREACHED();
-      break;
-  }
-
-  automation_->Send(reply_message_.release());
-}
-
 ExtensionUninstallObserver::ExtensionUninstallObserver(
     AutomationProvider* automation,
     IPC::Message* reply_message,
     const std::string& id)
     : automation_(automation->AsWeakPtr()),
       reply_message_(reply_message),
       id_(id) {
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNINSTALLED,
                  NotificationService::AllSources());
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNINSTALL_NOT_ALLOWED,
@@ skipping 87 matching lines @@
         return;
       break;
     case chrome::NOTIFICATION_EXTENSION_INSTALL_ERROR:
     case chrome::NOTIFICATION_EXTENSION_UPDATE_DISABLED:
       break;
     default:
       NOTREACHED();
       break;
   }
 
-  if (id_ == AutomationMsg_InstallExtensionAndGetHandle::ID) {
+  if (id_ == AutomationMsg_InstallExtension::ID) {
     // A handle of zero indicates an error.
     int extension_handle = 0;
     if (extension_)
       extension_handle = automation_->AddExtension(extension_);
-    AutomationMsg_InstallExtensionAndGetHandle::WriteReplyParams(
+    AutomationMsg_InstallExtension::WriteReplyParams(
         reply_message_.get(), extension_handle);
   } else if (id_ == AutomationMsg_EnableExtension::ID) {
     AutomationMsg_EnableExtension::WriteReplyParams(reply_message_.get(), true);
   } else {
     NOTREACHED();
     LOG(ERROR) << "Cannot write reply params for unknown message id.";
   }
 
   automation_->Send(reply_message_.release());
   delete this;
@@ skipping 2005 matching lines @@
 void DragTargetDropAckNotificationObserver::Observe(
     int type,
     const NotificationSource& source,
     const NotificationDetails& details) {
   if (automation_) {
     AutomationJSONReply(automation_,
                         reply_message_.release()).SendSuccess(NULL);
   }
   delete this;
 }