Revert 222145 "keep_test_server_ports to BrowserOptions (this sh..."

trunk/src/tools/telemetry/telemetry/core/browser_options.py

Index: trunk/src/tools/telemetry/telemetry/core/browser_options.py
===================================================================
--- trunk/src/tools/telemetry/telemetry/core/browser_options.py	(revision 222218)
+++ trunk/src/tools/telemetry/telemetry/core/browser_options.py	(working copy)
@@ -73,6 +73,11 @@
         dest='android_device',
         help='The android device ID to use'
              'If not specified, only 0 or 1 connected devcies are supported.')
+    group.add_option('--keep_test_server_ports', action='store_true',
+        help='Indicates the test server ports must be '
+             'kept. When this is run via a sharder '
+             'the test server ports should be kept and '
+             'should not be reset.')
     group.add_option(
         '--remote',
         dest='cros_remote',
@@ -207,8 +212,6 @@
     self.no_proxy_server = False
     self.browser_user_agent_type = None
 
-    self.keep_test_server_ports = False
-
     self.clear_sytem_cache_for_browser_and_profile_on_start = False
 
   def AddCommandLineOptions(self, parser):
@@ -237,15 +240,6 @@
         help='When possible, will display the stdout of the process')
     parser.add_option_group(group)
 
-    # Android options. TODO(achuith): Move to AndroidBrowserOptions.
-    group = optparse.OptionGroup(parser, 'Android options')
-    group.add_option('--keep_test_server_ports',
-        action='store_true',
-        help='Indicates the test server ports must be kept. When this is run '
-             'via a sharder the test server ports should be kept and should '
-             'not be reset.')
-    parser.add_option_group(group)
-
   def UpdateFromParseResults(self, finder_options):
     """Copies our options from finder_options"""
     browser_options_list = [