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

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

Index: trunk/src/tools/telemetry/telemetry/core/chrome/desktop_browser_backend.py
===================================================================
--- trunk/src/tools/telemetry/telemetry/core/chrome/desktop_browser_backend.py	(revision 194464)
+++ trunk/src/tools/telemetry/telemetry/core/chrome/desktop_browser_backend.py	(working copy)
@@ -16,7 +16,7 @@
   """The backend for controlling a locally-executed browser instance, on Linux,
   Mac or Windows.
   """
-  def __init__(self, options, executable, is_content_shell, use_login):
+  def __init__(self, options, executable, is_content_shell):
     super(DesktopBrowserBackend, self).__init__(
         is_content_shell=is_content_shell,
         supports_extensions=not is_content_shell, options=options)
@@ -26,8 +26,6 @@
     self._tmpdir = None
     self._tmp_output_file = None
 
-    self._use_login = use_login
-
     self._executable = executable
     if not self._executable:
       raise Exception('Cannot create browser, no executable found!')
@@ -47,7 +45,7 @@
       self._supports_net_benchmarking = False
       self._LaunchBrowser(options)
 
-    if self._use_login:
+    if self.options.cros_desktop:
       cros_util.NavigateLogin(self)
 
   def _LaunchBrowser(self, options):
@@ -85,7 +83,7 @@
           shutil.rmtree(self._tmpdir)
           shutil.copytree(self.options.profile_dir, self._tmpdir)
         args.append('--user-data-dir=%s' % self._tmpdir)
-      if self._use_login:
+      if self.options.cros_desktop:
         ext_path = os.path.join(os.path.dirname(__file__), 'chromeos_login_ext')
         args.extend(['--login-manager', '--login-profile=user',
                      '--stub-cros', '--login-screen=login',