Allow chromedriver to install an extension and get all installed extension IDs.

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 556 matching lines @@
   }
 }
 
 ExtensionReadyNotificationObserver::ExtensionReadyNotificationObserver(
     ExtensionProcessManager* manager, ExtensionService* service,
     AutomationProvider* automation, int id, IPC::Message* reply_message)
     : manager_(manager),
       service_(service),
       automation_(automation->AsWeakPtr()),
       id_(id),
+      use_json_(false),
       reply_message_(reply_message),
       extension_(NULL) {
+  Init();
+}
+
+ExtensionReadyNotificationObserver::ExtensionReadyNotificationObserver(
+    ExtensionProcessManager* manager, ExtensionService* service,
+    AutomationProvider* automation, IPC::Message* reply_message)
+    : manager_(manager),
+      service_(service),
+      automation_(automation->AsWeakPtr()),
+      use_json_(true),
+      reply_message_(reply_message),
+      extension_(NULL) {
+  Init();
+}
+
+ExtensionReadyNotificationObserver::~ExtensionReadyNotificationObserver() {
+}
+
+void ExtensionReadyNotificationObserver::Init() {
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING,
                  content::NotificationService::AllSources());
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,
                  content::NotificationService::AllSources());
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOAD_ERROR,
                  content::NotificationService::AllSources());
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_INSTALL_ERROR,
                  content::NotificationService::AllSources());
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UPDATE_DISABLED,
                  content::NotificationService::AllSources());
 }
 
-ExtensionReadyNotificationObserver::~ExtensionReadyNotificationObserver() {
-}
-
 void ExtensionReadyNotificationObserver::Observe(
     int type, const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   if (!automation_) {
     delete this;
     return;
   }
 
   switch (type) {
     case chrome::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING:
       // Only continue on with this method if our extension has been loaded
       // and all the extension hosts have stopped loading.
       if (!extension_ || !DidExtensionHostsStopLoading(manager_))
         return;
       break;
-    case chrome::NOTIFICATION_EXTENSION_LOADED:
-      extension_ = content::Details<const Extension>(details).ptr();
+    case chrome::NOTIFICATION_EXTENSION_LOADED: {

[dennis_jeffrey, 2011/11/22 23:32:16]

Is there a reason this block is enclosed in braces, whereas the block above is
not?

[kkania, 2011/11/23 17:31:23]

I need the brace because I am defining a new var in this scope

+      const Extension* loaded_extension =
+          content::Details<const Extension>(details).ptr();
+      // Only track internal extension loads.
+      if (loaded_extension->location() != Extension::INTERNAL)
+        return;
+      extension_ = loaded_extension;
       if (!DidExtensionHostsStopLoading(manager_))
         return;
       // For some reason, the background ExtensionHost is not yet
       // created at this point so just checking whether all ExtensionHosts
       // are loaded is not sufficient. If background page is not ready,
       // we wait for NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING.
       if (!service_->IsBackgroundPageReady(extension_))
         return;
       break;
+    }
     case chrome::NOTIFICATION_EXTENSION_INSTALL_ERROR:
     case chrome::NOTIFICATION_EXTENSION_LOAD_ERROR:
     case chrome::NOTIFICATION_EXTENSION_UPDATE_DISABLED:
       break;
     default:
       NOTREACHED();
       break;
   }
 
-  if (id_ == AutomationMsg_InstallExtension::ID) {
-    // A handle of zero indicates an error.
-    int extension_handle = 0;
-    if (extension_)
-      extension_handle = automation_->AddExtension(extension_);
-    AutomationMsg_InstallExtension::WriteReplyParams(
-        reply_message_.get(), extension_handle);
-  } else if (id_ == AutomationMsg_EnableExtension::ID) {
-    AutomationMsg_EnableExtension::WriteReplyParams(reply_message_.get(), true);
+  if (use_json_) {
+    DictionaryValue* dict = new DictionaryValue();
+    dict->SetString("id", extension_->id());
+    AutomationJSONReply(automation_, reply_message_.release())
+        .SendSuccess(dict);
   } else {
-    NOTREACHED();
-    LOG(ERROR) << "Cannot write reply params for unknown message 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_InstallExtension::WriteReplyParams(
+          reply_message_.get(), extension_handle);
+    } else if (id_ == AutomationMsg_EnableExtension::ID) {
+      AutomationMsg_EnableExtension::WriteReplyParams(
+          reply_message_.get(), true);
+    } else {
+      LOG(ERROR) << "Cannot write reply params for unknown message id.";
+    }
+    automation_->Send(reply_message_.release());
   }
-
-  automation_->Send(reply_message_.release());
   delete this;
 }
 
 ExtensionUnloadNotificationObserver::ExtensionUnloadNotificationObserver()
     : did_receive_unload_notification_(false) {
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
                  content::NotificationService::AllSources());
 }
 
 ExtensionUnloadNotificationObserver::~ExtensionUnloadNotificationObserver() {
@@ skipping 2271 matching lines @@
       if (automation_) {
         AutomationJSONReply(automation_, reply_message_.release())
             .SendSuccess(NULL);
       }
       delete this;
     }
   } else {
     NOTREACHED();
   }
 }