Disable PPAPI*NaCl* tests in the disable_nacl=1 builds

chrome/test/ppapi/ppapi_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/ppapi/ppapi_test.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
@@ skipping 328 matching lines @@
   PPAPITest::SetUpCommandLine(command_line);
   command_line->AppendSwitch(switches::kUseFakeDeviceForMediaStream);
   command_line->AppendSwitch(switches::kUseFakeUIForMediaStream);
 }
 
 void OutOfProcessPPAPIPrivateTest::SetUpCommandLine(CommandLine* command_line) {
   OutOfProcessPPAPITest::SetUpCommandLine(command_line);
   AddPrivateSwitches(command_line);
 }
 
+#if defined(DISABLE_NACL)

[raymes, 2014/02/18 23:20:08]

Consider putting this right at the top of the file above the anonymous
namespace.

[Alexander Potapenko, 2014/02/19 13:47:02]

Done.

+#define RETURN_IF_NO_NACL() do { \
+  LOG(WARNING) << "This test always passes with disable_nacl=1."; \
+  return; } while (0)
+#else
+#define RETURN_IF_NO_NACL() do { } while (0)
+#endif
+
 void PPAPINaClTest::SetUpCommandLine(CommandLine* command_line) {
   PPAPITestBase::SetUpCommandLine(command_line);
+  RETURN_IF_NO_NACL();

[raymes, 2014/02/18 23:20:08]

Should this just go right at the top of the function if the test won't run
anyway?

[Alexander Potapenko, 2014/02/19 13:47:02]

Done.

 
   base::FilePath plugin_lib;
   EXPECT_TRUE(PathService::Get(chrome::FILE_NACL_PLUGIN, &plugin_lib));
   EXPECT_TRUE(base::PathExists(plugin_lib));
 
   // Enable running (non-portable) NaCl outside of the Chrome web store.
   command_line->AppendSwitch(switches::kEnableNaCl);
   command_line->AppendSwitchASCII(switches::kAllowNaClSocketAPI, "127.0.0.1");
   command_line->AppendSwitch(switches::kUseFakeDeviceForMediaStream);
   command_line->AppendSwitch(switches::kUseFakeUIForMediaStream);
 }
 
+void PPAPINaClTest::RunTestAndReload(const std::string& test_case) {
+  RETURN_IF_NO_NACL();
+  PPAPITestBase::RunTestAndReload(test_case);
+}
+
+void PPAPINaClTest::RunTestViaHTTP(const std::string& test_case) {
+  RETURN_IF_NO_NACL();
+  PPAPITestBase::RunTestViaHTTP(test_case);
+}
+
+void PPAPINaClTest::RunTestWithSSLServer(const std::string& test_case) {
+  RETURN_IF_NO_NACL();
+  PPAPITestBase::RunTestWithSSLServer(test_case);
+}
+
+void PPAPINaClTest::RunTestWithWebSocketServer(const std::string& test_case) {
+  RETURN_IF_NO_NACL();
+  PPAPITestBase::RunTestWithWebSocketServer(test_case);
+}
+
+void PPAPINaClTest::RunTestIfAudioOutputAvailable(
+    const std::string& test_case) {
+  RETURN_IF_NO_NACL();
+  PPAPITestBase::RunTestIfAudioOutputAvailable(test_case);
+}
+
+void PPAPINaClTest::RunTestViaHTTPIfAudioOutputAvailable(
+      const std::string& test_case) {

[raymes, 2014/02/18 23:20:08]

indentation is slightly off - 2 spaces too many I think

[Alexander Potapenko, 2014/02/19 13:47:02]

Done.

+  RETURN_IF_NO_NACL();
+  PPAPITestBase::RunTestViaHTTPIfAudioOutputAvailable(test_case);
+}
+
 // Append the correct mode and testcase string
 std::string PPAPINaClNewlibTest::BuildQuery(const std::string& base,
                                             const std::string& test_case) {
   return base::StringPrintf("%smode=nacl_newlib&testcase=%s", base.c_str(),
                             test_case.c_str());
 }
 
 void PPAPIPrivateNaClNewlibTest::SetUpCommandLine(CommandLine* command_line) {
   PPAPINaClNewlibTest::SetUpCommandLine(command_line);
   AddPrivateSwitches(command_line);
@@ skipping 40 matching lines @@
     const std::string& base,
     const std::string& test_case) {
   return base::StringPrintf("%smode=nacl_newlib&testcase=%s", base.c_str(),
                             test_case.c_str());
 }
 
 void PPAPIBrokerInfoBarTest::SetUpOnMainThread() {
   // The default content setting for the PPAPI broker is ASK. We purposefully
   // don't call PPAPITestBase::SetUpOnMainThread() to keep it that way.
 }