Allow the automation provider to accept an ID for performing render-view

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 263 matching lines @@
     IPC::Message* reply_message,
     int number_of_navigations,
     bool include_current_navigation,
     bool use_json_interface)
     : automation_(automation->AsWeakPtr()),
       reply_message_(reply_message),
       controller_(controller),
       navigations_remaining_(number_of_navigations),
       navigation_started_(false),
       use_json_interface_(use_json_interface) {
+  if (number_of_navigations == 0) {
+    ConditionMet(AUTOMATION_MSG_NAVIGATION_SUCCESS);
+    return;
+  }
   DCHECK_LT(0, navigations_remaining_);
   content::Source<NavigationController> source(controller_);
   registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED, source);
   registrar_.Add(this, content::NOTIFICATION_LOAD_START, source);
   registrar_.Add(this, content::NOTIFICATION_LOAD_STOP, source);
   registrar_.Add(this, chrome::NOTIFICATION_AUTH_NEEDED, source);
   registrar_.Add(this, chrome::NOTIFICATION_AUTH_SUPPLIED, source);
   registrar_.Add(this, chrome::NOTIFICATION_AUTH_CANCELLED, source);
   registrar_.Add(this, chrome::NOTIFICATION_APP_MODAL_DIALOG_SHOWN,
                  content::NotificationService::AllSources());
@@ skipping 351 matching lines @@
     case chrome::NOTIFICATION_EXTENSION_INSTALL_ERROR:
     case chrome::NOTIFICATION_EXTENSION_LOAD_ERROR:
     case chrome::NOTIFICATION_EXTENSION_UPDATE_DISABLED:
       break;
     default:
       NOTREACHED();
       break;
   }
 
   if (use_json_) {
-    DictionaryValue dict;
-    dict.SetString("id", extension_->id());
-    AutomationJSONReply(automation_, reply_message_.release())
-        .SendSuccess(&dict);
+    AutomationJSONReply reply(automation_, reply_message_.release());
+    if (extension_) {
+      DictionaryValue dict;
+      dict.SetString("id", extension_->id());
+      reply.SendSuccess(&dict);
+    } else {
+      reply.SendError("Extension could not be installed");
+    }
   } else {
     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(
@@ skipping 2370 matching lines @@
   }
 }
 
 // static
 void PolicyUpdatesObserver::PostTask(content::BrowserThread::ID id,
                                      const base::Closure& callback) {
   content::BrowserThread::PostTask(id, FROM_HERE, callback);
 }
 
 #endif  // defined(ENABLE_CONFIGURATION_POLICY)