Replace options arg with extra_wpr_args in AddReplayServerOptions

BUG=269131
TEST=trybot

Review URL: https://chromiumcodereview.appspot.com/23533044

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

tools/telemetry/telemetry/core/backends/browser_backend.py

@@ -25,7 +25,7 @@ class BrowserBackend(object):
     self._browser = None
     self._tab_list_backend = tab_list_backend(self)
 
-  def AddReplayServerOptions(self, finder_options):
+  def AddReplayServerOptions(self, extra_wpr_args):
     pass
 
   def SetBrowser(self, browser):

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

@@ -342,10 +342,10 @@ class AndroidBrowserBackend(chrome_browser_backend.ChromeBrowserBackend):
                                        stdout=subprocess.PIPE).communicate()[0])
     return ret
 
-  def AddReplayServerOptions(self, options):
+  def AddReplayServerOptions(self, extra_wpr_args):
     """Override. Only add --no-dns_forwarding if not using RNDIS."""
     if not self._override_dns:
-      options.append('--no-dns_forwarding')
+      extra_wpr_args.append('--no-dns_forwarding')
 
   def CreateForwarder(self, *port_pairs):
     if self._rndis_forwarder:

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

@@ -62,8 +62,8 @@ class ChromeBrowserBackend(browser_backend.BrowserBackend):
       self._extension_dict_backend = (
           extension_dict_backend.ExtensionDictBackend(self))
 
-  def AddReplayServerOptions(self, finder_options):
-    finder_options.append('--no-dns_forwarding')
+  def AddReplayServerOptions(self, extra_wpr_args):
+    extra_wpr_args.append('--no-dns_forwarding')
 
   @property
   def misc_web_contents_backend(self):

tools/telemetry/telemetry/core/wpr_server.py

@@ -27,23 +27,23 @@ class ReplayServer(object):
         util.PortPair(browser_backend.webpagereplay_local_https_port,
                       browser_backend.webpagereplay_remote_https_port))
 
-    options = browser_backend.browser_options.extra_wpr_args
+    wpr_args = browser_backend.browser_options.extra_wpr_args
     if self._is_record_mode:
       if self._is_append_mode:
-        options.append('--append')
+        wpr_args.append('--append')
       else:
-        options.append('--record')
+        wpr_args.append('--record')
     if not make_javascript_deterministic:
-      options.append('--inject_scripts=')
-    browser_backend.AddReplayServerOptions(options)
+      wpr_args.append('--inject_scripts=')
+    browser_backend.AddReplayServerOptions(wpr_args)
     self._web_page_replay = webpagereplay.ReplayServer(
         path,
         browser_backend.WEBPAGEREPLAY_HOST,
         browser_backend.webpagereplay_local_http_port,
         browser_backend.webpagereplay_local_https_port,
-        options)
+        wpr_args)
     # Remove --no-dns_forwarding if it wasn't explicitly requested by backend.
-    if '--no-dns_forwarding' not in options:
+    if '--no-dns_forwarding' not in wpr_args:
       self._web_page_replay.replay_options.remove('--no-dns_forwarding')
     self._web_page_replay.StartServer()