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

Unified Diff: content/browser/webui/web_ui_mojo_browsertest.cc

Issue 216443002: Reland: Mojo: add javascript bindings for request/response (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Disable WebUIMojoTest.EndToEnd Created 6 years, 9 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 | mojo/apps/js/bindings/connection_unittests.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/webui/web_ui_mojo_browsertest.cc
diff --git a/content/browser/webui/web_ui_mojo_browsertest.cc b/content/browser/webui/web_ui_mojo_browsertest.cc
index d0d98d84ea7f88938133b9a2449d6a50b42fedc3..36ab3b781c7cd235a7ae6d432c1795675ea12a4e 100644
--- a/content/browser/webui/web_ui_mojo_browsertest.cc
+++ b/content/browser/webui/web_ui_mojo_browsertest.cc
@@ -167,12 +167,7 @@ class WebUIMojoTest : public ContentBrowserTest {
// Loads a webui page that contains mojo bindings and verifies a message makes
// it from the browser to the page and back.
// http://crbug.com/357308
-#if defined(OS_WIN)
-#define MAYBE_EndToEnd DISABLED_EndToEnd
-#else
-#define MAYBE_EndToEnd EndToEnd
-#endif
-IN_PROC_BROWSER_TEST_F(WebUIMojoTest, MAYBE_EndToEnd) {
+IN_PROC_BROWSER_TEST_F(WebUIMojoTest, DISABLED_EndToEnd) {
darin (slow to review) 2014/03/28 06:14:46 This test will be re-enabled on all platforms in h
// Currently there is no way to have a generated file included in the isolate
// files. If the bindings file doesn't exist assume we're on such a bot and
// pass.
« no previous file with comments | « no previous file | mojo/apps/js/bindings/connection_unittests.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698