summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchrisgao@chromium.org <chrisgao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-19 19:22:30 +0000
committerchrisgao@chromium.org <chrisgao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-19 19:22:30 +0000
commit715b111abe938b852701cc2bde53ffd24082b2d0 (patch)
tree8a1ed704b81da4a2414babdaf1f0f90c5b72609c
parent268d3cc4d0823ba204651dc7faa2dbdd65394119 (diff)
downloadchromium_src-715b111abe938b852701cc2bde53ffd24082b2d0.zip
chromium_src-715b111abe938b852701cc2bde53ffd24082b2d0.tar.gz
chromium_src-715b111abe938b852701cc2bde53ffd24082b2d0.tar.bz2
[chromedriver] Fix parameter issue of cmd newSession.
NOTRY=true Review URL: https://chromiumcodereview.appspot.com/11644023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173971 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/test/chromedriver/chromedriver.py2
-rw-r--r--chrome/test/chromedriver/commands.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/test/chromedriver/chromedriver.py b/chrome/test/chromedriver/chromedriver.py
index fb52ffe..acb6445 100644
--- a/chrome/test/chromedriver/chromedriver.py
+++ b/chrome/test/chromedriver/chromedriver.py
@@ -37,7 +37,7 @@ class ChromeDriver(object):
else:
params = {
'desiredCapabilities': {
- 'chrome': {
+ 'chromeOptions': {
'binary': chrome_binary
}
}
diff --git a/chrome/test/chromedriver/commands.cc b/chrome/test/chromedriver/commands.cc
index e943038..f90388a 100644
--- a/chrome/test/chromedriver/commands.cc
+++ b/chrome/test/chromedriver/commands.cc
@@ -26,7 +26,7 @@ Status ExecuteNewSession(
scoped_ptr<Chrome> chrome;
FilePath::StringType path_str;
FilePath chrome_exe;
- if (params.GetString("desiredCapabilities.chrome.binary", &path_str)) {
+ if (params.GetString("desiredCapabilities.chromeOptions.binary", &path_str)) {
chrome_exe = FilePath(path_str);
if (!file_util::PathExists(chrome_exe)) {
std::string message = base::StringPrintf(