Chromium Code Reviews| Index: tools/telemetry/telemetry/core/chrome/cros_browser_backend.py |
| diff --git a/tools/telemetry/telemetry/core/chrome/cros_browser_backend.py b/tools/telemetry/telemetry/core/chrome/cros_browser_backend.py |
| index 1f2b61ef2ae31c7cf5050633a5f6b3bffdbc26ea..763e5b508869160317b1094aae5faf3f4f9d3496 100644 |
| --- a/tools/telemetry/telemetry/core/chrome/cros_browser_backend.py |
| +++ b/tools/telemetry/telemetry/core/chrome/cros_browser_backend.py |
| @@ -87,6 +87,13 @@ class CrOSBrowserBackend(browser_backend.BrowserBackend): |
| '--start-maximized']) |
| return args |
| + @property |
| + def pid(self): |
| + for pid, process in self._cri.ListProcesses(): |
| + if process.startswith('/opt/google/chrome/chrome '): |
| + return int(pid) |
| + return 0 |
|
dtu
2013/03/04 23:26:15
None
|
| + |
| def GetRemotePort(self, _): |
| return self._cri.GetRemotePort() |
| @@ -125,10 +132,7 @@ class CrOSBrowserBackend(browser_backend.BrowserBackend): |
| def IsBrowserRunning(self): |
| # On ChromeOS, there should always be a browser running. |
| - for _, process in self._cri.ListProcesses(): |
| - if process.startswith('/opt/google/chrome/chrome'): |
| - return True |
| - return False |
| + return bool(self.pid) |
| def GetStandardOutput(self): |
| return 'Cannot get standard output on CrOS' |