Fix "unreachable code" warnings (MSVC warning 4702) in a PPAPI test.

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 13 matching lines @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "net/base/net_util.h"
 #include "net/base/test_data_directory.h"
 #include "ppapi/shared_impl/ppapi_switches.h"
 #include "ui/gl/gl_switches.h"
 
 using content::DomOperationNotificationDetails;
 using content::RenderViewHost;
 
-#if defined(DISABLE_NACL)
-#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
-
 namespace {
 
 // Platform-specific filename relative to the chrome executable.
 #if defined(OS_WIN)
 const wchar_t library_name[] = L"ppapi_tests.dll";
 #elif defined(OS_MACOSX)
 const char library_name[] = "ppapi_tests.plugin";
 #elif defined(OS_POSIX)
 const char library_name[] = "libppapi_tests.so";
 #endif
@@ skipping 298 matching lines @@
   command_line->AppendSwitch(switches::kUseFakeUIForMediaStream);
 }
 
 void OutOfProcessPPAPIPrivateTest::SetUpCommandLine(
     base::CommandLine* command_line) {
   OutOfProcessPPAPITest::SetUpCommandLine(command_line);
   AddPrivateSwitches(command_line);
 }
 
 void PPAPINaClTest::SetUpCommandLine(base::CommandLine* command_line) {
-  RETURN_IF_NO_NACL();
+#if !defined(DISABLE_NACL)
   PPAPITestBase::SetUpCommandLine(command_line);
 
   // 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);
+#endif
 }
 
 void PPAPINaClTest::SetUpOnMainThread() {
   base::FilePath plugin_lib;
   EXPECT_TRUE(PathService::Get(chrome::FILE_NACL_PLUGIN, &plugin_lib));
   EXPECT_TRUE(base::PathExists(plugin_lib));
 }
 
 void PPAPINaClTest::RunTest(const std::string& test_case) {
-  RETURN_IF_NO_NACL();
+#if !defined(DISABLE_NACL)
   PPAPITestBase::RunTest(test_case);
+#endif
 }
 
 void PPAPINaClTest::RunTestAndReload(const std::string& test_case) {
-  RETURN_IF_NO_NACL();
+#if !defined(DISABLE_NACL)
   PPAPITestBase::RunTestAndReload(test_case);
+#endif
 }
 
 void PPAPINaClTest::RunTestViaHTTP(const std::string& test_case) {
-  RETURN_IF_NO_NACL();
+#if !defined(DISABLE_NACL)
   PPAPITestBase::RunTestViaHTTP(test_case);
+#endif
 }
 
 void PPAPINaClTest::RunTestWithSSLServer(const std::string& test_case) {
-  RETURN_IF_NO_NACL();
+#if !defined(DISABLE_NACL)
   PPAPITestBase::RunTestWithSSLServer(test_case);
+#endif
 }
 
 void PPAPINaClTest::RunTestWithWebSocketServer(const std::string& test_case) {
-  RETURN_IF_NO_NACL();
+#if !defined(DISABLE_NACL)
   PPAPITestBase::RunTestWithWebSocketServer(test_case);
+#endif
 }
 
 void PPAPINaClTest::RunTestIfAudioOutputAvailable(
     const std::string& test_case) {
-  RETURN_IF_NO_NACL();
+#if !defined(DISABLE_NACL)
   PPAPITestBase::RunTestIfAudioOutputAvailable(test_case);
+#endif
 }
 
 void PPAPINaClTest::RunTestViaHTTPIfAudioOutputAvailable(
     const std::string& test_case) {
-  RETURN_IF_NO_NACL();
+#if !defined(DISABLE_NACL)
   PPAPITestBase::RunTestViaHTTPIfAudioOutputAvailable(test_case);
+#endif
 }
 
 // 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(
@@ skipping 45 matching lines @@
 }
 
 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.
 
   base::FilePath plugin_lib;
   EXPECT_TRUE(PathService::Get(chrome::FILE_NACL_PLUGIN, &plugin_lib));
   EXPECT_TRUE(base::PathExists(plugin_lib));
 }