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

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

Issue 253843005: Fix mojo startup (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: re-enable tests on windows Created 6 years, 8 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 | « content/browser/renderer_host/render_process_host_impl.cc ('k') | no next file » | 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 d933169f22348f63be0ce7cf0b9566fe228c8ae1..1ab433cd1898c6e761fe03e27ff11e64bce3d64b 100644
--- a/content/browser/webui/web_ui_mojo_browsertest.cc
+++ b/content/browser/webui/web_ui_mojo_browsertest.cc
@@ -315,18 +315,9 @@ class WebUIMojoTest : public ContentBrowserTest {
DISALLOW_COPY_AND_ASSIGN(WebUIMojoTest);
};
-// Temporarily disabled due to flakiness on Windows. http://crbug.com/366644
-#if defined(OS_WIN)
-#define MAYBE_EndToEndPing DISABLED_EndToEndPing
-#define MAYBE_EndToEndEcho DISABLED_EndToEndEcho
-#else
-#define MAYBE_EndToEndPing EndToEndPing
-#define MAYBE_EndToEndEcho EndToEndEcho
-#endif
-
// Loads a webui page that contains mojo bindings and verifies a message makes
// it from the browser to the page and back.
-IN_PROC_BROWSER_TEST_F(WebUIMojoTest, MAYBE_EndToEndPing) {
+IN_PROC_BROWSER_TEST_F(WebUIMojoTest, EndToEndPing) {
// 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.
@@ -352,7 +343,7 @@ IN_PROC_BROWSER_TEST_F(WebUIMojoTest, MAYBE_EndToEndPing) {
// Loads a webui page that contains mojo bindings and verifies that
// parameters are passed back correctly from JavaScript.
-IN_PROC_BROWSER_TEST_F(WebUIMojoTest, MAYBE_EndToEndEcho) {
+IN_PROC_BROWSER_TEST_F(WebUIMojoTest, EndToEndEcho) {
// 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 | « content/browser/renderer_host/render_process_host_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698