Cleanup chrome.py
BUG=chromium:603169
TEST=hwtests
Change-Id: Ieeb5cb895023db6938c9010d5aa7cdb95bc049b7
Reviewed-on: https://chromium-review.googlesource.com/374442
Commit-Ready: Ned Nguyen <nednguyen@google.com>
Tested-by: Achuith Bhandarkar <achuith@chromium.org>
Tested-by: Ned Nguyen <nednguyen@google.com>
Reviewed-by: Achuith Bhandarkar <achuith@chromium.org>
Reviewed-by: Ned Nguyen <nednguyen@google.com>
diff --git a/client/common_lib/cros/chrome.py b/client/common_lib/cros/chrome.py
index 5dfac27..895e6e1 100644
--- a/client/common_lib/cros/chrome.py
+++ b/client/common_lib/cros/chrome.py
@@ -107,8 +107,6 @@
finder_options = browser_options.BrowserFinderOptions()
if is_arc_available() and arc_util.should_start_arc(arc_mode):
- # TODO(achuith): Fix extra_browser_args, so that appending the
- # following flags to it is simpler.
if disable_arc_opt_in:
finder_options.browser_options.AppendExtraBrowserArgs(
arc_util.get_extra_chrome_flags())
@@ -121,18 +119,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
@@ -159,25 +145,18 @@
self.username = NormalizeEmail(self.username)
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
+ self.gaia_id = b_options.gaia_id if gaia_id is None else gaia_id
+ b_options.gaia_id = self.gaia_id
self.arc_mode = arc_mode
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.)