Non-SFI mode: Enable browser_tests for nacl_helper_nonsfi.

chrome/test/ppapi/ppapi_browsertest.cc

Index: chrome/test/ppapi/ppapi_browsertest.cc
diff --git a/chrome/test/ppapi/ppapi_browsertest.cc b/chrome/test/ppapi/ppapi_browsertest.cc
index 3d276bd406af04865bcc7dbeaca618ed2991b2bd..c1b4df2d45698e9c720430f14a985bedbc933dd2 100644
--- a/chrome/test/ppapi/ppapi_browsertest.cc
+++ b/chrome/test/ppapi/ppapi_browsertest.cc
@@ -88,6 +88,10 @@ using content::RenderViewHost;
     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
@@ -104,6 +108,10 @@ using content::RenderViewHost;
     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
@@ -126,8 +134,13 @@ using content::RenderViewHost;
     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
 
 //
@@ -300,6 +313,11 @@ 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)
@@ -341,6 +359,10 @@ 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.
@@ -389,6 +411,10 @@ 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)
@@ -550,6 +576,23 @@ 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)
@@ -633,6 +676,10 @@ 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)
 
@@ -712,11 +759,20 @@ IN_PROC_BROWSER_TEST_F(PPAPIPrivateNaClPNaClTest,
 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)
@@ -801,6 +857,14 @@ 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)
@@ -862,6 +926,10 @@ 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 \
@@ -910,6 +978,10 @@ 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 \
@@ -935,6 +1007,10 @@ 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 \
@@ -1028,6 +1104,14 @@ 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 \
@@ -1056,6 +1140,10 @@ 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 \
@@ -1092,6 +1180,10 @@ 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( \
@@ -1112,6 +1204,10 @@ 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);
@@ -1205,6 +1301,10 @@ IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, View) {
 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 \
@@ -1388,6 +1488,17 @@ class NonSfiPackagedAppTest : public PackagedAppTest {
   }
 };
 
+// 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) {
@@ -1398,3 +1509,8 @@ IN_PROC_BROWSER_TEST_F(NonSfiPackagedAppTest,
                        MAYBE_PNACL_NONSFI(SuccessfulLoad)) {
   RunTests();
 }
+
+IN_PROC_BROWSER_TEST_F(TransitionalNonSfiPackagedAppTest,
+                       MAYBE_PNACL_TRANSITIONAL_NONSFI(SuccessfulLoad)) {
+  RunTests();
+}