Convert PyAuto's NavigateToURL, GetActiveTabIndex, Refresh, RefreshActiveTab, and AppendTab to the …

chrome/browser/automation/testing_automation_provider.cc

 // Copyright (c) 2012 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/testing_automation_provider.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 486 matching lines @@
 
 void TestingAutomationProvider::AppendTab(int handle,
                                           const GURL& url,
                                           IPC::Message* reply_message) {
   int append_tab_response = -1;  // -1 is the error code
   TabAppendedNotificationObserver* observer = NULL;
 
   if (browser_tracker_->ContainsHandle(handle)) {
     Browser* browser = browser_tracker_->GetResource(handle);
     observer = new TabAppendedNotificationObserver(browser, this,
-                                                   reply_message);
-    TabContents* contents = chrome::AddSelectedTabWithURL(
-        browser, url, content::PAGE_TRANSITION_TYPED);
+                                                   reply_message, false);
+    TabContents* contents =
+        chrome::AddSelectedTabWithURL(browser, url,
+                                      content::PAGE_TRANSITION_TYPED);
     if (contents) {
       append_tab_response = GetIndexForNavigationController(
           &contents->web_contents()->GetController(), browser);
     }
   }
 
   if (append_tab_response < 0) {
     // Appending tab failed. Clean up and send failure response.
 
     if (observer)
@@ skipping 1150 matching lines @@
 }
 
 void TestingAutomationProvider::BuildJSONHandlerMaps() {
   // Map json commands to their handlers.
   handler_map_["WaitForAllTabsToStopLoading"] =
       &TestingAutomationProvider::WaitForAllViewsToStopLoading;
   handler_map_["GetIndicesFromTab"] =
       &TestingAutomationProvider::GetIndicesFromTab;
   handler_map_["NavigateToURL"] =
       &TestingAutomationProvider::NavigateToURL;
+  handler_map_["GetActiveTabIndex"] =
+      &TestingAutomationProvider::GetActiveTabIndexJSON;
+  handler_map_["AppendTab"] =
+      &TestingAutomationProvider::AppendTabJSON;
   handler_map_["WaitUntilNavigationCompletes"] =
       &TestingAutomationProvider::WaitUntilNavigationCompletes;
   handler_map_["GetLocalStatePrefsInfo"] =
       &TestingAutomationProvider::GetLocalStatePrefsInfo;
   handler_map_["SetLocalStatePrefs"] =
       &TestingAutomationProvider::SetLocalStatePrefs;
   handler_map_["GetPrefsInfo"] = &TestingAutomationProvider::GetPrefsInfo;
   handler_map_["SetPrefs"] = &TestingAutomationProvider::SetPrefs;
   handler_map_["ExecuteJavascript"] =
       &TestingAutomationProvider::ExecuteJavascriptJSON;
@@ skipping 4450 matching lines @@
       navigation_count, false, true);
   OpenURLParams params(
       GURL(url), content::Referrer(), CURRENT_TAB,
       content::PageTransitionFromInt(
           content::PAGE_TRANSITION_TYPED |
           content::PAGE_TRANSITION_FROM_ADDRESS_BAR),
       false);
   browser->OpenURLFromTab(web_contents, params);
 }
 
+void TestingAutomationProvider::GetActiveTabIndexJSON(
+    DictionaryValue* args,
+    IPC::Message* reply_message) {
+  AutomationJSONReply reply(this, reply_message);
+  Browser* browser;
+  std::string error_msg;
+  if (!GetBrowserFromJSONArgs(args, &browser, &error_msg)) {
+    reply.SendError(error_msg);
+    return;
+  }
+  int tab_index = browser->active_index();
+  scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
+  return_value->SetInteger("tab_index", tab_index);
+  reply.SendSuccess(return_value.get());
+}
+
+void TestingAutomationProvider::AppendTabJSON(DictionaryValue* args,
+                                              IPC::Message* reply_message) {
+  TabAppendedNotificationObserver* observer = NULL;
+  int append_tab_response = -1;
+  Browser* browser;
+  std::string error_msg, url;
+  if (!GetBrowserFromJSONArgs(args, &browser, &error_msg)) {
+    AutomationJSONReply(this, reply_message).SendError(error_msg);
+    return;
+  }
+  if (!args->GetString("url", &url)) {
+    AutomationJSONReply(this, reply_message)
+        .SendError("'url' missing or invalid");
+    return;
+  }
+  observer = new TabAppendedNotificationObserver(browser, this, reply_message,
+                                                 true);
+  TabContents* contents =
+      chrome::AddSelectedTabWithURL(browser, GURL(url),
+                                    content::PAGE_TRANSITION_TYPED);
+  if (contents) {
+    append_tab_response = GetIndexForNavigationController(
+        &contents->web_contents()->GetController(), browser);
+  }
+
+  if (!contents || append_tab_response < 0) {
+    if (observer) {
+      observer->ReleaseReply();
+      delete observer;
+    }
+    AutomationJSONReply(this, reply_message).SendError("Failed to append tab.");
+  }
+}
+
 void TestingAutomationProvider::WaitUntilNavigationCompletes(
     DictionaryValue* args,
     IPC::Message* reply_message) {
   if (SendErrorIfModalDialogActive(this, reply_message))
     return;
 
   std::string error;
   Browser* browser;
   WebContents* web_contents;
   if (!GetBrowserAndTabFromJSONArgs(args, &browser, &web_contents, &error)) {
@@ skipping 607 matching lines @@
 void TestingAutomationProvider::OnRemoveProvider() {
   if (g_browser_process)
     g_browser_process->GetAutomationProviderList()->RemoveProvider(this);
 }
 
 void TestingAutomationProvider::EnsureTabSelected(Browser* browser,
                                                   WebContents* tab) {
   if (chrome::GetActiveWebContents(browser) != tab)
     chrome::ActivateTabAt(browser, chrome::GetIndexOfTab(browser, tab), true);
 }