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

Attempt to fix testGotQueryParams on 10.6 and 10.7

> keep_test_server_ports to BrowserOptions (this should probably go into AndroidBrowserOptions). android_rndis is a new ctor arg to AndroidBrowserBackend.
> 
> BUG=269131
> TEST=trybot
> 
> Review URL: https://chromiumcodereview.appspot.com/23619022

TBR=achuith@chromium.org

Review URL: https://codereview.chromium.org/23629037

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@222220 0039d316-1c4b-4281-b951-d872f2087c98

tools/telemetry/telemetry/core/backends/chrome/android_browser_backend.py

@@ -147,8 +147,7 @@ class WebviewBackendSettings(AndroidBrowserBackendSettings):
 class AndroidBrowserBackend(chrome_browser_backend.ChromeBrowserBackend):
   """The backend for controlling a browser instance running on Android.
   """
-  def __init__(self, finder_options, backend_settings, rndis,
-               output_profile_path):
+  def __init__(self, finder_options, backend_settings, output_profile_path):
     super(AndroidBrowserBackend, self).__init__(
         is_content_shell=backend_settings.is_content_shell,
         supports_extensions=False, finder_options=finder_options,
@@ -160,7 +159,7 @@ class AndroidBrowserBackend(chrome_browser_backend.ChromeBrowserBackend):
     self._adb = backend_settings.adb
     self._backend_settings = backend_settings
     self._saved_cmdline = None
-    if not self.browser_options.keep_test_server_ports:
+    if not finder_options.keep_test_server_ports:
       adb_commands.ResetTestServerPortAllocation()
     self._port = adb_commands.AllocateTestServerPort()
 
@@ -175,7 +174,7 @@ class AndroidBrowserBackend(chrome_browser_backend.ChromeBrowserBackend):
 
     # Pre-configure RNDIS forwarding.
     self._rndis_forwarder = None
-    if rndis:
+    if finder_options.android_rndis:
       self._rndis_forwarder = android_rndis.RndisForwarderWithRoot(self._adb)
       self.WEBPAGEREPLAY_HOST = self._rndis_forwarder.host_ip
     # TODO(szym): only override DNS if WPR has privileges to proxy on port 25.

tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py

@@ -53,7 +53,6 @@ class PossibleAndroidBrowser(possible_browser.PossibleBrowser):
   def Create(self):
     backend = android_browser_backend.AndroidBrowserBackend(
         self.finder_options, self._backend_settings,
-        self.finder_options.android_rndis,
         output_profile_path=self.finder_options.output_profile_path)
     platform_backend = android_platform_backend.AndroidPlatformBackend(
         self._backend_settings.adb.Adb(),

tools/telemetry/telemetry/core/browser_options.py

@@ -73,6 +73,11 @@ 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',
@@ -207,8 +212,6 @@ class BrowserOptions():
     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 @@ 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 = [