sandwich: Uplift for production use.

tools/android/loading/controller.py

 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Controller objects that control the context in which chrome runs.
 
 This is responsible for the setup necessary for launching chrome, and for
 creating a DevToolsConnection. There are remote device and local
 desktop-specific versions.
 """
@@ skipping 97 matching lines @@
     output.write(''.join(traceback.format_list(self.parent_stack)))
     traceback.print_tb(self.error_traceback, file=output)
     output.write('-' * 60 + ' Begin log\n')
     output.write(self.log)
     output.write('-' * 60 + ' End log\n')
 
   def IsIntermittent(self):
     """Returns whether the error is an known intermittent error."""
     return self.error_type in self._INTERMITTENT_WHITE_LIST
 
+  def RaiseOriginal(self):
+    """Raises the original exception that has caused <self>."""
+    raise self.error_type, self.error_value, self.error_traceback
+
 
 class ChromeControllerBase(object):
   """Base class for all controllers.
 
   Defines common operations but should not be created directly.
   """
   METADATA_GATHERER = ChromeControllerMetadataGatherer()
   DEVTOOLS_CONNECTION_ATTEMPTS = 10
   DEVTOOLS_CONNECTION_ATTEMPT_INTERVAL_SECONDS = 1
 
@@ skipping 191 matching lines @@
       assert self._wpr_attributes.chrome_env_override == {}, \
           'Remote controller doesn\'t support chrome environment variables.'
     package_info = OPTIONS.ChromePackage()
     command_line_path = '/data/local/chrome-command-line'
     self._device.ForceStop(package_info.package)
     chrome_args = self._GetChromeArguments()
     logging.info('Launching %s with flags: %s' % (package_info.package,
         subprocess.list2cmdline(chrome_args)))
     with device_setup.FlagReplacer(
         self._device, command_line_path, self._GetChromeArguments()):
+      self._DismissCrashDialogIfNeeded()
       start_intent = intent.Intent(
           package=package_info.package, activity=package_info.activity,
           data='about:blank')
       self._device.adb.Logcat(clear=True, dump=True)
       self._device.StartActivity(start_intent, blocking=True)
       try:
         for attempt_id in xrange(self.DEVTOOLS_CONNECTION_ATTEMPTS):
           logging.info('Devtools connection attempt %d' % attempt_id)
           with device_setup.ForwardPort(
               self._device, 'tcp:%d' % OPTIONS.devtools_port,
@@ skipping 16 matching lines @@
           raise ChromeControllerInternalError(
               'Failed to connect to Chrome devtools after {} '
               'attempts.'.format(self.DEVTOOLS_CONNECTION_ATTEMPTS))
       except ChromeControllerError._PASSTHROUGH_WHITE_LIST:
         raise
       except Exception:
         logcat = ''.join([l + '\n' for l in self._device.adb.Logcat(dump=True)])
         raise ChromeControllerError(log=logcat)
       finally:
         self._device.ForceStop(package_info.package)
+        self._DismissCrashDialogIfNeeded()
 
   def ResetBrowserState(self):
     """Override resetting Chrome local state."""
     logging.info('Resetting Chrome local state')
     package = OPTIONS.ChromePackage().package
     # Remove the Chrome Profile and the various disk caches. Other parts
     # theoretically should not affect loading performance. Also remove the tab
     # state to prevent it from growing infinitely. [:D]
     for directory in ['app_chrome/Default', 'cache', 'app_chrome/ShaderCache',
                       'app_tabs']:
@@ skipping 20 matching lines @@
     assert not self._wpr_attributes, 'WPR is already running.'
     with device_setup.RemoteWprHost(self._device, wpr_archive_path,
         record=record,
         network_condition_name=network_condition_name,
         disable_script_injection=disable_script_injection,
         out_log_path=out_log_path) as wpr_attributes:
       self._wpr_attributes = wpr_attributes
       yield
     self._wpr_attributes = None
 
+  def _DismissCrashDialogIfNeeded(self):
+    for _ in xrange(10):
+      if not self._device.DismissCrashDialogIfNeeded():
+        break

[gabadie, 2016/06/06 13:40:37]

FYI: copy pasted from
https://cs.chromium.org/chromium/src/third_party/catapult/telemetry/telemetry...

[pasko, 2016/06/06 13:58:52]

Thanks for the pointer. Ugh.

+
 
 class LocalChromeController(ChromeControllerBase):
   """Controller for a local (desktop) chrome instance."""
 
   def __init__(self):
     """Initialize the controller.
 
     Caution: The browser state might need to be manually reseted.
     """
     super(LocalChromeController, self).__init__()
@@ skipping 174 matching lines @@
     if (not os.path.isdir(self._profile_dir) or
         os.listdir(self._profile_dir) == []):
       # Launch chrome so that it populates the profile directory.
       with self.Open():
         pass
     assert os.path.isdir(self._profile_dir)
     assert os.path.isdir(os.path.dirname(self._GetCacheDirectoryPath()))
 
   def _GetCacheDirectoryPath(self):
     return os.path.join(self._profile_dir, 'Default', 'Cache')