Convert more automation calls to the JSON interface.

chrome/test/pyautolib/pyautolib.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 "base/base_paths.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
@@ skipping 84 matching lines @@
   std::string homepage_original;
   std::swap(homepage_original, homepage_);
 
   UITestBase::SetLaunchSwitches();
 
   // However, we *do* want the --homepage switch.
   std::swap(homepage_original, homepage_);
   launch_arguments_.AppendSwitchASCII(switches::kHomePage, homepage_);
 }
 
-void PyUITestBase::OpenFindInPage(int window_index) {
-  scoped_refptr<BrowserProxy> browser_proxy = GetBrowserWindow(window_index);
-  ASSERT_TRUE(browser_proxy.get());
-  EXPECT_TRUE(browser_proxy->OpenFindInPage());
-}
-
-bool PyUITestBase::IsFindInPageVisible(int window_index) {
-  scoped_refptr<BrowserProxy> browser_proxy = GetBrowserWindow(window_index);
-  EXPECT_TRUE(browser_proxy.get());
-  if (!browser_proxy.get())
-    return false;
-  bool is_visible;
-  EXPECT_TRUE(browser_proxy->IsFindWindowFullyVisible(&is_visible));
-  return is_visible;
-}
-
-bool PyUITestBase::OpenNewBrowserWindow(bool show) {
-  return automation()->OpenNewBrowserWindow(Browser::TYPE_TABBED, show);
-}
-
-bool PyUITestBase::CloseBrowserWindow(int window_index) {
-  scoped_refptr<BrowserProxy> browser_proxy = GetBrowserWindow(window_index);
-  if (!browser_proxy.get())
-    return false;
-  bool app_closed;
-  return CloseBrowser(browser_proxy.get(), &app_closed);
-}
-
-int PyUITestBase::GetBrowserWindowCount() {
-  int num_windows = 0;
-  EXPECT_TRUE(automation()->GetBrowserWindowCount(&num_windows));
-  return num_windows;
-}
-
 bool PyUITestBase::GetBookmarkBarState(bool* visible,
                                        bool* detached,
                                        int window_index) {
   scoped_refptr<BrowserProxy> browser_proxy = GetBrowserWindow(window_index);
   EXPECT_TRUE(browser_proxy.get());
   if (!browser_proxy.get())
     return false;
 
   // We have no use for animating in this context.
   bool animating;
@@ skipping 173 matching lines @@
   if (duration >= timeout) {
     ErrorResponse(
         StringPrintf("Request timed out after %d seconds",
                      static_cast<int>(duration.InSeconds())),
         request, response);
   } else {
     // TODO(craigdh): Determine specific cause.
     ErrorResponse("Chrome failed to respond", request, response);
   }
 }
-
-bool PyUITestBase::ResetToDefaultTheme() {
-  return automation()->ResetToDefaultTheme();
-}