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

chrome/test/webdriver/session.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_TEST_WEBDRIVER_SESSION_H_
 #define CHROME_TEST_WEBDRIVER_SESSION_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 61 matching lines @@
 
   // Removes this |Session| from the |SessionManager|.
   ~Session();
 
   // Starts the session thread and a new browser, using the exe found at
   // |browser_exe| and duplicating the provided |user_data_dir|.
   // If |browser_exe| is empty, it will search in all the default locations.
   // It |user_data_dir| is empty, it will use a temporary dir.
   // Returns true on success. On failure, the session will delete
   // itself and return an error code.
-  Error* Init(const Automation::BrowserOptions& options);
+  Error* Init(const FilePath& browser_exe,
+              const FilePath& user_data_dir,
+              const CommandLine& options);
 
   // Should be called before executing a command. Performs necessary waits
   // and frame switching.
   Error* BeforeExecuteCommand();
 
   // Terminates this session and deletes itself.
   void Terminate();
 
   // Executes the given |script| in the context of the given frame.
   // The |script| should be in the form of a function body
@@ skipping 227 matching lines @@
   Error* GetBrowserConnectionState(bool* online);
 
   // Gets the status of the application cache.
   Error* GetAppCacheStatus(int* status);
 
  private:
   void RunSessionTask(Task* task);
   void RunSessionTaskOnSessionThread(
       Task* task,
       base::WaitableEvent* done_event);
-  void InitOnSessionThread(const Automation::BrowserOptions& options,
+  void InitOnSessionThread(const FilePath& browser_exe,
+                           const FilePath& user_data_dir,
+                           const CommandLine& options,
                            Error** error);
   void TerminateOnSessionThread();
 
   // Executes the given |script| in the context of the given frame.
   // Waits for script to finish and parses the response.
   // The caller is responsible for the script result |value|.
   Error* ExecuteScriptAndParseResponse(const FrameId& frame_id,
                                        const std::string& script,
                                        base::Value** value);
 
@@ skipping 51 matching lines @@
   Options options_;
 
   DISALLOW_COPY_AND_ASSIGN(Session);
 };
 
 }  // namespace webdriver
 
 DISABLE_RUNNABLE_METHOD_REFCOUNT(webdriver::Session);
 
 #endif  // CHROME_TEST_WEBDRIVER_SESSION_H_