Revert 194441 "Better support for chrome for cros local builds."

trunk/src/tools/telemetry/telemetry/core/chrome/desktop_browser_finder.py

Index: trunk/src/tools/telemetry/telemetry/core/chrome/desktop_browser_finder.py
===================================================================
--- trunk/src/tools/telemetry/telemetry/core/chrome/desktop_browser_finder.py	(revision 194464)
+++ trunk/src/tools/telemetry/telemetry/core/chrome/desktop_browser_finder.py	(working copy)
@@ -22,27 +22,22 @@
     'canary',
     'content-shell-debug',
     'content-shell-release',
-    'debug-cros',
-    'release-cros',
     'system'])
 
 class PossibleDesktopBrowser(possible_browser.PossibleBrowser):
   """A desktop browser that can be controlled."""
 
-  def __init__(self, browser_type, options, executable, is_content_shell,
-               use_login=False):
+  def __init__(self, browser_type, options, executable, is_content_shell):
     super(PossibleDesktopBrowser, self).__init__(browser_type, options)
     self._local_executable = executable
     self._is_content_shell = is_content_shell
-    self._use_login = use_login
 
   def __repr__(self):
     return 'PossibleDesktopBrowser(browser_type=%s)' % self.browser_type
 
   def Create(self):
     backend = desktop_browser_backend.DesktopBrowserBackend(
-        self._options, self._local_executable,
-        self._is_content_shell, self._use_login)
+        self._options, self._local_executable, self._is_content_shell)
     if sys.platform.startswith('linux'):
       p = linux_platform_backend.LinuxPlatformBackend()
     elif sys.platform == 'darwin':
@@ -118,24 +113,6 @@
   AddIfFound('release', 'Release', chromium_app_name, False)
   AddIfFound('content-shell-release', 'Release', content_shell_app_name, True)
 
-  # Add local chrome for CrOS builds.
-  def AddCrOSIfFound(browser_type, type_dir):
-    """Adds local chrome for ChromeOS builds on linux"""
-    app = os.path.join(chrome_root, 'out', type_dir, chromium_app_name)
-    ldd_path = '/usr/bin/ldd'
-    if not os.path.exists(app) or not os.path.exists(ldd_path):
-      return
-    # Look for libchromeos.so in ldd output.
-    ldd_out = subprocess.check_output([ldd_path, app])
-    if ldd_out.count('libchromeos.so'):
-      browsers.append(PossibleDesktopBrowser(browser_type, options, app,
-                                             is_content_shell=False,
-                                             use_login=True))
-
-  if sys.platform.startswith('linux'):
-    AddCrOSIfFound('debug-cros', 'Debug')
-    AddCrOSIfFound('release-cros', 'Release')
-
   # Mac-specific options.
   if sys.platform == 'darwin':
     mac_canary = ('/Applications/Google Chrome Canary.app/'