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

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

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 import logging
 import os
 import subprocess as subprocess
 import shutil
 import sys
 import tempfile
 
 from telemetry.core import util
 from telemetry.core.chrome import browser_backend
 from telemetry.core.chrome import cros_util
 
 class DesktopBrowserBackend(browser_backend.BrowserBackend):
   """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)
 
     # Initialize fields so that an explosion during init doesn't break in Close.
     self._proc = None
     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!')
 
     if len(options.extensions_to_load) > 0 and is_content_shell:
       raise browser_backend.ExtensionsNotSupportedException(
           'Content shell does not support extensions.')
 
     self._port = util.GetAvailableLocalPort()
     self._supports_net_benchmarking = True
     self._LaunchBrowser(options)
 
     # For old chrome versions, might have to relaunch to have the
     # correct benchmarking switch.
     if self._chrome_branch_number < 1418:
       self.Close()
       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):
     args = [self._executable]
     args.extend(self.GetBrowserStartupArgs())
     if not options.show_stdout:
       self._tmp_output_file = tempfile.NamedTemporaryFile('w', 0)
       self._proc = subprocess.Popen(
           args, stdout=self._tmp_output_file, stderr=subprocess.STDOUT)
     else:
@@ skipping 17 matching lines @@
         args.append('--enable-benchmarking')
       if not self.options.dont_override_profile:
         self._tmpdir = tempfile.mkdtemp()
         if self.options.profile_dir:
           if self.is_content_shell:
             logging.critical('Profiles cannot be used with content shell')
             sys.exit(1)
           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',
                      '--auth-ext-path=%s' % ext_path])
     return args
 
   @property
   def pid(self):
     if self._proc:
       return self._proc.pid
@@ skipping 45 matching lines @@
     if self._tmpdir and os.path.exists(self._tmpdir):
       shutil.rmtree(self._tmpdir, ignore_errors=True)
       self._tmpdir = None
 
     if self._tmp_output_file:
       self._tmp_output_file.close()
       self._tmp_output_file = None
 
   def CreateForwarder(self, *port_pairs):
     return browser_backend.DoNothingForwarder(*port_pairs)