[Telemetry] Let cros_browser_backend be less restrictive in Chrome process search.

BUG=234151
NOTRY=true

Review URL: https://chromiumcodereview.appspot.com/14192047

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

1 files changed, 9 insertions, 2 deletions

diff --git a/tools/telemetry/telemetry/core/chrome/cros_browser_backend.py b/tools/telemetry/telemetry/core/chrome/cros_browser_backend.py
index 1aca7f3..af0fb38 100644
--- a/tools/telemetry/telemetry/core/chrome/cros_browser_backend.py
+++ b/tools/telemetry/telemetry/core/chrome/cros_browser_backend.py
@@ -10,6 +10,12 @@ from telemetry.core.chrome import browser_backend
 from telemetry.core.chrome import cros_util
 
 class CrOSBrowserBackend(browser_backend.BrowserBackend):
+  # Some developers' workflow includes running the Chrome process from
+  # /usr/local/... instead of the default location. We have to check for both
+  # paths in order to support this workflow.
+  CHROME_PATHS = ['/opt/google/chrome/chrome ',
+                  '/usr/local/opt/google/chrome/chrome ']
+
   def __init__(self, browser_type, options, cri, is_guest):
     super(CrOSBrowserBackend, self).__init__(is_content_shell=False,
         supports_extensions=True, options=options)
@@ -116,8 +122,9 @@ class CrOSBrowserBackend(browser_backend.BrowserBackend):
   @property
   def pid(self):
     for pid, process in self._cri.ListProcesses():
-      if process.startswith('/opt/google/chrome/chrome '):
-        return int(pid)
+      for path in self.CHROME_PATHS:
+        if process.startswith(path):
+          return int(pid)
     return None
 
   def GetRemotePort(self, _):