Remove SWIGged use of BrowserProxy and TabProxy from PyAuto tests.

chrome/test/functional/media/worker_thread.py

 # 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.
 
 """Worker thread base class.
 
 Worker threads are used to run multiple PyUITests simultaneously. They
 synchronize calls to the browser."""
 
 import itertools
@@ skipping 87 matching lines @@
     while True:
       task = self.__tasks.get()
       # Check for magic exit values.
       if task is None:
         break
       # Make the test URL unique so we can figure out our tab index later.
       unique_url = '%s?%d' % (self.__url, WorkerThread._task_id.next())
       self.AppendTab(unique_url)
       if not self.RunTask(unique_url, task):
         self.failures += 1
-      self.CloseTab(unique_url)
+      self.CloseTabByURL(unique_url)
       self.__tasks.task_done()
 
   def __FindTabLocked(self, url):
     """Returns the tab index for the tab belonging to this url.
 
     __lock must be owned by caller.
     """
     if url is None:
       return 0
     for tab in self.__pyauto.GetBrowserInfo()['windows'][0]['tabs']:
@@ skipping 12 matching lines @@
   @synchronized
   def AppendTab(self, url):
     self.__pyauto.AppendTab(pyauto.GURL(url))
 
   @synchronized
   def CallJavascriptFunc(self, fun_name, fun_args=[], url=None):
     return self.__pyauto.CallJavascriptFunc(fun_name, fun_args,
                                             tab_index=self.__FindTabLocked(url))
 
   @synchronized
-  def CloseTab(self, url):
+  def CloseTabByURL(self, url):
     """Closes the tab with the given url."""
-    return self.__pyauto.GetBrowserWindow(0).GetTab(
-        self.__FindTabLocked(url)).Close(True)
+    self.CloseTab(tab_index=self.__FindTabLocked(url))
 
   @synchronized
   def GetDOMValue(self, name, url=None):
     return self.__pyauto.GetDOMValue(name, tab_index=self.__FindTabLocked(url))
 
   def WaitUntil(self, *args, **kwargs):
     """We do not need to lock WaitUntil since it does not call into Chrome.
 
     Ensure that the function passed in the args is thread safe.
     """
     return self.__pyauto.WaitUntil(*args, **kwargs)