keep_test_server_ports to BrowserOptions.

tools/telemetry/telemetry/core/browser_options.py

Index: tools/telemetry/telemetry/core/browser_options.py
diff --git a/tools/telemetry/telemetry/core/browser_options.py b/tools/telemetry/telemetry/core/browser_options.py
index c7fc2e358904ce560958f1a031f5552120433985..c668457ea23f5ae3198c3348136c9a6daf2e2499 100644
--- a/tools/telemetry/telemetry/core/browser_options.py
+++ b/tools/telemetry/telemetry/core/browser_options.py
@@ -73,11 +73,6 @@ class BrowserFinderOptions(optparse.Values):
         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',
@@ -214,6 +209,8 @@ class BrowserOptions():
 
     self.clear_sytem_cache_for_browser_and_profile_on_start = False
 
+    self.keep_test_server_ports = False
+
   def AddCommandLineOptions(self, parser):
     group = optparse.OptionGroup(parser, 'Browser options')
     profile_choices = profile_types.GetProfileTypes()
@@ -240,6 +237,15 @@ class BrowserOptions():
         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 = [