| Index: chrome/test/webdriver/commands/create_session.cc
|
| diff --git a/chrome/test/webdriver/commands/create_session.cc b/chrome/test/webdriver/commands/create_session.cc
|
| index adc8d28d4e955d92560679b775700e2126131d1c..14ecbf5f514f30ef64da48c0ff03413424419f48 100644
|
| --- a/chrome/test/webdriver/commands/create_session.cc
|
| +++ b/chrome/test/webdriver/commands/create_session.cc
|
| @@ -76,7 +76,7 @@ void CreateSession::ExecutePost(Response* const response) {
|
| Automation::BrowserOptions browser_options;
|
| FilePath::StringType path;
|
| if (capabilities->GetStringWithoutPathExpansion("chrome.binary", &path))
|
| - browser_options.cmdline = CommandLine(FilePath(path));
|
| + browser_options.command = CommandLine(FilePath(path));
|
|
|
| ListValue* switches = NULL;
|
| const char* kCustomSwitchesKey = "chrome.switches";
|
| @@ -97,11 +97,11 @@ void CreateSession::ExecutePost(Response* const response) {
|
| kBadRequest, "Custom switch is not a string"));
|
| return;
|
| }
|
| - browser_options.cmdline.AppendSwitchNative(
|
| + browser_options.command.AppendSwitchNative(
|
| switch_string.substr(0, separator_index),
|
| switch_string_native.substr(separator_index + 1));
|
| } else {
|
| - browser_options.cmdline.AppendSwitch(switch_string);
|
| + browser_options.command.AppendSwitch(switch_string);
|
| }
|
| }
|
| } else if (capabilities->HasKey(kCustomSwitchesKey)) {
|
| @@ -130,8 +130,6 @@ void CreateSession::ExecutePost(Response* const response) {
|
| "chrome.channel", &browser_options.channel_id);
|
|
|
| ScopedTempDir temp_profile_dir;
|
| - FilePath temp_user_data_dir;
|
| -
|
| std::string base64_profile;
|
| if (capabilities->GetStringWithoutPathExpansion("chrome.profile",
|
| &base64_profile)) {
|
| @@ -148,8 +146,9 @@ void CreateSession::ExecutePost(Response* const response) {
|
| return;
|
| }
|
|
|
| - temp_user_data_dir = temp_profile_dir.path().AppendASCII("user_data_dir");
|
| - if (!Unzip(temp_profile_zip, temp_user_data_dir)) {
|
| + browser_options.user_data_dir =
|
| + temp_profile_dir.path().AppendASCII("user_data_dir");
|
| + if (!Unzip(temp_profile_zip, browser_options.user_data_dir)) {
|
| response->SetError(new Error(
|
| kBadRequest, "Could not unarchive provided user profile"));
|
| return;
|
|
|