Remove SWIGged use of BrowserProxy and TabProxy from PyAuto tests.

chrome/test/functional/perf.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.
 
 """Basic pyauto performance tests.
 
 For tests that need to be run for multiple iterations (e.g., so that average
 and standard deviation values can be reported), the default number of iterations
 run for each of these tests is specified by |_DEFAULT_NUM_ITERATIONS|.
@@ skipping 575 matching lines @@
         # Ignore the first iteration.
         if iteration:
           timings.append(elapsed_time)
           logging.info('Iteration %d of %d: %f milliseconds', iteration,
                        self._num_iterations, elapsed_time)
       self.assertTrue(self._timeout_count <= self._max_timeout_count,
                       msg='Test exceeded automation timeout threshold.')
       self.assertEqual(1 + num_tabs, self.GetTabCount(),
                        msg='Did not open %d new tab(s).' % num_tabs)
       for _ in range(num_tabs):
-        self.GetBrowserWindow(0).GetTab(1).Close(True)
+        self.CloseTab(tab_index=1)
 
     self._PrintSummaryResults(description, timings, 'milliseconds', graph_name)
 
   def _LoginToGoogleAccount(self, account_key='test_google_account'):
     """Logs in to a test Google account.
 
     Args:
       account_key: The string key associated with the test account login
           credentials to use.
     """
@@ skipping 124 matching lines @@
           window.domAutomationController.send(JSON.stringify(result));
       """
       results = eval(self.ExecuteJavascript(js_get_results, tab_index=1))
       score_pattern = '(\w+): (\d+)'
       final_score = re.search(score_pattern, results['final_score']).group(2)
       result_dict = {'final_score': int(final_score)}
       for match in re.finditer(score_pattern, results['all_results']):
         benchmark_name = match.group(1)
         benchmark_score = match.group(2)
         result_dict[benchmark_name] = int(benchmark_score)
-      self.GetBrowserWindow(0).GetTab(1).Close(True)
+      self.CloseTab(tab_index=1)
       return result_dict
 
     timings = {}
     for iteration in xrange(self._num_iterations + 1):
       result_dict = _RunBenchmarkOnce(url)
       # Ignore the first iteration.
       if iteration:
         for key, val in result_dict.items():
           timings.setdefault(key, []).append(val)
         logging.info('Iteration %d of %d:\n%s', iteration, self._num_iterations,
@@ skipping 678 matching lines @@
         # Measures performance using the first demo.
         avg_fps = self._MeasureFpsOverTime()
         status1 = self._GetStdAvgAndCompare(avg_fps, desc_array[index],
                                             ref_dict)
       # Measures performance using the second demo.
       self.NavigateToURL(url_array[index + 1])
       avg_fps = self._MeasureFpsOverTime()
       status2 = self._GetStdAvgAndCompare(avg_fps, desc_array[index + 1],
                                           ref_dict)
       # Go Back to previous demo
-      self.GetBrowserWindow(0).GetTab(0).GoBack();
+      self.TabGoBack()
       # Measures performance for first demo when moved back
       avg_fps = self._MeasureFpsOverTime()
       status3 = self._GetStdAvgAndCompare(
           avg_fps, desc_array[index] + '_backward',
           ref_dict)
       # Go Forward to previous demo
-      self.GetBrowserWindow(0).GetTab(0).GoForward();
+      self.TabGoForward()
       # Measures performance for second demo when moved forward
       avg_fps = self._MeasureFpsOverTime()
       status4 = self._GetStdAvgAndCompare(
           avg_fps, desc_array[index + 1] + '_forward',
           ref_dict)
       if not all([status1, status2, status3, status4]):
         all_demos_passed = False
     self.assertTrue(
         all_demos_passed,
         msg='One or more demos failed to yield an acceptable FPS value')
@@ skipping 256 matching lines @@
     # Get the scroll test results from the webpage.
     results_js = """
       var __stringify = JSON.stringify || JSON.encode;
       window.domAutomationController.send(__stringify({
           'first_paint_time': chrome.loadTimes().firstPaintTime -
                               chrome.loadTimes().requestTime,
           'frame_times': __frame_times,
       }));
     """
     results = eval(self.ExecuteJavascript(results_js, tab_index=1))
-    self.GetBrowserWindow(0).GetTab(1).Close(True)
+    self.CloseTab(tab_index=1)
     return ScrollResults(results['first_paint_time'], results['frame_times'])
 
   def RunScrollTest(self, url, description, graph_name, setup_js=''):
     """Runs a scroll performance test on the specified webpage.
 
     Args:
       url: The string url for the webpage on which to run the scroll test.
       description: A string description for the particular test being run.
       graph_name: A string name for the performance graph associated with this
           test.  Only used on Chrome desktop.
@@ skipping 615 matching lines @@
 
     for iteration_num in xrange(2):
       for site in tabs:
         self.AppendTab(pyauto.GURL(site))
 
       self._RecordMemoryStats(description,
                               '%dTabs%d' % (len(tabs), iteration_num + 1),
                               duration)
 
       for _ in xrange(len(tabs)):
-        self.GetBrowserWindow(0).GetTab(1).Close(True)
+        self.CloseTab(tab_index=1)
 
       self._RecordMemoryStats(description, '0Tabs%d' % (iteration_num + 1),
                               duration)
 
   def testOpenCloseTabsControl(self):
     """Measures memory usage when opening/closing tabs to about:blank."""
     tabs = ['about:blank'] * 10
     self._RunTest(tabs, 'MemCtrl', 15)
 
   def testOpenCloseTabsLiveSites(self):
@@ skipping 241 matching lines @@
     """Identifies the port number to which the server is currently bound.
 
     Returns:
       The numeric port number to which the server is currently bound.
     """
     return self._server.server_address[1]
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()