Index: chrome/browser/ui/webui/web_ui_test_handler.h |
diff --git a/chrome/browser/ui/webui/web_ui_test_handler.h b/chrome/browser/ui/webui/web_ui_test_handler.h |
index 4c2ea3855b7ace2f4b05ca71bd24885379677902..f58b895fef156c7c5d9626591d71cdf9e21997d1 100644 |
--- a/chrome/browser/ui/webui/web_ui_test_handler.h |
+++ b/chrome/browser/ui/webui/web_ui_test_handler.h |
@@ -10,10 +10,18 @@ |
#include "content/browser/webui/web_ui.h" |
#include "content/common/notification_observer.h" |
+namespace base { |
+ |
+class ListValue; |
+ |
+} // namespace base |
+ |
// This class registers test framework specific handlers on WebUI objects. |
class WebUITestHandler : public WebUIMessageHandler, |
public NotificationObserver { |
public: |
+ WebUITestHandler(); |
+ |
// Sends a message through |preload_host| with the |js_text| to preload at the |
// appropriate time before the onload call is made. |
void PreloadJavaScript(const string16& js_text, |
@@ -29,21 +37,39 @@ class WebUITestHandler : public WebUIMessageHandler, |
private: |
// WebUIMessageHandler overrides. |
// Add test handlers to the current WebUI object. |
- virtual void RegisterMessages() OVERRIDE {} |
+ virtual void RegisterMessages() OVERRIDE; |
+ |
+ // Receives testResult messages. |
+ void HandleTestResult(const base::ListValue* test_result); |
// From NotificationObserver. |
virtual void Observe(int type, |
const NotificationSource& source, |
const NotificationDetails& details) OVERRIDE; |
- // Runs a message loop until test finishes. Returns the result of the test. |
+ // Runs a message loop until test finishes. Returns the result of the |
+ // test. |
bool WaitForResult(); |
- // Pass fail result of current tests. |
+ // Received test pass/fail; |
+ bool test_done_; |
+ |
+ // Pass fail result of current test. |
bool test_succeeded_; |
+ // Test code finished trying to execute. This will be set to true when the |
+ // selected tab is done with this execution request whether it was able to |
+ // parse/execute the javascript or not. |
+ bool run_test_done_; |
+ |
+ // Test code was able to execute successfully. This is *NOT* the test |
+ // pass/fail. |
+ bool run_test_succeeded_; |
+ |
// Waiting for a test to finish. |
bool is_waiting_; |
+ |
+ DISALLOW_COPY_AND_ASSIGN(WebUITestHandler); |
}; |
#endif // CHROME_BROWSER_UI_WEBUI_WEB_UI_TEST_HANDLER_H_ |