summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--content/shell/browser/webkit_test_controller.cc7
-rw-r--r--content/shell/browser/webkit_test_controller.h1
2 files changed, 0 insertions, 8 deletions
diff --git a/content/shell/browser/webkit_test_controller.cc b/content/shell/browser/webkit_test_controller.cc
index 9a3b92b..cd9e6ff 100644
--- a/content/shell/browser/webkit_test_controller.cc
+++ b/content/shell/browser/webkit_test_controller.cc
@@ -457,13 +457,6 @@ void WebKitTestController::OnGpuProcessCrashed(
DiscardMainWindow();
}
-void WebKitTestController::TimeoutHandler() {
- DCHECK(CalledOnValidThread());
- printer_->AddErrorMessage(
- "FAIL: Timed out waiting for notifyDone to be called");
- DiscardMainWindow();
-}
-
void WebKitTestController::DiscardMainWindow() {
// If we're running a test, we need to close all windows and exit the message
// loop. Otherwise, we're already outside of the message loop, and we just
diff --git a/content/shell/browser/webkit_test_controller.h b/content/shell/browser/webkit_test_controller.h
index 865e395..c692cd3 100644
--- a/content/shell/browser/webkit_test_controller.h
+++ b/content/shell/browser/webkit_test_controller.h
@@ -154,7 +154,6 @@ class WebKitTestController : public base::NonThreadSafe,
static WebKitTestController* instance_;
- void TimeoutHandler();
void DiscardMainWindow();
void SendTestConfiguration();