commit 8988eb240fc2f5bf25c0e251fdfa595798a45625
author Chung-yih Wang <cywang@google.com> Wed Mar 16 16:16:10 2016 +0800
committer Chung-yih Wang <cywang@google.com> Wed Mar 16 13:59:12 2016 +0000
tree 99b35e0a597d0a382cac659e31e46f0439a5560e
parent a6d76cdb1beff2237e39e5588f8df8cba86fca42

chrome.py: Reland the change

This reverts commit 629326dc78275fa853259f958dd4d73939b8351b.

BUG=chromium:594622
TEST=build Chrome browser w/ revert of the change; then
  test_that DUT_IP cheets_ContainerSmokeTest

Change-Id: I501dd2d3c93e3919f95968201cb6b50798d5e25f
Signed-off-by: Chung-yih Wang <cywang@google.com>
Reviewed-on: https://chromium-review.googlesource.com/332314
Reviewed-by: Ben Cheng <bccheng@chromium.org>

client/common_lib/cros/chrome.py

diff --git a/client/common_lib/cros/chrome.py b/client/common_lib/cros/chrome.py
index 8bf6c55..87e71e1 100644
--- a/client/common_lib/cros/chrome.py
+++ b/client/common_lib/cros/chrome.py
@@ -17,6 +17,7 @@
     """Wrapper for creating a telemetry browser instance with extensions."""
 
 
+    CHEETS = '-cheets'
     BROWSER_TYPE_LOGIN = 'system'
     BROWSER_TYPE_GUEST = 'system-guest'
 
@@ -61,6 +62,12 @@
             extension_paths.append(self._autotest_ext_path)
 
         finder_options = browser_options.BrowserFinderOptions()
+        # Append cheets specific browser args
+        is_cheets_platform = utils.get_current_board().endswith(self.CHEETS)
+        if is_cheets_platform:
+            from autotest_lib.client.common_lib.cros import cheets
+            extra_browser_args = cheets.append_extra_args(extra_browser_args)
+            logged_in = True
         self._browser_type = (self.BROWSER_TYPE_LOGIN
                 if logged_in else self.BROWSER_TYPE_GUEST)
         finder_options.browser_type = self.browser_type
@@ -112,6 +119,8 @@
             try:
                 browser_to_create = browser_finder.FindBrowser(finder_options)
                 self._browser = browser_to_create.Create(finder_options)
+                if is_cheets_platform:
+                    cheets.post_processing_after_browser()
                 break
             except (exceptions.LoginException) as e:
                 logging.error('Timed out logging in, tries=%d, error=%s',