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 CommandLine& arguments,
+                            bool include_testing_id,
+                            bool clear_profile,
+                            FilePath& template_user_data,
+                            ProfileType profile_type,
+                            FilePath browser_directory,
+                            bool show_window,
+                            bool wait_for_initial_loads,
+                            base::TimeTicks* browser_launch_time,
+                            base::ProcessHandle* process,
+                            base::ProcessId* process_id) {
+    LaunchBrowserAndServer(arguments, include_testing_id, clear_profile,
+                           template_user_data, profile_type, browser_directory,
+                           show_window, wait_for_initial_loads,
+                           browser_launch_time, process, process_id);
   }
 
   std::string PrefixedChannelID() const {
     return channel_id_;
   }
 
  private:
   ExternalTabUITestMockClient **mock_;
   std::string channel_id_;      // Channel id of automation proxy.
 };
@@ skipping 1663 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);
 }