Revert 96556 - Let pyauto create an attached webdriver instance to manipulate web pages.

chrome/test/pyautolib/pyauto.py

 #!/usr/bin/python
 
 # Copyright (c) 2011 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.
 
 """PyAuto: Python Interface to Chromium's Automation Proxy.
 
 PyAuto uses swig to expose Automation Proxy interfaces to Python.
 For complete documentation on the functionality available,
@@ skipping 28 matching lines @@
 import stat
 import string
 import subprocess
 import sys
 import tempfile
 import time
 import types
 import unittest
 import urllib
 
-import pyauto_paths
-
 
 def _LocateBinDirs():
   """Setup a few dirs where we expect to find dependency libraries."""
-  deps_dirs = [
-      os.path.dirname(__file__),
-      pyauto_paths.GetThirdPartyDir(),
-      os.path.join(pyauto_paths.GetThirdPartyDir(), 'webdriver', 'python'),
+  script_dir = os.path.dirname(__file__)
+  chrome_src = os.path.join(script_dir, os.pardir, os.pardir, os.pardir)
+
+  bin_dirs = {
+      'linux2': [ os.path.join(chrome_src, 'out', 'Debug'),
+                  os.path.join(chrome_src, 'sconsbuild', 'Debug'),
+                  os.path.join(chrome_src, 'out', 'Release'),
+                  os.path.join(chrome_src, 'sconsbuild', 'Release')],
+      'linux3': [ os.path.join(chrome_src, 'out', 'Debug'),
+                  os.path.join(chrome_src, 'sconsbuild', 'Debug'),
+                  os.path.join(chrome_src, 'out', 'Release'),
+                  os.path.join(chrome_src, 'sconsbuild', 'Release')],
+      'darwin': [ os.path.join(chrome_src, 'xcodebuild', 'Debug'),
+                  os.path.join(chrome_src, 'xcodebuild', 'Release')],
+      'win32':  [ os.path.join(chrome_src, 'chrome', 'Debug'),
+                  os.path.join(chrome_src, 'build', 'Debug'),
+                  os.path.join(chrome_src, 'chrome', 'Release'),
+                  os.path.join(chrome_src, 'build', 'Release')],
+      'cygwin': [ os.path.join(chrome_src, 'chrome', 'Debug'),
+                  os.path.join(chrome_src, 'chrome', 'Release')],
+  }
+  deps_dirs = [ os.path.join(script_dir, os.pardir,
+                             os.pardir, os.pardir, 'third_party'),
+                script_dir,
   ]
-  sys.path += map(os.path.normpath, pyauto_paths.GetBuildDirs() + deps_dirs)
+  sys.path += map(os.path.normpath, bin_dirs.get(sys.platform, []) + deps_dirs)
 
 _LocateBinDirs()
 
 _PYAUTO_DOC_URL = 'http://dev.chromium.org/developers/testing/pyauto'
 
 try:
   import pyautolib
   # Needed so that all additional classes (like: FilePath, GURL) exposed by
   # swig interface get available in this module.
   from pyautolib import *
@@ skipping 10 matching lines @@
 import download_info
 import history_info
 import omnibox_info
 import plugins_info
 import prefs_info
 from pyauto_errors import JSONInterfaceError
 from pyauto_errors import NTPThumbnailNotShownError
 import pyauto_utils
 import simplejson as json  # found in third_party
 
-_CHROME_DRIVER_FACTORY = None
 _HTTP_SERVER = None
 _REMOTE_PROXY = None
 _OPTIONS = None
 
 
 class PyUITest(pyautolib.PyUITestBase, unittest.TestCase):
   """Base class for UI Test Cases in Python.
 
   A browser is created before executing each test, and is destroyed after
   each test irrespective of whether the test passed or failed.
@@ skipping 2705 matching lines @@
     Raises:
       pyauto_errors.JSONInterfaceError if the automation call returns an error.
     """
     cmd_dict = {
         'command': 'SetNTPMenuMode',
         'section': section,
         'turn_on': turn_on
     }
     return self._GetResultFromJSONRequest(cmd_dict)
 
-  def NewWebDriver(self):
-    """Returns a new remote WebDriver instance.
-
-    Returns:
-      selenium.webdriver.remote.webdriver.WebDriver instance
-    """
-    from chrome_driver_factory import ChromeDriverFactory
-    global _CHROME_DRIVER_FACTORY
-    if _CHROME_DRIVER_FACTORY is None:
-      _CHROME_DRIVER_FACTORY = ChromeDriverFactory()
-    return _CHROME_DRIVER_FACTORY.NewChromeDriver(self)
-
-  def CreateNewAutomationProvider(self, channel_id):
-    """Creates a new automation provider.
-
-    The provider will open a named channel in server mode.
-    Args:
-      channel_id: the channel_id to open the server channel with
-    """
-    cmd_dict = {
-        'command': 'CreateNewAutomationProvider',
-        'channel_id': channel_id
-    }
-    self._GetResultFromJSONRequest(cmd_dict)
-
   ## ChromeOS section
 
   def GetLoginInfo(self):
     """Returns information about login and screen locker state.
 
     This includes things like whether a user is logged in, the username
     of the logged in user, and whether the screen is locked.
 
     Returns:
       A dictionary.
@@ skipping 972 matching lines @@
     # the test cases, which is odd because our test cases depend on
     # initializtions like exitmanager, autorelease pool provided by the
     # suite. Forcibly delete the test cases before the suite.
     del self._tests
     pyautolib.PyUITestSuiteBase.__del__(self)
 
     global _HTTP_SERVER
     if _HTTP_SERVER:
       self._StopHTTPServer()
 
-    global _CHROME_DRIVER_FACTORY
-    if _CHROME_DRIVER_FACTORY is not None:
-      _CHROME_DRIVER_FACTORY.Stop()
-
   def _StartHTTPServer(self):
     """Start a local file server hosting data files over http://"""
     global _HTTP_SERVER
     assert not _HTTP_SERVER, 'HTTP Server already started'
     http_data_dir = _OPTIONS.http_data_dir
     http_server = pyautolib.TestServer(pyautolib.TestServer.TYPE_HTTP,
         pyautolib.FilePath(http_data_dir))
     assert http_server.Start(), 'Could not start http server'
     _HTTP_SERVER = http_server
     logging.debug('Started http server at "%s".' % http_data_dir)
@@ skipping 359 matching lines @@
     successful = result.wasSuccessful()
     if not successful:
       pyauto_tests_file = os.path.join(self.TestsDir(), self._tests_filename)
       print >>sys.stderr, 'Tests can be disabled by editing %s. ' \
                           'Ref: %s' % (pyauto_tests_file, _PYAUTO_DOC_URL)
     sys.exit(not successful)
 
 
 if __name__ == '__main__':
   Main()