Revert 66350 - Add named testing interface. This allows you to connect to a p...

chrome/test/automation/automation_proxy_uitest.cc

Index: chrome/test/automation/automation_proxy_uitest.cc
===================================================================
--- chrome/test/automation/automation_proxy_uitest.cc	(revision 66367)
+++ chrome/test/automation/automation_proxy_uitest.cc	(working copy)
@@ -29,7 +29,6 @@
 #include "chrome/test/automation/autocomplete_edit_proxy.h"
 #include "chrome/test/automation/automation_proxy_uitest.h"
 #include "chrome/test/automation/browser_proxy.h"
-#include "chrome/test/automation/proxy_launcher.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui_test_utils.h"
@@ -48,22 +47,6 @@
 using testing::StrEq;
 using testing::_;
 
-// Replace the default automation proxy with our mock client.
-class ExternalTabUITestMockLauncher : public ProxyLauncher {
- public:
-  AutomationProxy* CreateAutomationProxy(int execution_timeout) const {
-    return new ExternalTabUITestMockClient(execution_timeout);
-  }
-
-  void InitializeConnection(UITestBase* ui_test_base) const {
-    ui_test_base->LaunchBrowserAndServer();
-  }
-
-  std::string PrefixedChannelID() const {
-    return "";
-  }
-};
-
 class AutomationProxyTest : public UITest {
  protected:
   AutomationProxyTest() {
@@ -858,8 +841,9 @@
   return reinterpret_cast<T**>(&p);
 }
 
-ProxyLauncher* ExternalTabUITest::CreateProxyLauncher() {
-  return new ExternalTabUITestMockLauncher();
+AutomationProxy* ExternalTabUITest::CreateAutomationProxy(int exec_timeout) {
+  mock_ = new ExternalTabUITestMockClient(exec_timeout);
+  return mock_;
 }
 
 // Create with specifying a url