Non-SFI mode: Enable browser_tests for nacl_helper_nonsfi.

chrome/test/ppapi/ppapi_browsertest.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 "base/path_service.h"
 #include "base/test/test_timeouts.h"
 #include "build/build_config.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 70 matching lines @@
     } \
     IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(test_name)) { \
       RunTestViaHTTP(STRIP_PREFIXES(test_name)); \
     } \
     IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, test_name) { \
       RunTestViaHTTP(STRIP_PREFIXES(test_name)); \
     } \
     IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, \
                            MAYBE_PNACL_NONSFI(test_name)) { \
       RunTestViaHTTP(STRIP_PREFIXES(test_name)); \
+    } \
+    IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest, \
+                           MAYBE_PNACL_TRANSITIONAL_NONSFI(test_name)) { \
+      RunTestViaHTTP(STRIP_PREFIXES(test_name)); \
     }
 
 // NaCl based PPAPI tests
 #define TEST_PPAPI_NACL_SUBTESTS(test_name, run_statement) \
     IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, test_name) { \
       run_statement; \
     } \
     IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(test_name)) { \
       run_statement; \
     } \
     IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, test_name) { \
       run_statement; \
     } \
     IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, \
                            MAYBE_PNACL_NONSFI(test_name)) { \
       run_statement; \
+    } \
+    IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest, \
+                           MAYBE_PNACL_TRANSITIONAL_NONSFI(test_name)) { \
+      run_statement; \
     }
 
 // NaCl based PPAPI tests with disallowed socket API
 #define TEST_PPAPI_NACL_DISALLOWED_SOCKETS(test_name) \
     IN_PROC_BROWSER_TEST_F(PPAPINaClTestDisallowedSockets, test_name) { \
       RunTestViaHTTP(STRIP_PREFIXES(test_name)); \
     }
 
 // NaCl based PPAPI tests with SSL server
 #define TEST_PPAPI_NACL_WITH_SSL_SERVER(test_name) \
     IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, test_name) { \
       RunTestWithSSLServer(STRIP_PREFIXES(test_name)); \
     } \
     IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(test_name)) { \
       RunTestWithSSLServer(STRIP_PREFIXES(test_name)); \
     } \
     IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, test_name) { \
       RunTestWithSSLServer(STRIP_PREFIXES(test_name)); \
     } \
     IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, \
                            MAYBE_PNACL_NONSFI(test_name)) { \
       RunTestWithSSLServer(STRIP_PREFIXES(test_name)); \
+    } \
+    IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest, \
+                           MAYBE_PNACL_TRANSITIONAL_NONSFI(test_name)) { \
+      RunTestWithSSLServer(STRIP_PREFIXES(test_name)); \
     }
 
+
 #endif  // DISABLE_NACL
 
 //
 // Interface tests.
 //
 
 TEST_PPAPI_IN_PROCESS(Broker)
 // Flaky, http://crbug.com/111355
 TEST_PPAPI_OUT_OF_PROCESS(DISABLED_Broker)
 
@@ skipping 152 matching lines @@
 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(TCPSocket)) {
   RUN_TCPSOCKET_SUBTESTS;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, TCPSocket) {
   RUN_TCPSOCKET_SUBTESTS;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest,
                        MAYBE_PNACL_NONSFI(TCPSocket)) {
   RUN_TCPSOCKET_SUBTESTS;
 }
+IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest,
+                       MAYBE_PNACL_NONSFI(TCPSocket)) {
+  RUN_TCPSOCKET_SUBTESTS;
+}
 
+
 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(TCPServerSocketPrivate)
 TEST_PPAPI_NACL(TCPServerSocketPrivate)
 
 TEST_PPAPI_OUT_OF_PROCESS_WITH_SSL_SERVER(TCPSocketPrivate)
 TEST_PPAPI_NACL_WITH_SSL_SERVER(TCPSocketPrivate)
 
 TEST_PPAPI_OUT_OF_PROCESS_WITH_SSL_SERVER(TCPSocketPrivateTrusted)
 
 // UDPSocket tests.
 // UDPSocket_Broadcast is disabled for OSX because it requires root
@@ skipping 20 matching lines @@
 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(UDPSocket)) {
   RUN_UDPSOCKET_SUBTESTS;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, UDPSocket) {
   RUN_UDPSOCKET_SUBTESTS;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest,
                        MAYBE_PNACL_NONSFI(UDPSocket)) {
   RUN_UDPSOCKET_SUBTESTS;
 }
+IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest,
+                       MAYBE_PNACL_TRANSITIONAL_NONSFI(UDPSocket)) {
+  RUN_UDPSOCKET_SUBTESTS;
+}
 
 
 // UDPSocketPrivate tests.
 // UDPSocketPrivate_Broadcast is disabled for OSX because it requires root
 // permissions on OSX 10.7+.
 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(UDPSocketPrivate_Connect)
 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(UDPSocketPrivate_ConnectFailure)
 #if !defined(OS_MACOSX)
 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(UDPSocketPrivate_Broadcast)
 #endif  // !defined(OS_MACOSX)
@@ skipping 28 matching lines @@
 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(HostResolver)) {
   RUN_HOST_RESOLVER_SUBTESTS;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, HostResolver) {
   RUN_HOST_RESOLVER_SUBTESTS;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest,
                        MAYBE_PNACL_NONSFI(HostResolver)) {
   RUN_HOST_RESOLVER_SUBTESTS;
 }
+IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest,
+                       MAYBE_PNACL_TRANSITIONAL_NONSFI(HostResolver)) {
+  RUN_HOST_RESOLVER_SUBTESTS;
+}
 
 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(HostResolverPrivate_Resolve)
 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(HostResolverPrivate_ResolveIPv4)
 TEST_PPAPI_NACL(HostResolverPrivate_Resolve)
 TEST_PPAPI_NACL(HostResolverPrivate_ResolveIPv4)
 
 // URLLoader tests. These are split into multiple test fixtures because if we
 // run them all together, they tend to time out.
 #define RUN_URLLOADER_SUBTESTS_0 \
   RunTestViaHTTP( \
@@ skipping 141 matching lines @@
   RUN_URLLOADER_SUBTESTS_1;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest,
                        MAYBE_PNACL_NONSFI(URLLoader2)) {
   RUN_URLLOADER_SUBTESTS_2;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest,
                        MAYBE_PNACL_NONSFI(URLLoader3)) {
   RUN_URLLOADER_SUBTESTS_3;
 }
+IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest,
+                       MAYBE_PNACL_TRANSITIONAL_NONSFI(URLLoader0)) {
+  RUN_URLLOADER_SUBTESTS_0;
+}
+IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest,
+                       MAYBE_PNACL_TRANSITIONAL_NONSFI(URLLoader1)) {
+  RUN_URLLOADER_SUBTESTS_1;
+}
+IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest,
+                       MAYBE_PNACL_TRANSITIONAL_NONSFI(URLLoader2)) {
+  RUN_URLLOADER_SUBTESTS_2;
+}
+IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest,
+                       MAYBE_PNACL_TRANSITIONAL_NONSFI(URLLoader3)) {
+  RUN_URLLOADER_SUBTESTS_3;
+}
+
 
 // URLRequestInfo tests.
 TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLRequest_CreateAndIsURLRequestInfo)
 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLRequest_CreateAndIsURLRequestInfo)
 
 // Timing out on Windows. http://crbug.com/129571
 #if defined(OS_WIN)
 #define MAYBE_URLRequest_CreateAndIsURLRequestInfo \
   DISABLED_URLRequest_CreateAndIsURLRequestInfo
 #else
@@ skipping 63 matching lines @@
 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(PostMessage)) {
   RUN_POSTMESSAGE_SUBTESTS;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, PostMessage) {
   RUN_POSTMESSAGE_SUBTESTS;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest,
                        MAYBE_PNACL_NONSFI(PostMessage)) {
   RUN_POSTMESSAGE_SUBTESTS;
 }
+IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest,
+                       MAYBE_PNACL_TRANSITIONAL_NONSFI(PostMessage)) {
+  RUN_POSTMESSAGE_SUBTESTS;
+}
 
 TEST_PPAPI_NACL(Memory)
 
 // FileIO tests.
 #define RUN_FILEIO_SUBTESTS \
   RunTestViaHTTP( \
       LIST_TEST(FileIO_Open) \
       LIST_TEST(FileIO_OpenDirectory) \
       LIST_TEST(FileIO_AbortCalls) \
       LIST_TEST(FileIO_ParallelReads) \
@@ skipping 59 matching lines @@
   RUN_FILEIO_SUBTESTS;
 }
 IN_PROC_BROWSER_TEST_F(PPAPIPrivateNaClPNaClTest,
                        DISABLED_PNaCl_FileIO_Private) {
   RUN_FILEIO_PRIVATE_SUBTESTS;
 }
 
 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, MAYBE_PNACL_NONSFI(FileIO)) {
   RUN_FILEIO_SUBTESTS;
 }
-IN_PROC_BROWSER_TEST_F(PPAPIPrivateNaClPNaClTest,
+IN_PROC_BROWSER_TEST_F(PPAPIPrivateNaClPNaClNonSfiTest,
                        MAYBE_PNACL_NONSFI(FILEIO_Private)) {
   RUN_FILEIO_PRIVATE_SUBTESTS;
 }
 
+IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest,
+                       MAYBE_PNACL_TRANSITIONAL_NONSFI(FileIO)) {
+  RUN_FILEIO_SUBTESTS;
+}
+IN_PROC_BROWSER_TEST_F(PPAPIPrivateNaClPNaClTransitionalNonSfiTest,
+                       MAYBE_PNACL_TRANSITIONAL_NONSFI(FILEIO_Private)) {
+  RUN_FILEIO_PRIVATE_SUBTESTS;
+}
+
 // PPB_FileMapping is only implemented on POSIX currently.
 // http://crbug.com/83774
 #if defined(OS_WIN)
 #define MAYBE_FileMapping DISABLED_FileMapping
 #else
 #define MAYBE_FileMapping FileMapping
 #endif
 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(MAYBE_FileMapping)
 TEST_PPAPI_NACL(MAYBE_FileMapping)
 
@@ skipping 64 matching lines @@
   RUN_FILEREF_SUBTESTS_2;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest,
                        MAYBE_PNACL_NONSFI(FileRef1)) {
   RUN_FILEREF_SUBTESTS_1;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest,
                        MAYBE_PNACL_NONSFI(FileRef2)) {
   RUN_FILEREF_SUBTESTS_2;
 }
+IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest,
+                       MAYBE_PNACL_TRANSITIONAL_NONSFI(FileRef1)) {
+  RUN_FILEREF_SUBTESTS_1;
+}
+IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest,
+                       MAYBE_PNACL_TRANSITIONAL_NONSFI(FileRef2)) {
+  RUN_FILEREF_SUBTESTS_2;
+}
 
 TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileSystem)
 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileSystem)
 
 // PPAPINaClTest.FileSystem times out consistently on Windows and Mac.
 // http://crbug.com/130372
 #if defined(OS_MACOSX) || defined(OS_WIN)
 #define MAYBE_FileSystem DISABLED_FileSystem
 #else
 #define MAYBE_FileSystem FileSystem
@@ skipping 41 matching lines @@
 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(NetAddress)) {
   RUN_NETADDRESS_SUBTESTS;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, NetAddress) {
   RUN_NETADDRESS_SUBTESTS;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest,
                        MAYBE_PNACL_NONSFI(NetAddress)) {
   RUN_NETADDRESS_SUBTESTS;
 }
+IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest,
+                       MAYBE_PNACL_TRANSITIONAL_NONSFI(NetAddress)) {
+  RUN_NETADDRESS_SUBTESTS;
+}
 
 // NetAddressPrivate tests.
 #define RUN_NETADDRESS_PRIVATE_SUBTESTS \
   RunTestViaHTTP( \
       LIST_TEST(NetAddressPrivate_AreEqual) \
       LIST_TEST(NetAddressPrivate_AreHostsEqual) \
       LIST_TEST(NetAddressPrivate_Describe) \
       LIST_TEST(NetAddressPrivate_ReplacePort) \
       LIST_TEST(NetAddressPrivate_GetAnyAddress) \
       LIST_TEST(NetAddressPrivate_DescribeIPv6) \
@@ skipping 28 matching lines @@
 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(NetAddressPrivate)) {
   RUN_NETADDRESS_PRIVATE_UNTRUSTED_SUBTESTS;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, NetAddressPrivate) {
   RUN_NETADDRESS_PRIVATE_UNTRUSTED_SUBTESTS;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest,
                        MAYBE_PNACL_NONSFI(NetAddressPrivate)) {
   RUN_NETADDRESS_PRIVATE_UNTRUSTED_SUBTESTS;
 }
+IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest,
+                       MAYBE_PNACL_TRANSITIONAL_NONSFI(NetAddressPrivate)) {
+  RUN_NETADDRESS_PRIVATE_UNTRUSTED_SUBTESTS;
+}
 
 // NetworkMonitor tests.
 #define RUN_NETWORK_MONITOR_SUBTESTS \
   RunTestViaHTTP( \
       LIST_TEST(NetworkMonitor_Basic) \
       LIST_TEST(NetworkMonitor_2Monitors) \
       LIST_TEST(NetworkMonitor_DeleteInCallback) \
   )
 
 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, NetworkMonitor) {
   RUN_NETWORK_MONITOR_SUBTESTS;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, NetworkMonitor) {
   RUN_NETWORK_MONITOR_SUBTESTS;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(NetworkMonitor)) {
   RUN_NETWORK_MONITOR_SUBTESTS;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, NetworkMonitor) {
   RUN_NETWORK_MONITOR_SUBTESTS;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest,
                        MAYBE_PNACL_NONSFI(NetworkMonitor)) {
   RUN_NETWORK_MONITOR_SUBTESTS;
 }
+IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest,
+                       MAYBE_PNACL_TRANSITIONAL_NONSFI(NetworkMonitor)) {
+  RUN_NETWORK_MONITOR_SUBTESTS;
+}
 
 // Flash tests.
 #define RUN_FLASH_SUBTESTS \
   RunTestViaHTTP( \
       LIST_TEST(Flash_SetInstanceAlwaysOnTop) \
       LIST_TEST(Flash_GetCommandLineArgs) \
   )
 
 IN_PROC_BROWSER_TEST_F(PPAPITest, Flash) {
   RUN_FLASH_SUBTESTS;
@@ skipping 73 matching lines @@
   RUN_WEBSOCKET_SUBTESTS_2;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest,
                        MAYBE_PNACL_NONSFI(WebSocket1)) {
   RUN_WEBSOCKET_SUBTESTS_1;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest,
                        MAYBE_PNACL_NONSFI(WebSocket2)) {
   RUN_WEBSOCKET_SUBTESTS_2;
 }
+IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest,
+                       MAYBE_PNACL_TRANSITIONAL_NONSFI(WebSocket1)) {
+  RUN_WEBSOCKET_SUBTESTS_1;
+}
+IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest,
+                       MAYBE_PNACL_TRANSITIONAL_NONSFI(WebSocket2)) {
+  RUN_WEBSOCKET_SUBTESTS_2;
+}
 
 // AudioConfig tests
 #define RUN_AUDIO_CONFIG_SUBTESTS \
   RunTestViaHTTP( \
       LIST_TEST(AudioConfig_RecommendSampleRate) \
       LIST_TEST(AudioConfig_ValidConfigs) \
       LIST_TEST(AudioConfig_InvalidConfigs) \
   )
 
 IN_PROC_BROWSER_TEST_F(PPAPITest, AudioConfig) {
   RUN_AUDIO_CONFIG_SUBTESTS;
 }
 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, AudioConfig) {
   RUN_AUDIO_CONFIG_SUBTESTS;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, AudioConfig) {
   RUN_AUDIO_CONFIG_SUBTESTS;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(AudioConfig)) {
   RUN_AUDIO_CONFIG_SUBTESTS;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, AudioConfig) {
   RUN_AUDIO_CONFIG_SUBTESTS;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest,
                        MAYBE_PNACL_NONSFI(AudioConfig)) {
   RUN_AUDIO_CONFIG_SUBTESTS;
 }
+IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest,
+                       MAYBE_PNACL_TRANSITIONAL_NONSFI(AudioConfig)) {
+  RUN_AUDIO_CONFIG_SUBTESTS;
+}
 
 // PPB_Audio tests.
 #define RUN_AUDIO_SUBTESTS \
   RunTestViaHTTP( \
       LIST_TEST(Audio_Creation) \
       LIST_TEST(Audio_DestroyNoStop) \
       LIST_TEST(Audio_Failures) \
       LIST_TEST(Audio_AudioCallback1) \
       LIST_TEST(Audio_AudioCallback2) \
       LIST_TEST(Audio_AudioCallback3) \
@@ skipping 16 matching lines @@
 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(Audio)) {
   RUN_AUDIO_SUBTESTS;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, Audio) {
   RUN_AUDIO_SUBTESTS;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest,
                        MAYBE_PNACL_NONSFI(Audio)) {
   RUN_AUDIO_SUBTESTS;
 }
+IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest,
+                       MAYBE_PNACL_TRANSITIONAL_NONSFI(Audio)) {
+  RUN_AUDIO_SUBTESTS;
+}
 
 #define RUN_AUDIO_THREAD_CREATOR_SUBTESTS \
   RunTestViaHTTP( \
       LIST_TEST(Audio_AudioThreadCreatorIsRequired) \
       LIST_TEST(Audio_AudioThreadCreatorIsCalled) \
   )
 
 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, AudioThreadCreator) {
   RUN_AUDIO_THREAD_CREATOR_SUBTESTS;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(AudioThreadCreator)) {
   RUN_AUDIO_THREAD_CREATOR_SUBTESTS;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, AudioThreadCreator) {
   RUN_AUDIO_THREAD_CREATOR_SUBTESTS;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest,
                        MAYBE_PNACL_NONSFI(AudioThreadCreator)) {
   RUN_AUDIO_THREAD_CREATOR_SUBTESTS;
 }
+IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest,
+                       MAYBE_PNACL_TRANSITIONAL_NONSFI(AudioThreadCreator)) {
+  RUN_AUDIO_THREAD_CREATOR_SUBTESTS;
+}
 
 TEST_PPAPI_IN_PROCESS(View_CreatedVisible);
 TEST_PPAPI_OUT_OF_PROCESS(View_CreatedVisible);
 TEST_PPAPI_NACL(View_CreatedVisible);
 // This test ensures that plugins created in a background tab have their
 // initial visibility set to false. We don't bother testing in-process for this
 // custom test since the out of process code also exercises in-process.
 
 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, View_CreateInvisible) {
   // Make a second tab in the foreground.
@@ skipping 73 matching lines @@
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(View)) {
   RUN_VIEW_SUBTESTS;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, View) {
   RUN_VIEW_SUBTESTS;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, MAYBE_PNACL_NONSFI(View)) {
   RUN_VIEW_SUBTESTS;
 }
+IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest,
+                       MAYBE_PNACL_TRANSITIONAL_NONSFI(View)) {
+  RUN_VIEW_SUBTESTS;
+}
 
 // FlashMessageLoop tests.
 #define RUN_FLASH_MESSAGE_LOOP_SUBTESTS \
   RunTest( \
       LIST_TEST(FlashMessageLoop_Basics) \
       LIST_TEST(FlashMessageLoop_RunWithoutQuit) \
   )
 
 IN_PROC_BROWSER_TEST_F(PPAPITest, FlashMessageLoop) {
   RUN_FLASH_MESSAGE_LOOP_SUBTESTS;
@@ skipping 163 matching lines @@
   NonSfiPackagedAppTest() : PackagedAppTest("nonsfi") { }
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
 #if !defined(DISABLE_NACL)
     PackagedAppTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(switches::kEnableNaClNonSfiMode);
 #endif
   }
 };
 
+// TODO(hidehiko): Switch for NonSfi tests to use nacl_helper_nonsfi, when
+// it is launched officially. See NaClBrowserTestPnaclTransitionalNonSfi
+// for more details.
+class TransitionalNonSfiPackagedAppTest : public NonSfiPackagedAppTest {
+ public:
+  void SetUpCommandLine(base::CommandLine* command_line) override {
+    NonSfiPackagedAppTest::SetUpCommandLine(command_line);
+    command_line->AppendSwitch(switches::kUseNaClHelperNonSfi);
+  }
+};
+
 // Load a packaged app, and wait for it to successfully post a "hello" message
 // back.
 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, SuccessfulLoad) {
   RunTests();
 }
 
 IN_PROC_BROWSER_TEST_F(NonSfiPackagedAppTest,
                        MAYBE_PNACL_NONSFI(SuccessfulLoad)) {
   RunTests();
 }
+
+IN_PROC_BROWSER_TEST_F(TransitionalNonSfiPackagedAppTest,
+                       MAYBE_PNACL_TRANSITIONAL_NONSFI(SuccessfulLoad)) {
+  RunTests();
+}