diff options
| author | kkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-30 18:16:44 +0000 |
|---|---|---|
| committer | kkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-30 18:16:44 +0000 |
| commit | c07980002eefd0f4ba80fa4042fa52af2801353d (patch) | |
| tree | 2bfe2e8f3649a2d9dcaae344058a344d79fa7750 /chrome/test/chromedriver/client/chromedriver.py | |
| parent | c069e4bd5fce173cb58c585e0e71bb1c8e6197a1 (diff) | |
| download | chromium_src-c07980002eefd0f4ba80fa4042fa52af2801353d.zip chromium_src-c07980002eefd0f4ba80fa4042fa52af2801353d.tar.gz chromium_src-c07980002eefd0f4ba80fa4042fa52af2801353d.tar.bz2 | |
[chromedriver] Use single path for handling android/desktop args.
-also allow extensions to be loaded via --load-extension
-change useExistingBrowser to debuggerAddress
BUG=chromedriver:488
Review URL: https://chromiumcodereview.appspot.com/23643005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@220610 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/chromedriver/client/chromedriver.py')
| -rw-r--r-- | chrome/test/chromedriver/client/chromedriver.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/test/chromedriver/client/chromedriver.py b/chrome/test/chromedriver/client/chromedriver.py index ae2ecd8..3d7380b 100644 --- a/chrome/test/chromedriver/client/chromedriver.py +++ b/chrome/test/chromedriver/client/chromedriver.py @@ -62,7 +62,7 @@ class ChromeDriver(object): def __init__(self, server_url, chrome_binary=None, android_package=None, chrome_switches=None, chrome_extensions=None, - chrome_log_path=None, chrome_existing_browser=None): + chrome_log_path=None, debugger_address=None): self._executor = command_executor.CommandExecutor(server_url) options = {} @@ -83,9 +83,9 @@ class ChromeDriver(object): assert type(chrome_log_path) is str options['logPath'] = chrome_log_path - if chrome_existing_browser: - assert type(chrome_existing_browser) is str - options['useExistingBrowser'] = chrome_existing_browser + if debugger_address: + assert type(debugger_address) is str + options['debuggerAddress'] = debugger_address params = { 'desiredCapabilities': { |