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

trunk/src/tools/telemetry/telemetry/core/browser_options.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 optparse
 import sys
 import shlex
 import logging
 import copy
 
 from telemetry.core import browser_finder
@@ skipping 11 matching lines @@
     self.chrome_root = None
     self.android_device = None
     self.cros_ssh_identity = None
 
     self.dont_override_profile = False
     self.profile_dir = None
     self.extra_browser_args = []
     self.extra_wpr_args = []
     self.show_stdout = False
     self.extensions_to_load = []
+    self.cros_desktop = False
 
     self.cros_remote = None
     self.wpr_mode = wpr_modes.WPR_OFF
     self.wpr_make_javascript_deterministic = True
 
     self.browser_user_agent_type = None
 
     self.trace_dir = None
     self.verbosity = 0
 
@@ skipping 53 matching lines @@
     group.add_option('--extra-browser-args',
         dest='extra_browser_args_as_string',
         help='Additional arguments to pass to the browser when it starts')
     group.add_option('--extra-wpr-args',
         dest='extra_wpr_args_as_string',
         help=('Additional arguments to pass to Web Page Replay. '
               'See third_party/webpagereplay/replay.py for usage.'))
     group.add_option('--show-stdout',
         action='store_true',
         help='When possible, will display the stdout of the process')
+    # --cros-desktop is linux only.
+    if sys.platform.startswith('linux'):
+      group.add_option('--cros-desktop',
+          action='store_true',
+          help='Run ChromeOS desktop')
     parser.add_option_group(group)
 
     # Page set options
     group = optparse.OptionGroup(parser, 'Page set options')
     group.add_option('--page-repeat', dest='page_repeat', default=1,
         help='Number of times to repeat each individual ' +
         'page in the pageset before proceeding.')
     group.add_option('--pageset-repeat', dest='pageset_repeat', default=1,
         help='Number of times to repeat the entire pageset ' +
         'before finishing.')
@@ skipping 79 matching lines @@
       elif self.profile_type != 'clean':
         self.profile_dir = profile_types.GetProfileDir(self.profile_type)
       delattr(self, 'profile_type')
       return ret
     parser.parse_args = ParseArgs
     return parser
 
   def AppendExtraBrowserArg(self, arg):
     if arg not in self.extra_browser_args:
       self.extra_browser_args.append(arg)