Revert 249045 "[Telemetry] Fail fast if Browser goes away during..."

_proc doesn't exist in CrosBrowserBackend or AndroidBrowserBackend. This is causing a crash on cros.

> [Telemetry] Fail fast if Browser goes away during launch
> 
> In the case of an error launching Chrome, Telemetry will hang for 30 seconds waiting for Chrome to reply on the socket before it realizes the browser has gone away.
> 
> This CL adds a call to .poll() in ChromeBrowserBackend._WaitForBrowserToComeUp() which will throw an exception if Chrome goes away on launch so Telemetry can exit instantly.
> 
> BUG=None
> 
> Review URL: https://codereview.chromium.org/138663008

TBR=jeremy@chromium.org

Review URL: https://codereview.chromium.org/148093018

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249090 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 2 insertions, 14 deletions

diff --git a/tools/telemetry/telemetry/core/backends/chrome/chrome_browser_backend.py b/tools/telemetry/telemetry/core/backends/chrome/chrome_browser_backend.py
index ed364e7..e1fdbb5 100644
--- a/tools/telemetry/telemetry/core/backends/chrome/chrome_browser_backend.py
+++ b/tools/telemetry/telemetry/core/backends/chrome/chrome_browser_backend.py
@@ -126,12 +126,6 @@ class ChromeBrowserBackend(browser_backend.BrowserBackend):
   def _WaitForBrowserToComeUp(self, wait_for_extensions=True, timeout=None):
     def IsBrowserUp():
       try:
-        # If browser has exited, bail.
-        self._proc.poll()
-        if self._proc.returncode:
-          raise exceptions.ProcessGoneException(
-              "Return code: %d" % self._proc.returncode)
-
         self.Request('', timeout=timeout)
       except (exceptions.BrowserGoneException,
               exceptions.BrowserConnectionGoneException):
@@ -140,7 +134,7 @@ class ChromeBrowserBackend(browser_backend.BrowserBackend):
         return True
     try:
       util.WaitFor(IsBrowserUp, timeout=30)
-    except (util.TimeoutException, exceptions.ProcessGoneException) as e:
+    except util.TimeoutException:
       raise exceptions.BrowserGoneException(self.GetStackTrace())
 
     def AllExtensionsLoaded():
diff --git a/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_backend.py b/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_backend.py
index 53d324d..5f4e3dc 100644
--- a/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_backend.py
+++ b/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_backend.py
@@ -152,13 +152,7 @@ class DesktopBrowserBackend(chrome_browser_backend.ChromeBrowserBackend):
     return self._proc.poll() == None
 
   def GetStandardOutput(self):
-    if not self._tmp_output_file:
-      if self.browser_options.show_stdout:
-        # This can happen in the case that loading the Chrome binary fails.
-        # We print rather than using logging here, because that makes a
-        # recursive call to this function.
-        print >> sys.stderr, "Can't get standard output with --show_stdout"
-      return ''
+    assert self._tmp_output_file, "Can't get standard output with show_stdout"
     self._tmp_output_file.flush()
     try:
       with open(self._tmp_output_file.name) as f: