Convert more PyAuto proxy calls to the JSON interface.

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 1641 matching lines @@
 }
 
 void TestingAutomationProvider::BuildJSONHandlerMaps() {
   // Map json commands to their handlers.
   handler_map_["ApplyAccelerator"] =
       &TestingAutomationProvider::ExecuteBrowserCommandAsyncJSON;
   handler_map_["RunCommand"] =
       &TestingAutomationProvider::ExecuteBrowserCommandJSON;
   handler_map_["IsMenuCommandEnabled"] =
       &TestingAutomationProvider::IsMenuCommandEnabledJSON;
+  handler_map_["ActivateTab"] =
+      &TestingAutomationProvider::ActivateTabJSON;
+  handler_map_["BringBrowserToFront"] =
+      &TestingAutomationProvider::BringBrowserToFrontJSON;
   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;
@@ skipping 72 matching lines @@
   handler_map_["AcceptOrDismissAppModalDialog"] =
       &TestingAutomationProvider::AcceptOrDismissAppModalDialog;
   handler_map_["GetChromeDriverAutomationVersion"] =
       &TestingAutomationProvider::GetChromeDriverAutomationVersion;
   handler_map_["IsPageActionVisible"] =
       &TestingAutomationProvider::IsPageActionVisible;
   handler_map_["CreateNewAutomationProvider"] =
       &TestingAutomationProvider::CreateNewAutomationProvider;
   handler_map_["GetBrowserInfo"] =
       &TestingAutomationProvider::GetBrowserInfo;
+  handler_map_["GetTabInfo"] =
+      &TestingAutomationProvider::GetTabInfo;
+  handler_map_["GetTabCount"] =
+      &TestingAutomationProvider::GetTabCountJSON;
   handler_map_["OpenNewBrowserWindowWithNewProfile"] =
       &TestingAutomationProvider::OpenNewBrowserWindowWithNewProfile;
   handler_map_["GetMultiProfileInfo"] =
       &TestingAutomationProvider::GetMultiProfileInfo;
   handler_map_["OpenProfileWindow"] =
       &TestingAutomationProvider::OpenProfileWindow;
   handler_map_["GetProcessInfo"] =
       &TestingAutomationProvider::GetProcessInfo;
   handler_map_["GetPolicyDefinitionList"] =
       &TestingAutomationProvider::GetPolicyDefinitionList;
@@ skipping 362 matching lines @@
       error_string += it->first + ", ";
     }
     for (std::map<std::string, BrowserJsonHandler>::const_iterator it =
          browser_handler_map_.begin(); it != browser_handler_map_.end(); ++it) {
       error_string += it->first + ", ";
     }
     AutomationJSONReply(this, reply_message).SendError(error_string);
   }
 }
 
+void TestingAutomationProvider::BringBrowserToFrontJSON(
+    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;
+  }
+  browser->window()->Activate();
+  reply.SendSuccess(NULL);
+}
+
 // Sample json input: { "command": "SetWindowDimensions",
 //                      "x": 20,         # optional
 //                      "y": 20,         # optional
 //                      "width": 800,    # optional
 //                      "height": 600 }  # optional
 void TestingAutomationProvider::SetWindowDimensions(
     Browser* browser,
     DictionaryValue* args,
     IPC::Message* reply_message) {
   gfx::Rect rect = browser->window()->GetRestoredBounds();
@@ skipping 4330 matching lines @@
   if (!args->GetInteger("accelerator", &command)) {
     AutomationJSONReply(this, reply_message).SendError(
         "'accelerator' missing or invalid.");
     return;
   }
   DictionaryValue dict;
   dict.SetBoolean("enabled", chrome::IsCommandEnabled(browser, command));
   AutomationJSONReply(this, reply_message).SendSuccess(&dict);
 }
 
+void TestingAutomationProvider::GetTabInfo(
+    DictionaryValue* args,
+    IPC::Message* reply_message) {
+  AutomationJSONReply reply(this, reply_message);
+  Browser* browser;
+  WebContents* tab;
+  std::string error;
+  if (GetBrowserAndTabFromJSONArgs(args, &browser, &tab, &error)) {
+    NavigationEntry* entry = tab->GetController().GetActiveEntry();
+    DictionaryValue dict;
+    dict.SetString("title", entry->GetTitleForDisplay(""));
+    dict.SetString("url", entry->GetVirtualURL().spec());
+    reply.SendSuccess(&dict);
+  } else {
+    reply.SendError(error);
+  }
+}
+
+void TestingAutomationProvider::GetTabCountJSON(
+    DictionaryValue* args,
+    IPC::Message* reply_message) {
+  AutomationJSONReply reply(this, reply_message);
+  Browser* browser;
+  std::string error;
+  if (!GetBrowserFromJSONArgs(args, &browser, &error)) {
+    reply.SendError(error);
+    return;
+  }
+  DictionaryValue dict;
+  dict.SetInteger("tab_count", browser->tab_count());
+  reply.SendSuccess(&dict);
+}
+
 void TestingAutomationProvider::GoBack(
     DictionaryValue* args,
     IPC::Message* reply_message) {
   if (SendErrorIfModalDialogActive(this, reply_message))
     return;
 
   WebContents* web_contents;
   std::string error;
   if (!GetTabFromJSONArgs(args, &web_contents, &error)) {
     AutomationJSONReply(this, reply_message).SendError(error);
@@ skipping 408 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);
 }