extensions_to_load has moved to browser_options.
BUG=chromium:603169
TEST=login_Cryptohome
Change-Id: I96c0f91c64576a08fe19aed6fcb8803e477e42d8
Reviewed-on: https://chromium-review.googlesource.com/338891
Trybot-Ready: Achuith Bhandarkar <achuith@chromium.org>
Tested-by: Achuith Bhandarkar <achuith@chromium.org>
Reviewed-by: Ilja Friedel <ihf@chromium.org>
Commit-Queue: Achuith Bhandarkar <achuith@chromium.org>
diff --git a/client/common_lib/cros/chrome.py b/client/common_lib/cros/chrome.py
index 87e71e1..478d262 100644
--- a/client/common_lib/cros/chrome.py
+++ b/client/common_lib/cros/chrome.py
@@ -75,13 +75,17 @@
finder_options.browser_options.AppendExtraBrowserArgs(
extra_browser_args)
+ # TODO(achuith): Remove this after PFQ revs. crbug.com/603169.
if logged_in:
- extensions_to_load = finder_options.extensions_to_load
- for path in extension_paths:
- extension = extension_to_load.ExtensionToLoad(
- path, self.browser_type, is_component=is_component)
- extensions_to_load.append(extension)
- self._extensions_to_load = extensions_to_load
+ try:
+ extensions_to_load = finder_options.extensions_to_load
+ for path in extension_paths:
+ extension = extension_to_load.ExtensionToLoad(
+ path, self.browser_type, is_component=is_component)
+ extensions_to_load.append(extension)
+ self._extensions_to_load = extensions_to_load
+ except AttributeError:
+ pass
# finder options must be set before parse_args(), browser options must
# be set before Create().
@@ -111,6 +115,17 @@
except AttributeError:
pass
+ if logged_in:
+ try:
+ extensions_to_load = b_options.extensions_to_load
+ for path in extension_paths:
+ extension = extension_to_load.ExtensionToLoad(
+ path, self.browser_type, is_component=is_component)
+ extensions_to_load.append(extension)
+ self._extensions_to_load = extensions_to_load
+ except AttributeError:
+ pass
+
# Turn on collection of Chrome coredumps via creation of a magic file.
# (Without this, Chrome coredumps are trashed.)
open(constants.CHROME_CORE_MAGIC_FILE, 'w').close()