[Telemetry] Move extensions_to_load and output_profile_path into browser_options

telemetry/telemetry/internal/backends/chrome/cros_browser_finder.py

Index: telemetry/telemetry/internal/backends/chrome/cros_browser_finder.py
diff --git a/telemetry/telemetry/internal/backends/chrome/cros_browser_finder.py b/telemetry/telemetry/internal/backends/chrome/cros_browser_finder.py
index 1e241773b4ead6e57078d917ba385cb24efd719a..c2c7b1a20648bbb0d9536186c7637b9a4fe284b7 100644
--- a/telemetry/telemetry/internal/backends/chrome/cros_browser_finder.py
+++ b/telemetry/telemetry/internal/backends/chrome/cros_browser_finder.py
@@ -35,15 +35,14 @@ class PossibleCrOSBrowser(possible_browser.PossibleBrowser):
     pass
 
   def Create(self, finder_options):
-    if finder_options.output_profile_path:
+    if finder_options.browser_options.output_profile_path:
       raise NotImplementedError(
           'Profile generation is not yet supported on CrOS.')
 
     browser_options = finder_options.browser_options
     browser_backend = cros_browser_backend.CrOSBrowserBackend(
-        self._platform_backend,
-        browser_options, self._platform_backend.cri, self._is_guest,
-        extensions_to_load=finder_options.extensions_to_load)
+        self._platform_backend, browser_options, self._platform_backend.cri,
+        self._is_guest)
     if browser_options.create_browser_with_oobe:
       return cros_browser_with_oobe.CrOSBrowserWithOOBE(
           browser_backend,
@@ -52,8 +51,8 @@ class PossibleCrOSBrowser(possible_browser.PossibleBrowser):
     return browser.Browser(
         browser_backend, self._platform_backend, self._credentials_path)
 
-  def SupportsOptions(self, finder_options):
-    if (len(finder_options.extensions_to_load) != 0) and self._is_guest:
+  def SupportsOptions(self, browser_options):
+    if (len(browser_options.extensions_to_load) != 0) and self._is_guest:
       return False
     return True