Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4111)

Unified Diff: chrome/test/webdriver/session.cc

Issue 7523060: Let pyauto create an attached webdriver instance to manipulate web pages. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase (ProxyLauncher third option no longer required) Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/webdriver/session.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/webdriver/session.cc
diff --git a/chrome/test/webdriver/session.cc b/chrome/test/webdriver/session.cc
index c8771522befc1ee573c8d2e9499015f61593ac84..9afee5ce989729c199040670bec409c07e5c6bab 100644
--- a/chrome/test/webdriver/session.cc
+++ b/chrome/test/webdriver/session.cc
@@ -77,9 +77,7 @@ Session::~Session() {
SessionManager::GetInstance()->Remove(id_);
}
-Error* Session::Init(const FilePath& browser_exe,
- const FilePath& user_data_dir,
- const CommandLine& options) {
+Error* Session::Init(const Automation::BrowserOptions& options) {
if (!thread_.Start()) {
delete this;
return new Error(kUnknownError, "Cannot start session thread");
@@ -89,8 +87,6 @@ Error* Session::Init(const FilePath& browser_exe,
RunSessionTask(NewRunnableMethod(
this,
&Session::InitOnSessionThread,
- browser_exe,
- user_data_dir,
options,
&error));
if (error)
@@ -1124,18 +1120,11 @@ void Session::RunSessionTaskOnSessionThread(Task* task,
done_event->Signal();
}
-void Session::InitOnSessionThread(const FilePath& browser_exe,
- const FilePath& user_data_dir,
- const CommandLine& options,
+
+void Session::InitOnSessionThread(const Automation::BrowserOptions& options,
Error** error) {
automation_.reset(new Automation());
- if (browser_exe.empty()) {
- automation_->Init(options, user_data_dir, error);
- } else {
- automation_->InitWithBrowserPath(
- browser_exe, user_data_dir, options, error);
- }
-
+ automation_->Init(options, error);
if (*error)
return;
« no previous file with comments | « chrome/test/webdriver/session.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698