diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-22 17:29:59 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-22 17:29:59 +0000 |
| commit | b727c688b477bddc2dd7e5cad2615b09f7c182b0 (patch) | |
| tree | 54c467d5923dd2de5130fd1710093ab627af1354 /content | |
| parent | a5db4db58b706598b0ab4ed1d3de7e5ebae91389 (diff) | |
| download | chromium_src-b727c688b477bddc2dd7e5cad2615b09f7c182b0.zip chromium_src-b727c688b477bddc2dd7e5cad2615b09f7c182b0.tar.gz chromium_src-b727c688b477bddc2dd7e5cad2615b09f7c182b0.tar.bz2 | |
[content shell] don't bail out because a renderer got unresponsive.
The test runner counts this as crash, and if the renderer comes back before the
timeout, it might still produce good results.
BUG=111316
Review URL: https://codereview.chromium.org/13923006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195538 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/shell/webkit_test_controller.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/content/shell/webkit_test_controller.cc b/content/shell/webkit_test_controller.cc index eaa7b12..d30444d 100644 --- a/content/shell/webkit_test_controller.cc +++ b/content/shell/webkit_test_controller.cc @@ -279,10 +279,7 @@ void WebKitTestController::SetTempPath(const base::FilePath& temp_path) { void WebKitTestController::RendererUnresponsive() { DCHECK(CalledOnValidThread()); - if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoTimeout)) - return; - printer_->AddErrorMessage("#PROCESS UNRESPONSIVE - renderer"); - DiscardMainWindow(); + LOG(WARNING) << "renderer unresponsive"; } void WebKitTestController::OverrideWebkitPrefs( |