Convert more automation 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 393 matching lines @@
     IPC_MESSAGE_HANDLER(AutomationMsg_WindowForBrowser, GetWindowForBrowser)
     IPC_MESSAGE_HANDLER_DELAY_REPLY(AutomationMsg_WaitForTabToBeRestored,
                                     WaitForTabToBeRestored)
     IPC_MESSAGE_HANDLER(AutomationMsg_GetSecurityState, GetSecurityState)
     IPC_MESSAGE_HANDLER(AutomationMsg_GetPageType, GetPageType)
     IPC_MESSAGE_HANDLER(AutomationMsg_GetMetricEventDuration,
                         GetMetricEventDuration)
     IPC_MESSAGE_HANDLER_DELAY_REPLY(AutomationMsg_ActionOnSSLBlockingPage,
                                     ActionOnSSLBlockingPage)
     IPC_MESSAGE_HANDLER(AutomationMsg_BringBrowserToFront, BringBrowserToFront)
-    IPC_MESSAGE_HANDLER(AutomationMsg_OpenFindInPage,
-                        HandleOpenFindInPageRequest)
     IPC_MESSAGE_HANDLER(AutomationMsg_FindWindowVisibility,
                         GetFindWindowVisibility)
     IPC_MESSAGE_HANDLER(AutomationMsg_BookmarkBarVisibility,
                         GetBookmarkBarVisibility)
     IPC_MESSAGE_HANDLER(AutomationMsg_GetBookmarksAsJSON,
                         GetBookmarksAsJSON)
     IPC_MESSAGE_HANDLER_DELAY_REPLY(AutomationMsg_WaitForBookmarkModelToLoad,
                                     WaitForBookmarkModelToLoad)
     IPC_MESSAGE_HANDLER(AutomationMsg_AddBookmarkGroup,
                         AddBookmarkGroup)
@@ skipping 18 matching lines @@
         GoForwardBlockUntilNavigationsComplete)
     IPC_MESSAGE_HANDLER_DELAY_REPLY(AutomationMsg_SendJSONRequest,
                                     SendJSONRequestWithBrowserIndex)
     IPC_MESSAGE_HANDLER_DELAY_REPLY(
         AutomationMsg_SendJSONRequestWithBrowserHandle,
         SendJSONRequestWithBrowserHandle)
     IPC_MESSAGE_HANDLER_DELAY_REPLY(AutomationMsg_WaitForTabCountToBecome,
                                     WaitForTabCountToBecome)
     IPC_MESSAGE_HANDLER_DELAY_REPLY(AutomationMsg_WaitForInfoBarCount,
                                     WaitForInfoBarCount)
-    IPC_MESSAGE_HANDLER(AutomationMsg_ResetToDefaultTheme, ResetToDefaultTheme)
     IPC_MESSAGE_HANDLER_DELAY_REPLY(
         AutomationMsg_WaitForProcessLauncherThreadToGoIdle,
         WaitForProcessLauncherThreadToGoIdle)
 
     IPC_MESSAGE_UNHANDLED(
         handled = AutomationProvider::OnMessageReceived(message))
   IPC_END_MESSAGE_MAP_EX()
   if (!deserialize_success)
     OnMessageDeserializationFailure();
   return handled;
@@ skipping 692 matching lines @@
   new BrowserOpenedNotificationObserver(this, reply_message, false);
   // We may have no current browser windows open so don't rely on
   // asking an existing browser to execute the IDC_NEWWINDOW command
   Browser* browser = new Browser(
       Browser::CreateParams(static_cast<Browser::Type>(type), profile_));
   chrome::AddBlankTab(browser, true);
   if (show)
     browser->window()->Show();
 }
 
+void TestingAutomationProvider::OpenNewBrowserWindow(
+    base::DictionaryValue* args,
+    IPC::Message* reply_message) {
+  AutomationJSONReply reply(this, reply_message);
+  bool show;
+  if (!args->GetBoolean("show", &show)) {
+    reply.SendError("'show' missing or invalid.");
+    return;
+  }
+  new BrowserOpenedNotificationObserver(this, reply_message, true);
+  Browser* browser = new Browser(
+      Browser::CreateParams(Browser::TYPE_TABBED, profile_));
+  chrome::AddBlankTab(browser, true);
+  if (show)
+    browser->window()->Show();
+}
+
+void TestingAutomationProvider::GetBrowserWindowCountJSON(
+    base::DictionaryValue* args,
+    IPC::Message* reply_message) {
+  DictionaryValue dict;
+  dict.SetInteger("count", static_cast<int>(BrowserList::size()));
+  AutomationJSONReply(this, reply_message).SendSuccess(&dict);
+}
+
+void TestingAutomationProvider::CloseBrowserWindow(
+    base::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;
+  }
+  new BrowserClosedNotificationObserver(browser, this, reply_message, true);
+  browser->window()->Close();
+}
+
 void TestingAutomationProvider::OpenProfileWindow(
     base::DictionaryValue* args, IPC::Message* reply_message) {
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   FilePath::StringType path;
   if (!args->GetString("path", &path)) {
     AutomationJSONReply(this, reply_message).SendError(
         "Invalid or missing arg: 'path'");
     return;
   }
   Profile* profile = profile_manager->GetProfileByPath(FilePath(path));
@@ skipping 129 matching lines @@
 void TestingAutomationProvider::BringBrowserToFront(int browser_handle,
                                                     bool* success) {
   *success = false;
   if (browser_tracker_->ContainsHandle(browser_handle)) {
     Browser* browser = browser_tracker_->GetResource(browser_handle);
     browser->window()->Activate();
     *success = true;
   }
 }
 
-void TestingAutomationProvider::HandleOpenFindInPageRequest(
-    const IPC::Message& message, int handle) {
-  if (browser_tracker_->ContainsHandle(handle)) {
-    Browser* browser = browser_tracker_->GetResource(handle);
-    chrome::FindInPage(browser, false, false);
-  }
-}
-
 void TestingAutomationProvider::GetFindWindowVisibility(int handle,
                                                         bool* visible) {
   *visible = false;
   Browser* browser = browser_tracker_->GetResource(handle);
   if (browser) {
     FindBarTesting* find_bar =
         browser->GetFindBarController()->find_bar()->GetFindBarTesting();
     find_bar->GetFindBarWindowInfo(NULL, visible);
   }
 }
@@ skipping 273 matching lines @@
   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_["OpenNewBrowserWindow"] =
+      &TestingAutomationProvider::OpenNewBrowserWindow;
+  handler_map_["CloseBrowserWindow"] =
+      &TestingAutomationProvider::CloseBrowserWindow;
   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;
   handler_map_["AddDomEventObserver"] =
       &TestingAutomationProvider::AddDomEventObserver;
   handler_map_["RemoveEventObserver"] =
       &TestingAutomationProvider::RemoveEventObserver;
   handler_map_["GetNextEvent"] =
       &TestingAutomationProvider::GetNextEvent;
   handler_map_["ClearEventQueue"] =
       &TestingAutomationProvider::ClearEventQueue;
   handler_map_["ExecuteJavascriptInRenderView"] =
       &TestingAutomationProvider::ExecuteJavascriptInRenderView;
   handler_map_["GoForward"] =
       &TestingAutomationProvider::GoForward;
   handler_map_["GoBack"] =
       &TestingAutomationProvider::GoBack;
   handler_map_["Reload"] =
       &TestingAutomationProvider::ReloadJSON;
+  handler_map_["OpenFindInPage"] =
+      &TestingAutomationProvider::OpenFindInPage;
+  handler_map_["IsFindInPageVisible"] =
+      &TestingAutomationProvider::IsFindInPageVisible;
   handler_map_["CaptureEntirePage"] =
       &TestingAutomationProvider::CaptureEntirePageJSON;
   handler_map_["SetDownloadShelfVisible"] =
       &TestingAutomationProvider::SetDownloadShelfVisibleJSON;
   handler_map_["IsDownloadShelfVisible"] =
       &TestingAutomationProvider::IsDownloadShelfVisibleJSON;
   handler_map_["GetDownloadDirectory"] =
       &TestingAutomationProvider::GetDownloadDirectoryJSON;
   handler_map_["GetCookies"] =
       &TestingAutomationProvider::GetCookiesJSON;
@@ skipping 46 matching lines @@
   handler_map_["GetAppModalDialogMessage"] =
       &TestingAutomationProvider::GetAppModalDialogMessage;
   handler_map_["AcceptOrDismissAppModalDialog"] =
       &TestingAutomationProvider::AcceptOrDismissAppModalDialog;
   handler_map_["GetChromeDriverAutomationVersion"] =
       &TestingAutomationProvider::GetChromeDriverAutomationVersion;
   handler_map_["IsPageActionVisible"] =
       &TestingAutomationProvider::IsPageActionVisible;
   handler_map_["CreateNewAutomationProvider"] =
       &TestingAutomationProvider::CreateNewAutomationProvider;
+  handler_map_["GetBrowserWindowCount"] =
+      &TestingAutomationProvider::GetBrowserWindowCountJSON;
   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;
@@ skipping 186 matching lines @@
   browser_handler_map_["GetSavedPasswords"] =
       &TestingAutomationProvider::GetSavedPasswords;
 
   browser_handler_map_["ClearBrowsingData"] =
       &TestingAutomationProvider::ClearBrowsingData;
 
   browser_handler_map_["GetBlockedPopupsInfo"] =
       &TestingAutomationProvider::GetBlockedPopupsInfo;
   browser_handler_map_["UnblockAndLaunchBlockedPopup"] =
       &TestingAutomationProvider::UnblockAndLaunchBlockedPopup;
+  handler_map_["ResetToDefaultTheme"] =
+      &TestingAutomationProvider::ResetToDefaultTheme;
 
   // SetTheme() implemented using InstallExtension().
   browser_handler_map_["GetThemeInfo"] =
       &TestingAutomationProvider::GetThemeInfo;
 
   browser_handler_map_["FindInPage"] = &TestingAutomationProvider::FindInPage;
 
   browser_handler_map_["SelectTranslateOption"] =
       &TestingAutomationProvider::SelectTranslateOption;
   browser_handler_map_["GetTranslateInfo"] =
@@ skipping 1870 matching lines @@
   }
   SendFindRequest(tab_contents->web_contents(),
                   true,
                   search_string,
                   forward,
                   match_case,
                   find_next,
                   reply_message);
 }
 
+void TestingAutomationProvider::OpenFindInPage(
+    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;
+  }
+  chrome::FindInPage(browser, false, false);
+  reply.SendSuccess(NULL);
+}
+
+void TestingAutomationProvider::IsFindInPageVisible(
+    DictionaryValue* args,
+    IPC::Message* reply_message) {
+  AutomationJSONReply reply(this, reply_message);
+  bool visible;
+  Browser* browser;
+  std::string error_msg;
+  if (!GetBrowserFromJSONArgs(args, &browser, &error_msg)) {
+    reply.SendError(error_msg);
+    return;
+  }
+  FindBarTesting* find_bar =
+      browser->GetFindBarController()->find_bar()->GetFindBarTesting();
+  find_bar->GetFindBarWindowInfo(NULL, &visible);
+  DictionaryValue dict;
+  dict.SetBoolean("is_visible", visible);
+  reply.SendSuccess(&dict);
+}
+
 // See GetTranslateInfo() in chrome/test/pyautolib/pyauto.py for sample json
 // input and output.
 void TestingAutomationProvider::GetTranslateInfo(
     Browser* browser,
     DictionaryValue* args,
     IPC::Message* reply_message) {
   std::string error_message;
   TabContents* tab_contents =
       GetTabContentsFromDict(browser, args, &error_message);
   if (!tab_contents) {
@@ skipping 3132 matching lines @@
   std::string error;
   if (!GetBrowserAndTabFromJSONArgs(args, &browser, &web_contents, &error)) {
     reply.SendError(error);
     return;
   }
   chrome::ActivateTabAt(browser, chrome::GetIndexOfTab(browser, web_contents),
                         true);
   reply.SendSuccess(NULL);
 }
 
+void TestingAutomationProvider::ResetToDefaultTheme(
+    base::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;
+  }
+  ThemeServiceFactory::GetForProfile(browser->profile())->UseDefaultTheme();
+  reply.SendSuccess(NULL);
+}
+
 void TestingAutomationProvider::IsPageActionVisible(
     base::DictionaryValue* args,
     IPC::Message* reply_message) {
   AutomationJSONReply reply(this, reply_message);
 
   WebContents* tab;
   std::string error;
   if (!GetTabFromJSONArgs(args, &tab, &error)) {
     reply.SendError(error);
     return;
@@ skipping 98 matching lines @@
     AutomationMsg_WaitForInfoBarCount::WriteReplyParams(reply_message_, false);
     Send(reply_message_);
     return;
   }
 
   // The delegate will delete itself.
   new InfoBarCountObserver(this, reply_message,
       TabContents::FromWebContents(controller->GetWebContents()), target_count);
 }
 
-void TestingAutomationProvider::ResetToDefaultTheme() {
-  ThemeServiceFactory::GetForProfile(profile_)->UseDefaultTheme();
-}
-
 void TestingAutomationProvider::WaitForProcessLauncherThreadToGoIdle(
     IPC::Message* reply_message) {
   new WaitForProcessLauncherThreadToGoIdleObserver(this, reply_message);
 }
 
 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);
 }