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

Unified Diff: chrome/test/ppapi/ppapi_browsertest.cc

Issue 1053313002: Revert of Init Mojo embedder for Windows NaCl plugins. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 | components/nacl.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/ppapi/ppapi_browsertest.cc
diff --git a/chrome/test/ppapi/ppapi_browsertest.cc b/chrome/test/ppapi/ppapi_browsertest.cc
index 8d5c92a2a4d9ad3690702532fb0c4ca5acd58224..8f6a5716de042f1960dfb7c12aca6bf7ee1a5a8e 100644
--- a/chrome/test/ppapi/ppapi_browsertest.cc
+++ b/chrome/test/ppapi/ppapi_browsertest.cc
@@ -1452,11 +1452,17 @@
std::string result_;
};
-IN_PROC_BROWSER_TEST_F(MojoPPAPITest, Mojo) {
+#if defined(OS_POSIX)
+#define MAYBE_MOJO(test_name) test_name
+#else
+#define MAYBE_MOJO(test_name) DISABLED_##test_name
+#endif
+
+IN_PROC_BROWSER_TEST_F(MojoPPAPITest, MAYBE_MOJO(Mojo)) {
RunTest();
}
-IN_PROC_BROWSER_TEST_F(MojoPPAPITest, MojoFailsWithoutFlag) {
+IN_PROC_BROWSER_TEST_F(MojoPPAPITest, MAYBE_MOJO(MojoFailsWithoutFlag)) {
RunTestWithoutFlag();
}
#endif
« no previous file with comments | « no previous file | components/nacl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698