Non-SFI mode: Enable browser_tests for nacl_helper_nonsfi.

chrome/test/ppapi/ppapi_test.h

 // 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.
 
 #ifndef CHROME_TEST_PPAPI_PPAPI_TEST_H_
 #define CHROME_TEST_PPAPI_PPAPI_TEST_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 165 matching lines @@
 
 // Test Non-SFI Mode, using PNaCl toolchain to produce nexes.
 class PPAPINaClPNaClNonSfiTest : public PPAPINaClTest {
  public:
   virtual void SetUpCommandLine(base::CommandLine* command_line);
 
   virtual std::string BuildQuery(const std::string& base,
                                  const std::string& test_case) override;
 };
 
+// TODO(hidehiko): Switch NonSfi tests to use nacl_helper_nonsfi, when
+// it is launched officially. See NaClBrowserTestPnaclTransitionalNonSfi
+// for more details.
+class PPAPINaClPNaClTransitionalNonSfiTest : public PPAPINaClPNaClNonSfiTest {
+ public:
+  virtual void SetUpCommandLine(base::CommandLine* command_line) override;
+};
+
 class PPAPIPrivateNaClPNaClNonSfiTest : public PPAPINaClPNaClNonSfiTest {
  protected:
   virtual void SetUpCommandLine(base::CommandLine* command_line) override;
 };
 
+// TODO(hidehiko): Switch NonSfi tests to use nacl_helper_nonsfi, when
+// it is launched officially. See NaClBrowserTestPnaclTransitionalNonSfi
+// for more details.
+class PPAPIPrivateNaClPNaClTransitionalNonSfiTest
+    : public PPAPIPrivateNaClPNaClNonSfiTest {
+ protected:
+  virtual void SetUpCommandLine(base::CommandLine* command_line) override;
+};
+
+
 class PPAPINaClTestDisallowedSockets : public PPAPITestBase {
  public:
   virtual void SetUpCommandLine(base::CommandLine* command_line) override;
 
   virtual std::string BuildQuery(const std::string& base,
                                  const std::string& test_case) override;
 };
 
 class PPAPIBrokerInfoBarTest : public OutOfProcessPPAPITest {
  public:
   // PPAPITestBase override:
   virtual void SetUpOnMainThread() override;
 };
 
 #endif  // CHROME_TEST_PPAPI_PPAPI_TEST_H_