Remove SWIGged use of BrowserProxy and TabProxy from PyAuto tests.

chrome/test/functional/history.py

 #!/usr/bin/env python
 # 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.
 
 import os
 import time
 
 import pyauto_functional  # Must be imported before pyauto
 import pyauto
@@ skipping 137 matching lines @@
     test_utils.RemoveDownloadedTestFile(self, zip_file)
     # We shouldn't have any history
     history = self.GetHistoryInfo().History()
     self.assertEqual(0, len(history))
 
   def testRedirectHistory(self):
     """HTTP meta-refresh redirects should have separate history entries."""
     assert not self.GetHistoryInfo().History(), 'Expecting clean history.'
     file_url = self.GetFileURLForDataPath('History', 'redirector.html')
     landing_url = self.GetFileURLForDataPath('History', 'landing.html')
-    tab = self.GetBrowserWindow(0).GetTab(0)
-    tab.NavigateToURLBlockUntilNavigationsComplete(pyauto.GURL(file_url), 2)
+    self.NavigateToURL(file_url, 0, 0, navigation_count=2)
     self.assertEqual(landing_url, self.GetActiveTabURL().spec())
     # We should have two history items
     history = self.GetHistoryInfo().History()
     self.assertEqual(2, len(history))
     self.assertEqual(landing_url, history[0]['url'])
 
   def testForge(self):
     """Brief test of forging history items.
 
     Note the history system can tweak values (e.g. lower-case a URL or
@@ skipping 94 matching lines @@
     """Verify that reloading a page brings it to top of history list."""
     url1 = self.GetFileURLForDataPath('title2.html')
     title1 = 'Title Of Awesomeness'
     self._NavigateAndCheckHistory(title1, 'title2.html', 1)
 
     url2 = self.GetFileURLForDataPath('title3.html')
     title2 = 'Title Of More Awesomeness'
     self.AppendTab(pyauto.GURL(url2))
     self._CheckHistory(title2, url2, 2)
 
-    self.ActivateTab(0)
-    self.ReloadActiveTab()
+    self.ReloadTab()
     self._CheckHistory(title1, url1, 2)
 
   def testBackForwardBringPageToTop(self):
     """Verify that back/forward brings current page to top of history list."""
     url1 = self.GetFileURLForDataPath('title2.html')
     title1 = 'Title Of Awesomeness'
     self._NavigateAndCheckHistory(title1, 'title2.html', 1)
 
     url2 = self.GetFileURLForDataPath('title3.html')
     title2 = 'Title Of More Awesomeness'
     self._NavigateAndCheckHistory(title2, 'title3.html', 2)
 
-    tab = self.GetBrowserWindow(0).GetTab(0)
-    tab.GoBack()
+    self.TabGoBack()
     self._CheckHistory(title1, url1, 2)
-    tab.GoForward()
+    self.TabGoForward()
     self._CheckHistory(title2, url2, 2)
 
   def testAppendTabAddPage(self):
     """Verify that opening a new tab adds that page to history."""
     self._NavigateAndCheckHistory('Title Of Awesomeness', 'title2.html', 1)
 
     url2 = self.GetFileURLForDataPath('title3.html')
     title2 = 'Title Of More Awesomeness'
     self.AppendTab(pyauto.GURL(url2))
     self._CheckHistory(title2, url2, 2)
@@ skipping 50 matching lines @@
         history_url, tab1url,
         msg='Tab 1: History page not expected.')
 
     self.assertTrue(
         self.WaitUntil(lambda: 'History' == self.GetActiveTabTitle()),
         msg='History page is not activated.')
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()