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

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 81 matching lines @@
   // Clear the homepage because some of the pyauto tests don't work correctly
   // if a URL argument is passed.
   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::NavigateToURL(const char* url_string) {
-  GURL url(url_string);
-  UITestBase::NavigateToURL(url);
-}
-
-void PyUITestBase::NavigateToURL(const char* url_string, int window_index) {
-  GURL url(url_string);
-  UITestBase::NavigateToURL(url, window_index);
-}
-
-void PyUITestBase::NavigateToURL(
-    const char* url_string, int window_index, int tab_index) {
-  GURL url(url_string);
-  UITestBase::NavigateToURL(url, window_index, tab_index);
-}
-
-void PyUITestBase::ReloadActiveTab(int window_index) {
-  scoped_refptr<TabProxy> tab_proxy(GetActiveTab());
-  ASSERT_TRUE(tab_proxy.get());
-  ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, tab_proxy->Reload());
-}
-
-bool PyUITestBase::AppendTab(const GURL& tab_url, int window_index) {
-  scoped_refptr<BrowserProxy> browser_proxy = GetBrowserWindow(window_index);
-  return browser_proxy->AppendTab(tab_url);
 }
 
 bool PyUITestBase::ApplyAccelerator(int id, int window_index) {
   scoped_refptr<BrowserProxy> browser_proxy = GetBrowserWindow(window_index);
   return browser_proxy->ApplyAccelerator(id);
 }
 
 bool PyUITestBase::RunCommand(int browser_command, int window_index) {
   scoped_refptr<BrowserProxy> browser_proxy = GetBrowserWindow(window_index);
   EXPECT_TRUE(browser_proxy.get());
@@ skipping 306 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;
 }