Remove SWIGged use of BrowserProxy and TabProxy from PyAuto tests.

chrome/test/functional/ntp.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 copy
 import os
 
 import pyauto_functional  # Must be imported before pyauto
 import pyauto
@@ skipping 161 matching lines @@
     self.assertEqual(self.PAGES[0]['title'],
                      self.GetNTPThumbnails()[0]['title'])
     self.ExecuteJavascript('window.domAutomationController.send(' +
                            'document.title = "new title")')
     self.assertEqual('new title', self.GetNTPThumbnails()[0]['title'])
 
   def testCloseOneTab(self):
     """Tests that closing a tab populates the recently closed list"""
     self.RemoveNTPDefaultThumbnails()
     self.AppendTab(pyauto.GURL(self.PAGES[1]['url']))
-    self.GetBrowserWindow(0).GetTab(1).Close(True)
+    self.CloseTab(tab_index=1)
     self.assertEqual(self.PAGES[1]['url'],
                      self.GetNTPRecentlyClosed()[0]['url'])
     self.assertEqual(self.PAGES[1]['title'],
                      self.GetNTPRecentlyClosed()[0]['title'])
 
   def testCloseOneWindow(self):
     """Tests that closing a window populates the recently closed list"""
     self.RemoveNTPDefaultThumbnails()
     self.OpenNewBrowserWindow(True)
     self.NavigateToURL(self.PAGES[0]['url'], 1, 0)
     self.AppendTab(pyauto.GURL(self.PAGES[1]['url']), 1)
     self.CloseBrowserWindow(1)
     expected = [{ u'type': u'window',
                   u'tabs': [
                   { u'type': u'tab',
                     u'url': self.PAGES[0]['url'],
                     u'direction': u'ltr' },
                   { u'type': u'tab',
                     u'url': self.PAGES[1]['url']}]
                 }]
     self.assertEquals(expected, test_utils.StripUnmatchedKeys(
         self.GetNTPRecentlyClosed(), expected))
 
   def testCloseMultipleTabs(self):
     """Tests closing multiple tabs populates the Recently Closed section in
     order"""
     self.RemoveNTPDefaultThumbnails()
     self.AppendTab(pyauto.GURL(self.PAGES[0]['url']))
     self.AppendTab(pyauto.GURL(self.PAGES[1]['url']))
-    self.GetBrowserWindow(0).GetTab(2).Close(True)
-    self.GetBrowserWindow(0).GetTab(1).Close(True)
+    self.CloseTab(tab_index=2)
+    self.CloseTab(tab_index=1)
     expected = [{ u'type': u'tab',
                   u'url': self.PAGES[0]['url']
                 },
                 { u'type': u'tab',
                   u'url': self.PAGES[1]['url']
                 }]
     self.assertEquals(expected, test_utils.StripUnmatchedKeys(
         self.GetNTPRecentlyClosed(), expected))
 
   def testCloseWindowWithOneTab(self):
@@ skipping 39 matching lines @@
     self.assertEquals(expected, test_utils.StripUnmatchedKeys(
         self.GetNTPRecentlyClosed(), expected))
 
   def testRecentlyClosedIncognito(self):
     """Tests that we don't record closure of Incognito tabs or windows"""
     #self.RemoveNTPDefaultThumbnails()
     self.RunCommand(pyauto.IDC_NEW_INCOGNITO_WINDOW)
     self.NavigateToURL(self.PAGES[0]['url'], 1, 0)
     self.AppendTab(pyauto.GURL(self.PAGES[0]['url']), 1)
     self.AppendTab(pyauto.GURL(self.PAGES[1]['url']), 1)
-    self.GetBrowserWindow(1).GetTab(0).Close(True)
+    self.CloseTab(windex=1)
     self.assertFalse(self.GetNTPRecentlyClosed())
     self.CloseBrowserWindow(1)
     self.assertFalse(self.GetNTPRecentlyClosed())
 
   def _VerifyAppInfo(self, actual_info, expected_info):
     """Ensures that the actual app info contains the expected app info.
 
     This method assumes that both the actual and expected information for each
     app contains at least the 'title' attribute.  Both sets of info are
     considered to match if the actual info contains at least the specified
@@ skipping 180 matching lines @@
     info = self.GetBrowserInfo()
     self.assertTrue(len(info['windows']) == 2,
                     msg='A second window does not exist.')
     actual_tab_url = info['windows'][1]['tabs'][0]['url']
     expected_app_url_start = 'chrome-extension://' + installed_app_id
     self.assertTrue(actual_tab_url.startswith(expected_app_url_start),
                     msg='The app was not launched in the new window.')
 
 if __name__ == '__main__':
   pyauto_functional.Main()