From 0ac1a03288c78ed987f71e57b8b7b875e68cfc27 Mon Sep 17 00:00:00 2001 From: "jochen@chromium.org" Date: Tue, 12 Feb 2013 12:53:37 +0000 Subject: [content shell] move logic that decides when a test is finished from WebKitTestController to WebKitTestRunner This is in preparation for linking against the TestRunner library which will own the logic BUG=111316 TEST=content_browsertests still work R=marja@chromium.org Review URL: https://codereview.chromium.org/12208110 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181913 0039d316-1c4b-4281-b951-d872f2087c98 --- content/shell/webkit_test_controller.h | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'content/shell/webkit_test_controller.h') diff --git a/content/shell/webkit_test_controller.h b/content/shell/webkit_test_controller.h index 94e7ef0..0326116 100644 --- a/content/shell/webkit_test_controller.h +++ b/content/shell/webkit_test_controller.h @@ -32,7 +32,7 @@ class WebKitTestResultPrinter { void reset() { state_ = BEFORE_TEST; } - bool in_text_block() const { return state_ == IN_TEXT_BLOCK; } + bool output_finished() const { return state_ == AFTER_TEST; } void set_capture_text_only(bool capture_text_only) { capture_text_only_ = capture_text_only; } @@ -107,19 +107,14 @@ class WebKitTestController : public base::NonThreadSafe, private: static WebKitTestController* instance_; - void CaptureDump(); void TimeoutHandler(); // Message handlers. - void OnDidFinishLoad(); void OnImageDump(const std::string& actual_pixel_hash, const SkBitmap& image); void OnTextDump(const std::string& dump); void OnPrintMessage(const std::string& message); void OnOverridePreferences(const webkit_glue::WebPreferences& prefs); - void OnNotifyDone(); - void OnDumpAsText(); - void OnDumpChildFramesAsText(); - void OnWaitUntilDone(); + void OnTestFinished(bool did_timeout); void OnNotImplemented(const std::string& object_name, const std::string& method_name); @@ -137,13 +132,6 @@ class WebKitTestController : public base::NonThreadSafe, bool enable_pixel_dumping_; std::string expected_pixel_hash_; - bool captured_dump_; - - bool dump_as_text_; - bool dump_child_frames_as_text_; - bool wait_until_done_; - bool did_finish_load_; - webkit_glue::WebPreferences prefs_; bool should_override_prefs_; -- cgit v1.1