diff options
Diffstat (limited to 'content/shell/webkit_test_controller.cc')
| -rw-r--r-- | content/shell/webkit_test_controller.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/content/shell/webkit_test_controller.cc b/content/shell/webkit_test_controller.cc index 3b3680f..1c7202c 100644 --- a/content/shell/webkit_test_controller.cc +++ b/content/shell/webkit_test_controller.cc @@ -413,12 +413,14 @@ void WebKitTestController::DiscardMainWindow() { // loop. Otherwise, we're already outside of the message loop, and we just // discard the main window. WebContentsObserver::Observe(NULL); - main_window_ = NULL; - current_pid_ = base::kNullProcessId; if (is_running_test_) { Shell::CloseAllWindows(); MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure()); + } else if (main_window_) { + main_window_->Close(); } + main_window_ = NULL; + current_pid_ = base::kNullProcessId; } void WebKitTestController::SendTestConfiguration() { |