Refactor UITestBase/ProxyLauncher.

chrome/test/automation/automation_proxy_uitest.cc

 // Copyright (c) 2010 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.
 
 #include <string>
 
 #include "app/app_switches.h"
 #include "app/message_box_flags.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
@@ skipping 45 matching lines @@
       : mock_(mock) {
     channel_id_ = AutomationProxy::GenerateChannelID();
   }
 
   AutomationProxy* CreateAutomationProxy(int execution_timeout) {
     *mock_ = new ExternalTabUITestMockClient(execution_timeout);
     (*mock_)->InitializeChannel(channel_id_, false);
     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 {
     return channel_id_;
   }
 
  private:
   ExternalTabUITestMockClient **mock_;
   std::string channel_id_;      // Channel id of automation proxy.
 };
@@ skipping 800 matching lines @@
     CreateFunctor(loop, &TimedMessageLoopRunner::QuitAfter, ms))
 
 template <typename T> T** ReceivePointer(scoped_ptr<T>& p) {  // NOLINT
   return reinterpret_cast<T**>(&p);
 }
 
 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_);
 }
 
 // Create with specifying a url
 // Flaky, http://crbug.com/32293
 TEST_F(ExternalTabUITest, FLAKY_CreateExternalTab1) {
   scoped_refptr<TabProxy> tab;
   TimedMessageLoopRunner loop(MessageLoop::current());
@@ skipping 843 matching lines @@
   int diff_pixels_count = 0;
   for (int x = 0; x < img_size.width(); ++x) {
     for (int y = 0; y < img_size.height(); ++y) {
       if (*snapshot_bmp.getAddr32(x, y) != *reference_bmp.getAddr32(x, y)) {
         ++diff_pixels_count;
       }
     }
   }
   ASSERT_EQ(diff_pixels_count, 0);
 }