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

chrome/test/webdriver/session.cc

Index: chrome/test/webdriver/session.cc
===================================================================
--- chrome/test/webdriver/session.cc	(revision 96579)
+++ chrome/test/webdriver/session.cc	(working copy)
@@ -77,7 +77,9 @@
   SessionManager::GetInstance()->Remove(id_);
 }
 
-Error* Session::Init(const Automation::BrowserOptions& options) {
+Error* Session::Init(const FilePath& browser_exe,
+                     const FilePath& user_data_dir,
+                     const CommandLine& options) {
   if (!thread_.Start()) {
     delete this;
     return new Error(kUnknownError, "Cannot start session thread");
@@ -87,6 +89,8 @@
   RunSessionTask(NewRunnableMethod(
       this,
       &Session::InitOnSessionThread,
+      browser_exe,
+      user_data_dir,
       options,
       &error));
   if (error)
@@ -1120,11 +1124,18 @@
   done_event->Signal();
 }
 
-
-void Session::InitOnSessionThread(const Automation::BrowserOptions& options,
+void Session::InitOnSessionThread(const FilePath& browser_exe,
+                                  const FilePath& user_data_dir,
+                                  const CommandLine& options,
                                   Error** error) {
   automation_.reset(new Automation());
-  automation_->Init(options, error);
+  if (browser_exe.empty()) {
+    automation_->Init(options, user_data_dir, error);
+  } else {
+    automation_->InitWithBrowserPath(
+        browser_exe, user_data_dir, options, error);
+  }
+
   if (*error)
     return;