Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2952)

Unified Diff: content/shell/webkit_test_controller.h

Issue 16074003: [content shell] don't open new windows after printing the test results (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: enum Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/shell/webkit_test_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/webkit_test_controller.h
diff --git a/content/shell/webkit_test_controller.h b/content/shell/webkit_test_controller.h
index 8585d5c3899f8dd574bb685cba8563a54a0b3c5c..f474ed6634f61513b0539890ba24c01514c884ca 100644
--- a/content/shell/webkit_test_controller.h
+++ b/content/shell/webkit_test_controller.h
@@ -120,6 +120,12 @@ class WebKitTestController : public base::NonThreadSafe,
virtual void OnGpuProcessCrashed(base::TerminationStatus exit_code) OVERRIDE;
private:
+ enum TestPhase {
+ BETWEEN_TESTS,
+ DURING_TEST,
+ CLEAN_UP
+ };
+
static WebKitTestController* instance_;
void TimeoutHandler();
@@ -156,9 +162,8 @@ class WebKitTestController : public base::NonThreadSafe,
// created.
bool send_configuration_to_next_host_;
- // True if we are currently running a layout test, and false during the setup
- // phase between two layout tests.
- bool is_running_test_;
+ // What phase of running an individual test we are currently in.
+ TestPhase test_phase_;
// True if the currently running test is a compositing test.
bool is_compositing_test_;
« no previous file with comments | « no previous file | content/shell/webkit_test_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698