Refactor UITestBase/ProxyLauncher.

chrome/test/automation/automation_proxy_uitest.cc

Index: chrome/test/automation/automation_proxy_uitest.cc
diff --git a/chrome/test/automation/automation_proxy_uitest.cc b/chrome/test/automation/automation_proxy_uitest.cc
index 465b61023a1afc3f33462a0afa769b24cf2fc91f..ab65c43b7a2d32cfff439e37f0509abe27efb8dc 100644
--- a/chrome/test/automation/automation_proxy_uitest.cc
+++ b/chrome/test/automation/automation_proxy_uitest.cc
@@ -63,8 +63,9 @@ class ExternalTabUITestMockLauncher : public ProxyLauncher {
     return *mock_;
   }
 
-  void InitializeConnection(UITestBase* ui_test_base) const {
-    ui_test_base->LaunchBrowserAndServer();
+  void InitializeConnection(const LaunchState& state,
+                            bool wait_for_initial_loads) {
+    LaunchBrowserAndServer(state, wait_for_initial_loads);
   }
 
   std::string PrefixedChannelID() const {
@@ -885,6 +886,10 @@ template <typename T> T** ReceivePointer(scoped_refptr<T>& p) {  // NOLINT
   return reinterpret_cast<T**>(&p);
 }
 
+ExternalTabUITest::ExternalTabUITest() : UITest(MessageLoop::TYPE_UI) {
+  launcher_.reset(CreateProxyLauncher());

[Paweł Hajdan Jr., 2011/01/08 06:45:25]

Again, *why* do we need this?

+}
+
 // Replace the default automation proxy with our mock client.
 ProxyLauncher* ExternalTabUITest::CreateProxyLauncher() {
   return new ExternalTabUITestMockLauncher(&mock_);