Non-SFI mode: Enable browser_tests for nacl_helper_nonsfi.

chrome/test/ppapi/ppapi_test.cc

Index: chrome/test/ppapi/ppapi_test.cc
diff --git a/chrome/test/ppapi/ppapi_test.cc b/chrome/test/ppapi/ppapi_test.cc
index 87d50a4c56a47ef9b3b6eac8b1cc575f9928bb43..7c980660a029e6934a11b7b022b85ae305f70813 100644
--- a/chrome/test/ppapi/ppapi_test.cc
+++ b/chrome/test/ppapi/ppapi_test.cc
@@ -334,9 +334,8 @@ void OutOfProcessPPAPIPrivateTest::SetUpCommandLine(
 }
 
 void PPAPINaClTest::SetUpCommandLine(base::CommandLine* command_line) {
-#if !defined(DISABLE_NACL)
   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)
   // 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");
@@ -427,8 +426,8 @@ void PPAPIPrivateNaClPNaClTest::SetUpCommandLine(
 
 void PPAPINaClPNaClNonSfiTest::SetUpCommandLine(
     base::CommandLine* command_line) {
-#if !defined(DISABLE_NACL)
   PPAPINaClTest::SetUpCommandLine(command_line);
+#if !defined(DISABLE_NACL)
   command_line->AppendSwitch(switches::kEnableNaClNonSfiMode);
 #endif
 }
@@ -440,12 +439,28 @@ std::string PPAPINaClPNaClNonSfiTest::BuildQuery(
                             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);