[Telemetry] Move extensions_to_load and output_profile_path into browser_options

telemetry/telemetry/internal/browser/browser_finder.py

 # Copyright 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Finds browsers that can be controlled by telemetry."""
 
 import logging
 import operator
 
 from telemetry import decorators
@@ skipping 89 matching lines @@
       y_idx = types.index(y.browser_type)
       return x_idx - y_idx
     browsers.sort(CompareBrowsersOnTypePriority)
     if len(browsers) >= 1:
       browsers[0].UpdateExecutableIfNeeded()
       return browsers[0]
     else:
       return None
 
   matching_browsers = [b for b in browsers
-      if b.browser_type == options.browser_type and b.SupportsOptions(options)]
+      if b.browser_type == options.browser_type and
+      b.SupportsOptions(options.browser_options)]
 
   chosen_browser = None
   if len(matching_browsers) == 1:
     chosen_browser = matching_browsers[0]
   elif len(matching_browsers) > 1:
     logging.warning('Multiple browsers of the same type found: %s' % (
                     repr(matching_browsers)))
     chosen_browser = sorted(matching_browsers,
                             key=lambda b: b.last_modification_time())[-1]
 
@@ skipping 48 matching lines @@
   # The reference build should be available for mac, linux and win, but the
   # desktop browser finder won't return it in the list of browsers.
   for browser in possible_browsers:
     if (browser.target_os == 'darwin' or browser.target_os.startswith('linux')
         or browser.target_os.startswith('win')):
       type_list.add('reference')
       break
   type_list = list(type_list)
   type_list.sort()
   return type_list