Revert 80472 - GTTF: Detect browser crashes on shutdown in UI tests.Previously the automation fra...

chrome/test/automation/proxy_launcher.h

 // 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.
 
 #ifndef CHROME_TEST_AUTOMATION_PROXY_LAUNCHER_H_
 #define CHROME_TEST_AUTOMATION_PROXY_LAUNCHER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 104 matching lines @@
 
   // Check that no processes related to Chrome exist, displaying
   // the given message if any do.
   void AssertAppNotRunning(const std::wstring& error_message);
 
   // Returns true when the browser process is running, independent if any
   // renderer process exists or not. It will returns false if an user closed the
   // window or if the browser process died by itself.
   bool IsBrowserRunning();
 
+  // Returns true when timeout_ms milliseconds have elapsed.
+  // Returns false if the browser process died while waiting.
+  bool CrashAwareSleep(int timeout_ms);
+
   // Wait for the browser process to shut down on its own (i.e. as a result of
-  // some action that your test has taken). If it has exited within |timeout|,
-  // puts the exit code in |exit_code| and returns true.
-  bool WaitForBrowserProcessToQuit(int timeout, int* exit_code);
+  // some action that your test has taken).
+  bool WaitForBrowserProcessToQuit(int timeout);
 
   AutomationProxy* automation() const;
 
   // Return the user data directory being used by the browser instance.
   FilePath user_data_dir() const;
 
   // Get the handle of browser process connected to the automation. This
   // function only returns a reference to the handle so the caller does not
   // own the handle returned.
   base::ProcessHandle process() const;
@@ skipping 202 matching lines @@
 
  protected:
   std::string channel_id_;      // Channel id of automation proxy.
   bool disconnect_on_failure_;  // True if we disconnect on IPC channel failure.
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AnonymousProxyLauncher);
 };
 
 #endif  // CHROME_TEST_AUTOMATION_PROXY_LAUNCHER_H_