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

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

Issue 1059233004: 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 8f6a5716de042f1960dfb7c12aca6bf7ee1a5a8e..e93114e52eaa7b81e5109a472e25e73521243ce3 100644
--- a/chrome/test/ppapi/ppapi_browsertest.cc
+++ b/chrome/test/ppapi/ppapi_browsertest.cc
@@ -1452,17 +1452,17 @@ class MojoPPAPITest : public InProcessBrowserTest {
std::string result_;
};
-#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)) {
+IN_PROC_BROWSER_TEST_F(MojoPPAPITest, Mojo) {
RunTest();
}
-IN_PROC_BROWSER_TEST_F(MojoPPAPITest, MAYBE_MOJO(MojoFailsWithoutFlag)) {
+#if defined(OS_WIN)
+#define MAYBE_MojoFailsWithoutFlag DISABLED_MojoFailsWithoutFlag
+#else
+#define MAYBE_MojoFailsWithoutFlag MojoFailsWithoutFlag
+#endif
+
+IN_PROC_BROWSER_TEST_F(MojoPPAPITest, MAYBE_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