Convert more PyAuto proxy 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/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
@@ skipping 83 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_);
 }
 
-bool PyUITestBase::ActivateTab(int tab_index, int window_index) {
-  scoped_refptr<BrowserProxy> browser_proxy = GetBrowserWindow(window_index);
-  return browser_proxy->BringToFront() && browser_proxy->ActivateTab(tab_index);
-}
-
 void PyUITestBase::SetDownloadShelfVisible(bool is_visible, int window_index) {
   scoped_refptr<BrowserProxy> browser_proxy = GetBrowserWindow(window_index);
   ASSERT_TRUE(browser_proxy.get());
   EXPECT_TRUE(browser_proxy->SetShelfVisible(is_visible));
 }
 
 bool PyUITestBase::IsDownloadShelfVisible(int window_index) {
   scoped_refptr<BrowserProxy> browser_proxy = GetBrowserWindow(window_index);
   EXPECT_TRUE(browser_proxy.get());
   if (!browser_proxy.get())
     return false;
   bool visible = false;
   EXPECT_TRUE(browser_proxy->IsShelfVisible(&visible));
   return visible;
 }
 
-int PyUITestBase::GetTabCount(int window_index) {
-  return UITestBase::GetTabCount(window_index);
-}
-
-GURL PyUITestBase::GetActiveTabURL(int window_index) {
-  return UITestBase::GetActiveTabURL(window_index);
-}
-
 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())
@@ skipping 253 matching lines @@
   // TODO(phadjan.jr): figure out a way to unambiguously report error.
   if (!browser_proxy.get())
     return cookie_val;
   scoped_refptr<TabProxy> tab_proxy = browser_proxy->GetTab(tab_index);
   EXPECT_TRUE(tab_proxy.get());
   if (!tab_proxy.get())
     return cookie_val;
   EXPECT_TRUE(tab_proxy->GetCookies(cookie_url, &cookie_val));
   return cookie_val;
 }