| 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_;
|
|
|