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

Unified Diff: chrome/test/data/webui/webui_resource_browsertest.cc

Issue 16831021: Convert asynchronous closure test in cr.ui framework to a browser test. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge trunk Created 7 years, 6 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/test/data/webui/parse_html_subset_test.html ('k') | chrome/test/data/webui/webui_resource_test.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/data/webui/webui_resource_browsertest.cc
diff --git a/chrome/test/data/webui/webui_resource_browsertest.cc b/chrome/test/data/webui/webui_resource_browsertest.cc
index ef11f858e80e0996b828bf98d0ca3471efcdf964..b233ec3ee46c3f516a972327c9d8139c51a3f915 100644
--- a/chrome/test/data/webui/webui_resource_browsertest.cc
+++ b/chrome/test/data/webui/webui_resource_browsertest.cc
@@ -44,6 +44,9 @@ class WebUIResourceBrowserTest : public InProcessBrowserTest {
std::string message;
ExecuteJavascriptOnCurrentTab("runTests()");
ASSERT_TRUE(message_queue.WaitForMessage(&message));
+ while (message.compare("\"PENDING\"") == 0) {
+ ASSERT_TRUE(message_queue.WaitForMessage(&message));
+ }
EXPECT_STREQ("\"SUCCESS\"", message.c_str());
}
@@ -112,6 +115,11 @@ IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, LocalStringsTest) {
RunTest(base::FilePath(FILE_PATH_LITERAL("local_strings_test.html")));
}
+IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, ParseHtmlSubsetTest) {
+ AddLibrary(IDR_WEBUI_JS_PARSE_HTML_SUBSET);
+ RunTest(base::FilePath(FILE_PATH_LITERAL("parse_html_subset_test.html")));
+}
+
IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, PositionUtilTest) {
AddLibrary(IDR_WEBUI_JS_CR);
AddLibrary(IDR_WEBUI_JS_CR_UI_POSITION_UTIL);
« no previous file with comments | « chrome/test/data/webui/parse_html_subset_test.html ('k') | chrome/test/data/webui/webui_resource_test.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698