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

chrome/test/webdriver/automation.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_AUTOMATION_H_
 #define CHROME_TEST_WEBDRIVER_AUTOMATION_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
-#include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/task.h"
 #include "chrome/common/automation_constants.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 
 class AutomationProxy;
+class CommandLine;
+class FilePath;
 class ProxyLauncher;
 struct WebKeyEvent;
 
 namespace base {
 class DictionaryValue;
 class ListValue;
 }
 
 namespace gfx {
 class Point;
 }
 
 namespace webdriver {
 
 class Error;
 class FramePath;
 
 // Creates and controls the Chrome instance.
 // This class should be created and accessed on a single thread.
 // Note: All member functions are void because they are invoked
 // by posting a task from NewRunnableMethod.
 class Automation {
  public:
-  struct BrowserOptions {
-    BrowserOptions();
-    ~BrowserOptions();
-
-    CommandLine cmdline;
-    FilePath user_data_dir;
-    std::string channel_id;
-  };
-
   Automation();
   virtual ~Automation();
 
+  // Creates a browser, using the specified |browser_exe| and |user_data_dir|.
+  void InitWithBrowserPath(const FilePath& browser_exe,
+                           const FilePath& user_data_dir,
+                           const CommandLine& options,
+                           Error** error);
+
   // Start the system's default Chrome binary.
-  void Init(const BrowserOptions& options, Error** error);
+  void Init(const CommandLine& options,
+            const FilePath& user_data_dir,
+            Error** error);
 
   // Terminates this session and disconnects its automation proxy. After
   // invoking this method, the Automation can safely be deleted.
   void Terminate();
 
   // Executes the given |script| in the specified frame of the current
   // tab. |result| will be set to the JSON result. Returns true on success.
   void ExecuteScript(int tab_id,
                      const FramePath& frame_path,
                      const std::string& script,
@@ skipping 101 matching lines @@
   scoped_ptr<ProxyLauncher> launcher_;
 
   DISALLOW_COPY_AND_ASSIGN(Automation);
 };
 
 }  // namespace webdriver
 
 DISABLE_RUNNABLE_METHOD_REFCOUNT(webdriver::Automation);
 
 #endif  // CHROME_TEST_WEBDRIVER_AUTOMATION_H_