Revert "Add named testing interface."

chrome/test/ui/ui_test.h

Index: chrome/test/ui/ui_test.h
diff --git a/chrome/test/ui/ui_test.h b/chrome/test/ui/ui_test.h
index 3305cc5c3666d280431d6e981a118b0d6381d3dd..ced9f348f8990fa01ff268f7901286611f598787 100644
--- a/chrome/test/ui/ui_test.h
+++ b/chrome/test/ui/ui_test.h
@@ -38,7 +38,6 @@ class BrowserProxy;
 class DictionaryValue;
 class FilePath;
 class GURL;
-class ProxyLauncher;
 class ScopedTempDir;
 class TabProxy;
 
@@ -69,21 +68,14 @@ class UITestBase {
  public:
   // ********* Utility functions *********
 
-  // Launches the browser only.
-  void LaunchBrowser();
-
-  // Launches the browser and IPC testing connection in server mode.
+  // Launches the browser and IPC testing server.
   void LaunchBrowserAndServer();
 
-  // Launches the IPC testing connection in client mode,
-  // which then attempts to connect to a browser.
-  void ConnectToRunningBrowser();
-
   // Only for pyauto.
   void set_command_execution_timeout_ms(int timeout);
 
-  // Overridable so that derived classes can provide their own ProxyLauncher.
-  virtual ProxyLauncher* CreateProxyLauncher();
+  // Overridable so that derived classes can provide their own AutomationProxy.
+  virtual AutomationProxy* CreateAutomationProxy(int execution_timeout);
 
   // Closes the browser and IPC testing server.
   void CloseBrowserAndServer();
@@ -110,7 +102,7 @@ class UITestBase {
   // Terminates the browser, simulates end of session.
   void TerminateBrowser();
 
-  // Tells the browser to navigate to the given URL in the active tab
+  // Tells the browser to navigato to the givne URL in the active tab
   // of the first app window.
   // Does not wait for the navigation to complete to return.
   void NavigateToURLAsync(const GURL& url);
@@ -369,8 +361,8 @@ class UITestBase {
 
  protected:
   AutomationProxy* automation() {
-    EXPECT_TRUE(automation_proxy_.get());
-    return automation_proxy_.get();
+    EXPECT_TRUE(server_.get());
+    return server_.get();
   }
 
   virtual bool ShouldFilterInet() {
@@ -420,7 +412,6 @@ class UITestBase {
                                         // id on the command line? Default is
                                         // true.
   bool enable_file_cookies_;            // Enable file cookies, default is true.
-  scoped_ptr<ProxyLauncher> launcher_;  // Launches browser and AutomationProxy.
   ProfileType profile_type_;            // Are we using a profile with a
                                         // complex theme?
   FilePath websocket_pid_file_;         // PID file for websocket server.
@@ -428,8 +419,6 @@ class UITestBase {
                                         // the browser. Used in ShutdownTest.
 
  private:
-  void WaitForBrowserLaunch();
-
   bool LaunchBrowserHelper(const CommandLine& arguments,
                            bool wait,
                            base::ProcessHandle* process);
@@ -461,7 +450,7 @@ class UITestBase {
   static std::string js_flags_;         // Flags passed to the JS engine.
   static std::string log_level_;        // Logging level.
 
-  scoped_ptr<AutomationProxy> automation_proxy_;
+  scoped_ptr<AutomationProxy> server_;
 
   std::string ui_test_name_;
 
@@ -479,7 +468,7 @@ class UITest : public UITestBase, public PlatformTest {
   virtual void SetUp();
   virtual void TearDown();
 
-  virtual ProxyLauncher* CreateProxyLauncher();
+  virtual AutomationProxy* CreateAutomationProxy(int execution_timeout);
 
   // Synchronously launches local http server normally used to run LayoutTests.
   void StartHttpServer(const FilePath& root_directory);