Replace browser_backend.options with browser_backend.find_options.

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

Index: tools/telemetry/telemetry/core/backends/chrome/desktop_browser_backend.py
diff --git a/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_backend.py b/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_backend.py
index 00aa7439bdbe32dbb9af912f4f179e5c24c1826c..6034cada3910b4139a0973f23c1c02c4a1734b20 100644
--- a/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_backend.py
+++ b/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_backend.py
@@ -19,12 +19,12 @@ class DesktopBrowserBackend(chrome_browser_backend.ChromeBrowserBackend):
   """The backend for controlling a locally-executed browser instance, on Linux,
   Mac or Windows.
   """
-  def __init__(self, options, executable, flash_path, is_content_shell,
+  def __init__(self, finder_options, executable, flash_path, is_content_shell,
                browser_directory, output_profile_path=None):
     super(DesktopBrowserBackend, self).__init__(
         is_content_shell=is_content_shell,
         supports_extensions=not is_content_shell,
-        options=options)
+        finder_options=finder_options)
 
     # Initialize fields so that an explosion during init doesn't break in Close.
     self._proc = None
@@ -42,7 +42,7 @@ class DesktopBrowserBackend(chrome_browser_backend.ChromeBrowserBackend):
                       self._flash_path)
       self._flash_path = None
 
-    if len(options.extensions_to_load) > 0 and is_content_shell:
+    if len(finder_options.extensions_to_load) > 0 and is_content_shell:
       raise browser_backend.ExtensionsNotSupportedException(
           'Content shell does not support extensions.')
 
@@ -56,7 +56,7 @@ class DesktopBrowserBackend(chrome_browser_backend.ChromeBrowserBackend):
     self._SetupProfile()
 
   def _SetupProfile(self):
-    if not self.options.dont_override_profile:
+    if not self.finder_options.dont_override_profile:
       if self._output_profile_path:
         # If both |_output_profile_path| and |profile_dir| are specified then
         # the calling code will throw an exception, so we don't need to worry
@@ -64,7 +64,7 @@ class DesktopBrowserBackend(chrome_browser_backend.ChromeBrowserBackend):
         self._tmp_profile_dir = self._output_profile_path
       else:
         self._tmp_profile_dir = tempfile.mkdtemp()
-      profile_dir = self._profile_dir or self.options.profile_dir
+      profile_dir = self._profile_dir or self.finder_options.profile_dir
       if profile_dir:
         if self.is_content_shell:
           logging.critical('Profiles cannot be used with content shell')
@@ -79,7 +79,7 @@ class DesktopBrowserBackend(chrome_browser_backend.ChromeBrowserBackend):
     env = os.environ.copy()
     env['CHROME_HEADLESS'] = '1'  # Don't upload minidumps.
     env['BREAKPAD_DUMP_LOCATION'] = self._tmp_minidump_dir
-    if not self.options.show_stdout:
+    if not self.finder_options.show_stdout:
       self._tmp_output_file = tempfile.NamedTemporaryFile('w', 0)
       self._proc = subprocess.Popen(
           args, stdout=self._tmp_output_file, stderr=subprocess.STDOUT, env=env)
@@ -108,7 +108,7 @@ class DesktopBrowserBackend(chrome_browser_backend.ChromeBrowserBackend):
         args.append('--enable-net-benchmarking')
       else:
         args.append('--enable-benchmarking')
-      if not self.options.dont_override_profile:
+      if not self.finder_options.dont_override_profile:
         args.append('--user-data-dir=%s' % self._tmp_profile_dir)
     return args