Non-SFI mode: Enable browser_tests for nacl_helper_nonsfi.

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/files/file_util.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
@@ skipping 316 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) {
+  PPAPITestBase::SetUpCommandLine(command_line);

[Mark Seaborn, 2014/11/19 06:23:54]

I'm not sure why you're moving this.  Isn't it simpler to keep these SetUp calls
inside the #ifs?

[hidehiko, 2014/11/19 18:48:51]

Should be out of #if, IMHO.
As PPAPITetsBase::SetUpCommandLine does something regardless DISABLE_NACL macro,
so it should be called.

 #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() {
 }
@@ skipping 70 matching lines @@
 }
 
 void PPAPIPrivateNaClPNaClTest::SetUpCommandLine(
     base::CommandLine* command_line) {
   PPAPINaClPNaClTest::SetUpCommandLine(command_line);
   AddPrivateSwitches(command_line);
 }
 
 void PPAPINaClPNaClNonSfiTest::SetUpCommandLine(
     base::CommandLine* command_line) {
+  PPAPINaClTest::SetUpCommandLine(command_line);
 #if !defined(DISABLE_NACL)
-  PPAPINaClTest::SetUpCommandLine(command_line);
   command_line->AppendSwitch(switches::kEnableNaClNonSfiMode);
 #endif
 }
 
 std::string PPAPINaClPNaClNonSfiTest::BuildQuery(
     const std::string& base,
     const std::string& test_case) {
   return base::StringPrintf("%smode=nacl_pnacl_nonsfi&testcase=%s",
                             base.c_str(), test_case.c_str());
 }
 
+void PPAPINaClPNaClTransitionalNonSfiTest::SetUpCommandLine(
+    base::CommandLine* command_line) {
+  PPAPINaClPNaClNonSfiTest::SetUpCommandLine(command_line);
+#if !defined(DISABLE_NACL)
+  command_line->AppendSwitch(switches::kUseNaClHelperNonSfi);
+#endif
+}
+
 void PPAPIPrivateNaClPNaClNonSfiTest::SetUpCommandLine(
     base::CommandLine* command_line) {
   PPAPINaClPNaClNonSfiTest::SetUpCommandLine(command_line);
   AddPrivateSwitches(command_line);
 }
 
+void PPAPIPrivateNaClPNaClTransitionalNonSfiTest::SetUpCommandLine(
+    base::CommandLine* command_line) {
+  PPAPIPrivateNaClPNaClNonSfiTest::SetUpCommandLine(command_line);
+#if !defined(DISABLE_NACL)
+  command_line->AppendSwitch(switches::kUseNaClHelperNonSfi);
+#endif
+}
+
 void PPAPINaClTestDisallowedSockets::SetUpCommandLine(
     base::CommandLine* command_line) {
   PPAPITestBase::SetUpCommandLine(command_line);
 
   // Enable running (non-portable) NaCl outside of the Chrome web store.
   command_line->AppendSwitch(switches::kEnableNaCl);
 }
 
 // Append the correct mode and testcase string
 std::string PPAPINaClTestDisallowedSockets::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 PPAPIBrokerInfoBarTest::SetUpOnMainThread() {
   // The default content setting for the PPAPI broker is ASK. We purposefully
   // don't call PPAPITestBase::SetUpOnMainThread() to keep it that way.
 }