Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / tools / telemetry / telemetry / core / backends / chrome / cros_browser_backend.py

diff --git a/src/tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py b/src/tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py
index 5977353..5bd8f8a 100644 (file)
--- a/src/tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py
+++ b/src/tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py
@@ -6,7 +6,6 @@ import logging
 import os
 
 from telemetry import decorators
-
 from telemetry.core import exceptions
 from telemetry.core import forwarders
 from telemetry.core import util
@@ -16,15 +15,15 @@ from telemetry.core.forwarders import cros_forwarder
 
 
 class CrOSBrowserBackend(chrome_browser_backend.ChromeBrowserBackend):
-  def __init__(self, browser_type, browser_options, cri, is_guest,
+  def __init__(self, cros_platform_backend, browser_options, cri, is_guest,
                extensions_to_load):
     super(CrOSBrowserBackend, self).__init__(
-        is_content_shell=False, supports_extensions=not is_guest,
+        cros_platform_backend, supports_tab_control=True,
+        supports_extensions=not is_guest,
         browser_options=browser_options,
         output_profile_path=None, extensions_to_load=extensions_to_load)
 
     # Initialize fields so that an explosion during init doesn't break in Close.
-    self._browser_type = browser_type
     self._cri = cri
     self._is_guest = is_guest
     self._forwarder = None
@@ -67,35 +66,38 @@ class CrOSBrowserBackend(chrome_browser_backend.ChromeBrowserBackend):
                    self.profile_directory)
       cri.Chown(self.profile_directory)
 
-    self._SetBranchNumber(self._GetChromeVersion())
-
   def GetBrowserStartupArgs(self):
     args = super(CrOSBrowserBackend, self).GetBrowserStartupArgs()
     args.extend([
             '--enable-smooth-scrolling',
             '--enable-threaded-compositing',
             '--enable-per-tile-painting',
-            '--force-compositing-mode',
-            # Disables the start page, as well as other external apps that can
-            # steal focus or make measurements inconsistent.
-            '--disable-default-apps',
-            # Skip user image selection screen, and post login screens.
-            '--oobe-skip-postlogin',
             # Allow devtools to connect to chrome.
             '--remote-debugging-port=%i' % self._remote_debugging_port,
             # Open a maximized window.
             '--start-maximized',
+            # Skip user image selection screen, and post login screens.
+            '--oobe-skip-postlogin',
             # Debug logging.
             '--vmodule=*/chromeos/net/*=2,*/chromeos/login/*=2'])
 
+    # Disables the start page, as well as other external apps that can
+    # steal focus or make measurements inconsistent.
+    if self.browser_options.disable_default_apps:
+      args.append('--disable-default-apps')
+
+    # Disable GAIA services unless we're using GAIA login, or if there's an
+    # explicit request for it.
+    if (self.browser_options.disable_gaia_services and
+        not self.browser_options.gaia_login):
+      args.append('--disable-gaia-services')
+
     return args
 
-  def _GetChromeVersion(self):
-    result = util.WaitFor(self._cri.GetChromeProcess, timeout=30)
-    assert result and result['path']
-    (version, _) = self._cri.RunCmdOnDevice([result['path'], '--version'])
-    assert version
-    return version
+  @property
+  def _use_host_resolver_rules(self):
+    """Always use the --host-resolver-rules Chrome flag; even for netsim."""
+    return True
 
   @property
   def pid(self):
@@ -145,7 +147,6 @@ class CrOSBrowserBackend(chrome_browser_backend.ChromeBrowserBackend):
 
     # Wait for oobe.
     self._WaitForBrowserToComeUp(wait_for_extensions=False)
-    self._PostBrowserStartupInitialization()
     util.WaitFor(lambda: self.oobe_exists, 10)
 
     if self.browser_options.auto_login:
@@ -172,6 +173,7 @@ class CrOSBrowserBackend(chrome_browser_backend.ChromeBrowserBackend):
 
     if self._cri:
       self._cri.RestartUI(False) # Logs out.
+      self._cri.CloseConnection()
 
     util.WaitFor(lambda: not self._IsCryptohomeMounted(), 30)
 
@@ -238,21 +240,3 @@ class CrOSBrowserBackend(chrome_browser_backend.ChromeBrowserBackend):
 
     # Wait for extensions to load.
     self._WaitForBrowserToComeUp()
-
-    # Workaround for crbug.com/374462 - the bug doesn't manifest in the guest
-    # session, which also starts with an open browser tab.
-    retries = 3
-    while not self._is_guest:
-      try:
-        # Open a new window/tab.
-        tab = self.tab_list_backend.New(timeout=30)
-        tab.Navigate('about:blank', timeout=10)
-        break
-      except (exceptions.TabCrashException, util.TimeoutException,
-              IndexError):
-        retries -= 1
-        logging.warning('TabCrashException/TimeoutException in '
-                        'new tab creation/navigation, '
-                        'remaining retries %d', retries)
-        if not retries:
-          raise