Remove cruft in gaia_id and extensions_to_load.
BUG=chromium:603169
TEST=VM tests and HW tests
Change-Id: I7671d66783ac8935e1458cf6b3f831d303fe468a
Reviewed-on: https://chromium-review.googlesource.com/339251
Commit-Ready: Achuith Bhandarkar <achuith@chromium.org>
Tested-by: Achuith Bhandarkar <achuith@chromium.org>
Reviewed-by: Ilja Friedel <ihf@chromium.org>
diff --git a/client/common_lib/cros/chrome.py b/client/common_lib/cros/chrome.py
index 9fc6975..5e1cf29 100644
--- a/client/common_lib/cros/chrome.py
+++ b/client/common_lib/cros/chrome.py
@@ -98,18 +98,6 @@
finder_options.browser_options.AppendExtraBrowserArgs(
extra_browser_args)
- # TODO(achuith): Remove this after PFQ revs. crbug.com/603169.
- if logged_in:
- 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().
# TODO(crbug.com/360890) Below MUST be '2' so that it doesn't inhibit
@@ -131,23 +119,16 @@
self.password = b_options.password if password is None else password
b_options.username = self.username
b_options.password = self.password
- # gaia_id will be added to telemetry code in chromium repository later
- try:
- self.gaia_id = b_options.gaia_id if gaia_id is None else gaia_id
- b_options.gaia_id = self.gaia_id
- except AttributeError:
- pass
+ if gaia_id is not None:
+ b_options.gaia_id = gaia_id
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
+ 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
# Turn on collection of Chrome coredumps via creation of a magic file.
# (Without this, Chrome coredumps are trashed.)