Remove SWIGged use of BrowserProxy and TabProxy from PyAuto tests.

chrome/test/functional/prefs.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 logging
 import os
 import shutil
 
 import pyauto_functional  # Must be imported before pyauto
@@ skipping 40 matching lines @@
     self.ActivateTab(1)
     self.assertEqual(url2, self.GetActiveTabURL().spec())
 
   def testNavigationStateOnSessionRestore(self):
     """Verify navigation state is preserved on session restore."""
     urls = ('http://www.google.com/',
             'http://news.google.com/',
             'http://dev.chromium.org/',)
     for url in urls:
       self.NavigateToURL(url)
-    tab = self.GetBrowserWindow(0).GetTab(0)
-    tab.GoBack()
+    self.TabGoBack()
     self.assertEqual(self.GetActiveTabURL().spec(), urls[-2])
     self.SetPrefs(pyauto.kRestoreOnStartup, 1)  # set pref to restore session
     self.RestartBrowser(clear_profile=False)
     # Verify that navigation state (forward/back state) is restored.
-    tab = self.GetBrowserWindow(0).GetTab(0)
-    tab.GoBack()
+    self.TabGoBack()
     self.assertEqual(self.GetActiveTabURL().spec(), urls[0])
     for i in (-2, -1):
       tab.GoForward()
       self.assertEqual(self.GetActiveTabURL().spec(), urls[i])
 
   def testSessionRestoreURLs(self):
     """Verify restore URLs preference."""
     url1 = self.GetFileURLForPath(os.path.join(self.DataDir(), 'title1.html'))
     url2 = self.GetFileURLForPath(os.path.join(self.DataDir(), 'title2.html'))
     # Set pref to restore given URLs on startup
@@ skipping 80 matching lines @@
         self.DataDir(), 'geolocation', 'geolocation_on_load.html'))
     self.assertEqual(3,  # default state
         self.GetPrefsInfo().Prefs(pyauto.kGeolocationDefaultContentSetting))
     self.NavigateToURL(url)
     self.assertTrue(self.WaitForInfobarCount(1))
     self.assertTrue(self.GetBrowserInfo()['windows'][0]['tabs'][0]['infobars'])
     # Disable geolocation
     self.SetPrefs(pyauto.kGeolocationDefaultContentSetting, 2)
     self.assertEqual(2,
         self.GetPrefsInfo().Prefs(pyauto.kGeolocationDefaultContentSetting))
-    self.GetBrowserWindow(0).GetTab(0).Reload()
+    self.ReloadTab()
     # Fails on Win7/Vista Chromium bots.  crbug.com/89000
     if (self.IsWin7() or self.IsWinVista()) and branding == 'Chromium':
       return
     behavior = self._driver.execute_async_script(
         'triggerGeoWithCallback(arguments[arguments.length - 1]);')
     self.assertEqual(
         behavior, Behaviors.BLOCK,
         msg='Behavior is "%s" when it should be BLOCKED.'  % behavior)
 
   def testUnderTheHoodPref(self):
@@ skipping 163 matching lines @@
     self.assertTrue(
         self._driver.execute_script(
             'return doesQueryConformsToProtocol("%s", "%s")'
             % (asked_handler_dict['query_key'],
                asked_handler_dict['query_value'])),
         msg='Protocol did not register correctly.')
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()