summaryrefslogtreecommitdiffstats
path: root/chrome/test/ppapi
diff options
context:
space:
mode:
authortimurrrr <timurrrr@chromium.org>2014-12-30 05:43:48 -0800
committerCommit bot <commit-bot@chromium.org>2014-12-30 13:44:35 +0000
commit60002823dd8bf9bcebdc24e6bc921e6b2d4a983a (patch)
tree51c1bade788e429e15e493690266a2756e5ba0b4 /chrome/test/ppapi
parentbeff9b50329fe17018039f103dba8a05bd18b353 (diff)
downloadchromium_src-60002823dd8bf9bcebdc24e6bc921e6b2d4a983a.zip
chromium_src-60002823dd8bf9bcebdc24e6bc921e6b2d4a983a.tar.gz
chromium_src-60002823dd8bf9bcebdc24e6bc921e6b2d4a983a.tar.bz2
Fix the disable_nacl=1 build
TBR=teravest@chromium.org Review URL: https://codereview.chromium.org/787143003 Cr-Commit-Position: refs/heads/master@{#309760}
Diffstat (limited to 'chrome/test/ppapi')
-rw-r--r--chrome/test/ppapi/ppapi_browsertest.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/test/ppapi/ppapi_browsertest.cc b/chrome/test/ppapi/ppapi_browsertest.cc
index d53a59c..fb9c517 100644
--- a/chrome/test/ppapi/ppapi_browsertest.cc
+++ b/chrome/test/ppapi/ppapi_browsertest.cc
@@ -1549,6 +1549,7 @@ IN_PROC_BROWSER_TEST_F(TransitionalNonSfiPackagedAppTest,
RunTests();
}
+#if !defined(DISABLE_NACL)
class MojoPPAPITest : public InProcessBrowserTest {
public:
MojoPPAPITest() : InProcessBrowserTest() { }
@@ -1602,3 +1603,4 @@ IN_PROC_BROWSER_TEST_F(MojoPPAPITest, MAYBE_MOJO(Mojo)) {
IN_PROC_BROWSER_TEST_F(MojoPPAPITest, MAYBE_MOJO(MojoFailsWithoutFlag)) {
RunTestWithoutFlag();
}
+#endif