From 1274bc5d8d608b330eafe86d06a58873bb358492 Mon Sep 17 00:00:00 2001 From: nednguyen Date: Mon, 17 Nov 2014 11:47:40 -0800 Subject: [PATCH] Revert of [Telemetry] Add browser option that allows disabling crash service (patchset #1 id:1 of https://codereview.chromium.org/702173002/) Reason for revert: Bug 424024 is marked fixed. Crash service was not the reason of the flakiness. Original issue's description: > [Telemetry] Add browser option that allows disabling crash service > > TBR=dtu@chromium.org > > BUG=430246 > > Committed: https://crrev.com/797b1a69e4a74be52c6a3841547072321b297a7f > Cr-Commit-Position: refs/heads/master@{#302903} TBR=chrishenry@google.com,kbr@chromium.org,tonyg@chromium.org,dtu@chromium.org NOTREECHECKS=true NOTRY=true BUG=430246 Review URL: https://codereview.chromium.org/721443006 Cr-Commit-Position: refs/heads/master@{#304453} --- .../telemetry/core/backends/chrome/desktop_browser_backend.py | 4 +--- tools/telemetry/telemetry/core/browser_options.py | 8 -------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_backend.py b/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_backend.py index b7bfb5ade815..32ce0eea7778 100644 --- a/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_backend.py +++ b/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_backend.py @@ -187,9 +187,7 @@ class DesktopBrowserBackend(chrome_browser_backend.ChromeBrowserBackend): env['CHROME_HEADLESS'] = '1' # Don't upload minidumps. env['BREAKPAD_DUMP_LOCATION'] = self._tmp_minidump_dir env['CHROME_BREAKPAD_PIPE_NAME'] = self._GetCrashServicePipeName() - # TODO(nednguyen): maybe remove this after crbug.com/424024 is resolved. - if not self.browser_options.disable_crash_service: - self._crash_service = self._StartCrashService() + self._crash_service = self._StartCrashService() logging.debug('Starting Chrome %s', args) if not self.browser_options.show_stdout: self._tmp_output_file = tempfile.NamedTemporaryFile('w', 0) diff --git a/tools/telemetry/telemetry/core/browser_options.py b/tools/telemetry/telemetry/core/browser_options.py index 204f84b375ed..c097ea7b78a6 100644 --- a/tools/telemetry/telemetry/core/browser_options.py +++ b/tools/telemetry/telemetry/core/browser_options.py @@ -115,13 +115,6 @@ class BrowserFinderOptions(optparse.Values): group.add_option('--print-bootstrap-deps', action='store_true', help='Output bootstrap deps list.') - group.add_option('--disable-crash-service', - dest='disable_crash_service', - default=False, - action='store_true', - help='Whether to disable crash service. NOTE: this flag ' - 'is added temporarily for crbug.com/424024, and will be ' - 'deprecated as soon as the bug is marked fixed.') parser.add_option_group(group) # Platform options @@ -283,7 +276,6 @@ class BrowserOptions(object): def UpdateFromParseResults(self, finder_options): """Copies our options from finder_options""" browser_options_list = [ - 'disable_crash_service', 'extra_browser_args_as_string', 'extra_wpr_args_as_string', 'netsim', -- 2.11.4.GIT