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

Unified Diff: chrome/browser/ui/webui/web_ui_browsertest.h

Issue 7645007: WebUI Testing: async support - global mocking, deferred runs, continued run. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Minor comment fix. Created 9 years, 4 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 | « chrome/browser/ui/webui/javascript2webui.js ('k') | chrome/browser/ui/webui/web_ui_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/web_ui_browsertest.h
diff --git a/chrome/browser/ui/webui/web_ui_browsertest.h b/chrome/browser/ui/webui/web_ui_browsertest.h
index 7ac42d0ca5fa9d61d9d66d2a8dea8c59e83a72d3..50876783ec58f35f14291ee6a767b5da6e292ee6 100644
--- a/chrome/browser/ui/webui/web_ui_browsertest.h
+++ b/chrome/browser/ui/webui/web_ui_browsertest.h
@@ -60,7 +60,8 @@ class WebUIBrowserTest
const ConstValueVector& function_arguments);
// Runs a test fixture that may include calls to functions in test_api.js.
- bool RunJavascriptTestF(const std::string& test_fixture,
+ bool RunJavascriptTestF(bool is_async,
+ const std::string& test_fixture,
const std::string& test_name);
// Runs a test that may include calls to functions in test_api.js.
@@ -113,10 +114,16 @@ class WebUIBrowserTest
const std::string& preload_test_name);
protected:
+ // URL to dummy WebUI page for testing framework.
+ static const char kDummyURL[];
+
WebUIBrowserTest();
- // Setup test path.
- virtual void SetUpInProcessBrowserTestFixture();
+ // Set up test path & override for |kDummyURL|.
+ virtual void SetUpInProcessBrowserTestFixture() OVERRIDE;
+
+ // Tear down override for |kDummyURL|.
+ virtual void TearDownInProcessBrowserTestFixture() OVERRIDE;
// Returns a mock WebUI object under test (if any).
virtual WebUIMessageHandler* GetMockMessageHandler();
« no previous file with comments | « chrome/browser/ui/webui/javascript2webui.js ('k') | chrome/browser/ui/webui/web_ui_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698