Merge 59315 - Revert 57897 - GTTF: Retry launching the browser a few times in...

chrome/test/ui/ui_test.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 "chrome/test/ui/ui_test.h"
 
 #if defined(OS_POSIX)
 #include <signal.h>
 #include <sys/types.h>
 #endif
@@ skipping 254 matching lines @@
 }
 
 AutomationProxy* UITestBase::CreateAutomationProxy(int execution_timeout) {
   return new AutomationProxy(execution_timeout, false);
 }
 
 void UITestBase::LaunchBrowserAndServer() {
   // Set up IPC testing interface server.
   server_.reset(CreateAutomationProxy(command_execution_timeout_ms_));
 
-  const int kTries = 3;
-  for (int i = 0; i < kTries; i++) {
-    if (i > 0) {
-      LOG(ERROR) << "Launching browser again, retry #" << i;
-    }
+  LaunchBrowser(launch_arguments_, clear_profile_);
+  server_->WaitForAppLaunch();
+  if (wait_for_initial_loads_)
+    ASSERT_TRUE(server_->WaitForInitialLoads());
+  else
+    PlatformThread::Sleep(sleep_timeout_ms());
 
-    LaunchBrowser(launch_arguments_, clear_profile_);
-    AutomationLaunchResult launch_result = server_->WaitForAppLaunch();
-    if (launch_result == AUTOMATION_SUCCESS) {
-      bool initial_loads_result = false;
-      if (wait_for_initial_loads_) {
-        initial_loads_result = server_->WaitForInitialLoads();
-      } else {
-        PlatformThread::Sleep(sleep_timeout_ms());
-        initial_loads_result = true;
-      }
-
-      if (initial_loads_result) {
-        if (automation()->SetFilteredInet(ShouldFilterInet())) {
-          return;
-        } else {
-          LOG(ERROR) << "SetFilteredInet failed";
-        }
-      } else {
-        LOG(ERROR) << "WaitForInitialLoadsFailed";
-      }
-    } else {
-      LOG(ERROR) << "WaitForAppLaunch failed: " << launch_result;
-    }
-
-    // The browser is likely hosed or already down at this point. Do not wait
-    // for it, just kill anything that is still running, preparing a clean
-    // environment for the next retry.
-    CleanupAppProcesses();
-  }
-
-  FAIL() << "Failed to launch browser";
+  EXPECT_TRUE(automation()->SetFilteredInet(ShouldFilterInet()));
 }
 
 void UITestBase::CloseBrowserAndServer() {
   QuitBrowser();
   CleanupAppProcesses();
 
   // Suppress spammy failures that seem to be occurring when running
   // the UI tests in single-process mode.
   // TODO(jhughes): figure out why this is necessary at all, and fix it
   if (!in_process_renderer_)
@@ skipping 930 matching lines @@
   UITestBase::TearDown();
   PlatformTest::TearDown();
 }
 
 AutomationProxy* UITest::CreateAutomationProxy(int execution_timeout) {
   // Make the AutomationProxy disconnect the channel on the first error,
   // so that we avoid spending a lot of time in timeouts. The browser is likely
   // hosed if we hit those errors.
   return new AutomationProxy(execution_timeout, true);
 }