Move launcher_.reset() from UITestBase constructor to SetUp().

chrome/test/ui/ui_test.cc

 // Copyright (c) 2011 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 "chrome/test/ui/ui_test.h"
 
 #if defined(OS_POSIX)
 #include <signal.h>
 #include <sys/types.h>
 #endif
@@ skipping 75 matching lines @@
       wait_for_initial_loads_(true),
       dom_automation_enabled_(false),
       show_window_(false),
       clear_profile_(true),
       include_testing_id_(true),
       enable_file_cookies_(true),
       profile_type_(ProxyLauncher::DEFAULT_THEME),
       shutdown_type_(ProxyLauncher::WINDOW_CLOSE) {
   PathService::Get(chrome::DIR_APP, &browser_directory_);
   PathService::Get(chrome::DIR_TEST_DATA, &test_data_directory_);
-  launcher_.reset(CreateProxyLauncher());
 }
 
 UITestBase::UITestBase(MessageLoop::Type msg_loop_type)
     : launch_arguments_(CommandLine::NO_PROGRAM),
       expected_errors_(0),
       expected_crashes_(0),
       wait_for_initial_loads_(true),
       dom_automation_enabled_(false),
       show_window_(false),
       clear_profile_(true),
       include_testing_id_(true),
       enable_file_cookies_(true),
       profile_type_(ProxyLauncher::DEFAULT_THEME),
       shutdown_type_(ProxyLauncher::WINDOW_CLOSE) {
   PathService::Get(chrome::DIR_APP, &browser_directory_);
   PathService::Get(chrome::DIR_TEST_DATA, &test_data_directory_);
-  launcher_.reset(CreateProxyLauncher());
 }
 
 UITestBase::~UITestBase() {}
 
 void UITestBase::SetUp() {
+  if (!launcher_.get())

[Paweł Hajdan Jr., 2011/01/12 21:34:29]

nit: Add a comment above why this NULL-check is needed.

For example: Some tests (SessionRestore...) call SetUp multiple times.
ProxyLauncher should only be created once.
// TODO(phajdan.jr): Fix tests that abuse SetUp and remove this check.

+    launcher_.reset(CreateProxyLauncher());
   launcher_->AssertAppNotRunning(L"Please close any other instances "
                                  L"of the app before testing.");
 
   JavaScriptExecutionController::set_timeout(
       TestTimeouts::action_max_timeout_ms());
   test_start_time_ = Time::NowFromSystemTime();
 
   SetLaunchSwitches();
   launcher_->InitializeConnection(DefaultLaunchState(),
                                   wait_for_initial_loads_);
@@ skipping 716 matching lines @@
     incorrect_state_count++;
   }
 
   LOG(INFO) << "Elapsed time: " << (base::Time::Now() - start).InSecondsF()
             << " seconds"
             << " call failed " << fail_count << " times"
             << " state was incorrect " << incorrect_state_count << " times";
   ADD_FAILURE() << "Timeout reached in " << __FUNCTION__;
   return false;
 }