Stop running PPAPITest and PPAPINaClGLibcTest Pepper tests.

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 19 matching lines @@
 
 // This macro finesses macro expansion to do what we want.
 #define STRIP_PREFIXES(test_name) ppapi::StripTestPrefixes(#test_name)
 // Turn the given token into a string. This allows us to use precompiler stuff
 // to turn names into DISABLED_Foo, but still pass a string to RunTest.
 #define STRINGIFY(test_name) #test_name
 #define LIST_TEST(test_name) STRINGIFY(test_name) ","
 
 // Use these macros to run the tests for a specific interface.
 // Most interfaces should be tested with both macros.
-#define TEST_PPAPI_IN_PROCESS(test_name) \
-    IN_PROC_BROWSER_TEST_F(PPAPITest, test_name) { \
-      RunTest(STRIP_PREFIXES(test_name)); \
-    }
 #define TEST_PPAPI_OUT_OF_PROCESS(test_name) \
     IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, test_name) { \
       RunTest(STRIP_PREFIXES(test_name)); \
     }
 
 // Similar macros that test over HTTP.
-#define TEST_PPAPI_IN_PROCESS_VIA_HTTP(test_name) \
-    IN_PROC_BROWSER_TEST_F(PPAPITest, test_name) { \
-      RunTestViaHTTP(STRIP_PREFIXES(test_name)); \
-    }
 #define TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(test_name) \
     IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, test_name) { \
       RunTestViaHTTP(STRIP_PREFIXES(test_name)); \
     }
 
 // Similar macros that test with an SSL server.
-#define TEST_PPAPI_IN_PROCESS_WITH_SSL_SERVER(test_name) \
-    IN_PROC_BROWSER_TEST_F(PPAPITest, test_name) { \
-      RunTestWithSSLServer(STRIP_PREFIXES(test_name)); \
-    }
 #define TEST_PPAPI_OUT_OF_PROCESS_WITH_SSL_SERVER(test_name) \
     IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, test_name) { \
       RunTestWithSSLServer(STRIP_PREFIXES(test_name)); \
     }
 
 #if defined(DISABLE_NACL)
 
 #define TEST_PPAPI_NACL(test_name)
 #define TEST_PPAPI_NACL_DISALLOWED_SOCKETS(test_name)
 #define TEST_PPAPI_NACL_WITH_SSL_SERVER(test_name)
 #define TEST_PPAPI_NACL_SUBTESTS(test_name, run_statement)
 
 #else
 
 // NaCl based PPAPI tests
 #define TEST_PPAPI_NACL(test_name) \
     IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, test_name) { \
       RunTestViaHTTP(STRIP_PREFIXES(test_name)); \
     } \
-    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)
 
 IN_PROC_BROWSER_TEST_F(PPAPIBrokerInfoBarTest, Accept) {
   // Accepting the infobar should grant permission to access the PPAPI broker.
   InfoBarObserver observer(this);
   observer.ExpectInfoBarAndAccept(true);
 
   // PPB_Broker_Trusted::IsAllowed should return false before the infobar is
   // popped and true after the infobar is popped.
@@ skipping 106 matching lines @@
 // software compositor is enabled crbug.com/286038
 #define MAYBE_IN_Graphics3D DISABLED_Graphics3D
 #define MAYBE_OUT_Graphics3D DISABLED_Graphics3D
 #define MAYBE_NACL_Graphics3D DISABLED_Graphics3D
 #else
 // The tests are failing in-process. crbug.com/280282
 #define MAYBE_IN_Graphics3D DISABLED_Graphics3D
 #define MAYBE_OUT_Graphics3D Graphics3D
 #define MAYBE_NACL_Graphics3D Graphics3D
 #endif
-TEST_PPAPI_IN_PROCESS(MAYBE_IN_Graphics3D)
 TEST_PPAPI_OUT_OF_PROCESS(MAYBE_OUT_Graphics3D)
 TEST_PPAPI_NACL(MAYBE_NACL_Graphics3D)
 
 TEST_PPAPI_NACL(ImageData)
 
 // TCPSocket and TCPSocketPrivate tests.
 #define RUN_TCPSOCKET_SUBTESTS \
   RunTestViaHTTP( \
       LIST_TEST(TCPSocket_Connect) \
       LIST_TEST(TCPSocket_ReadWrite) \
       LIST_TEST(TCPSocket_SetOption) \
       LIST_TEST(TCPSocket_Listen) \
       LIST_TEST(TCPSocket_Backlog) \
       LIST_TEST(TCPSocket_Interface_1_0) \
   )
 
 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, TCPSocket) {
   RUN_TCPSOCKET_SUBTESTS;
 }
 #if defined(OS_MACOSX) && defined(ADDRESS_SANITIZER)
 // Flaky on Mac ASAN: http://crbug.com/437408 and http://crbug.com/457501.
 #define MAYBE_TCPSocket DISABLED_TCPSocket
 #else
 #define MAYBE_TCPSocket TCPSocket
 #endif
 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, MAYBE_TCPSocket) {
   RUN_TCPSOCKET_SUBTESTS;
 }
-IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(MAYBE_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_TRANSITIONAL_NONSFI(TCPSocket)) {
   RUN_TCPSOCKET_SUBTESTS;
@@ skipping 30 matching lines @@
       LIST_TEST(UDPSocket_SetOption) \
       LIST_TEST(MAYBE_UDPSocket_Broadcast) \
       LIST_TEST(UDPSocket_ParallelSend))
 
 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, UDPSocket) {
   RUN_UDPSOCKET_SUBTESTS;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, UDPSocket) {
   RUN_UDPSOCKET_SUBTESTS;
 }
-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;
@@ skipping 29 matching lines @@
       LIST_TEST(HostResolver_Resolve) \
       LIST_TEST(HostResolver_ResolveIPv4) \
   )
 
 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, HostResolver) {
   RUN_HOST_RESOLVER_SUBTESTS;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, HostResolver) {
   RUN_HOST_RESOLVER_SUBTESTS;
 }
-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;
@@ skipping 56 matching lines @@
 // XRequestedWithHeader isn't trusted per-se, but the header isn't provided
 // for NaCl and thus must be skipped.
 #define RUN_URLLOADER_TRUSTED_SUBTESTS \
   RunTestViaHTTP( \
       LIST_TEST(URLLoader_TrustedSameOriginRestriction) \
       LIST_TEST(URLLoader_TrustedCrossOriginRequest) \
       LIST_TEST(URLLoader_TrustedHttpRequests) \
       LIST_TEST(URLLoader_XRequestedWithHeader) \
   )
 
-IN_PROC_BROWSER_TEST_F(PPAPITest, URLLoader0) {
-  RUN_URLLOADER_SUBTESTS_0;
-}
-IN_PROC_BROWSER_TEST_F(PPAPITest, URLLoader1) {
-  RUN_URLLOADER_SUBTESTS_1;
-}
-IN_PROC_BROWSER_TEST_F(PPAPITest, URLLoader2) {
-  RUN_URLLOADER_SUBTESTS_2;
-}
-IN_PROC_BROWSER_TEST_F(PPAPITest, URLLoader3) {
-  RUN_URLLOADER_SUBTESTS_3;
-}
-IN_PROC_BROWSER_TEST_F(PPAPITest, URLLoaderTrusted) {
-  RUN_URLLOADER_TRUSTED_SUBTESTS;
-}
 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, URLLoader0) {
   RUN_URLLOADER_SUBTESTS_0;
 }
 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, URLLoader1) {
   RUN_URLLOADER_SUBTESTS_1;
 }
 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, URLLoader2) {
   RUN_URLLOADER_SUBTESTS_2;
 }
 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, URLLoader3) {
@@ skipping 20 matching lines @@
 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, MAYBE_URLLoader3) {
   RUN_URLLOADER_SUBTESTS_3;
 }
 
 // Flaky on 32-bit linux bot; http://crbug.com/308906
 #if defined(OS_LINUX) && defined(ARCH_CPU_X86)
 #define MAYBE_URLLoader_BasicFilePOST DISABLED_URLLoader_BasicFilePOST
 #else
 #define MAYBE_URLLoader_BasicFilePOST URLLoader_BasicFilePOST
 #endif
-IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(URLLoader0)) {
-  RunTestViaHTTP(
-      LIST_TEST(URLLoader_BasicGET)
-      LIST_TEST(URLLoader_BasicPOST)
-      LIST_TEST(MAYBE_URLLoader_BasicFilePOST)
-      LIST_TEST(URLLoader_BasicFileRangePOST)
-      LIST_TEST(URLLoader_CompoundBodyPOST)
-  );
-}
 
-IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(URLLoader1)) {
-  RUN_URLLOADER_SUBTESTS_1;
-}
-IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(URLLoader2)) {
-  RUN_URLLOADER_SUBTESTS_2;
-}
-IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(URLLoader3)) {
-  RUN_URLLOADER_SUBTESTS_3;
-}
 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, URLLoader0) {
   RUN_URLLOADER_SUBTESTS_0;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, URLLoader1) {
   RUN_URLLOADER_SUBTESTS_1;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, URLLoader2) {
   RUN_URLLOADER_SUBTESTS_2;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, URLLoader3) {
@@ skipping 27 matching lines @@
                        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
 #define MAYBE_URLRequest_CreateAndIsURLRequestInfo \
     URLRequest_CreateAndIsURLRequestInfo
 #endif
 TEST_PPAPI_NACL(MAYBE_URLRequest_CreateAndIsURLRequestInfo)
 
-TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLRequest_SetProperty)
 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLRequest_SetProperty)
 TEST_PPAPI_NACL(URLRequest_SetProperty)
-TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLRequest_AppendDataToBody)
 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLRequest_AppendDataToBody)
 TEST_PPAPI_NACL(URLRequest_AppendDataToBody)
-TEST_PPAPI_IN_PROCESS_VIA_HTTP(DISABLED_URLRequest_AppendFileToBody)
 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(DISABLED_URLRequest_AppendFileToBody)
 TEST_PPAPI_NACL(DISABLED_URLRequest_AppendFileToBody)
-TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLRequest_Stress)
 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLRequest_Stress)
 TEST_PPAPI_NACL(URLRequest_Stress)
 
-TEST_PPAPI_IN_PROCESS(PaintAggregator)
 TEST_PPAPI_OUT_OF_PROCESS(PaintAggregator)
 TEST_PPAPI_NACL(PaintAggregator)
 
 // TODO(danakj): http://crbug.com/115286
 TEST_PPAPI_NACL(DISABLED_Scrollbar)
 
 TEST_PPAPI_NACL(Var)
 
 TEST_PPAPI_NACL(VarResource)
 
@@ skipping 24 matching lines @@
 #define MAYBE_PostMessage DISABLED_PostMessage
 #else
 #define MAYBE_PostMessage PostMessage
 #endif
 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_PostMessage) {
   RUN_POSTMESSAGE_SUBTESTS;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, PostMessage) {
   RUN_POSTMESSAGE_SUBTESTS;
 }
-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;
@@ skipping 15 matching lines @@
       LIST_TEST(FileIO_TouchQuery) \
   )
 
 #define RUN_FILEIO_PRIVATE_SUBTESTS \
   RunTestViaHTTP( \
       LIST_TEST(FileIO_RequestOSFileHandle) \
       LIST_TEST(FileIO_RequestOSFileHandleWithOpenExclusive) \
       LIST_TEST(FileIO_Mmap) \
   )
 
-IN_PROC_BROWSER_TEST_F(PPAPITest, FileIO) {
-  RUN_FILEIO_SUBTESTS;
-}
 IN_PROC_BROWSER_TEST_F(PPAPIPrivateTest, FileIO_Private) {
   RUN_FILEIO_PRIVATE_SUBTESTS;
 }
 
 // See: crbug.com/421284
 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, DISABLED_FileIO) {
   RUN_FILEIO_SUBTESTS;
 }
 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPIPrivateTest, FileIO_Private) {
   RUN_FILEIO_PRIVATE_SUBTESTS;
 }
 
 // http://crbug.com/313401
 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, DISABLED_FileIO) {
   RUN_FILEIO_SUBTESTS;
 }
 // http://crbug.com/313401
 IN_PROC_BROWSER_TEST_F(PPAPIPrivateNaClNewlibTest,
                        DISABLED_NaCl_Newlib_FileIO_Private) {
   RUN_FILEIO_PRIVATE_SUBTESTS;
 }
 
-// Flaky on 32-bit linux bot; http://crbug.com/308905
-// Flaky on Windows too; http://crbug.com/321300
-IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, DISABLED_FileIO) {
-  RUN_FILEIO_SUBTESTS;
-}
-IN_PROC_BROWSER_TEST_F(PPAPIPrivateNaClGLibcTest, DISABLED_FileIO_Private) {
-  RUN_FILEIO_PRIVATE_SUBTESTS;
-}
-
 // http://crbug.com/313205
 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, DISABLED_FileIO) {
   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)) {
@@ skipping 38 matching lines @@
   RunTestViaHTTP( \
       LIST_TEST(FileRef_QueryAndTouchFile) \
       LIST_TEST(FileRef_DeleteFileAndDirectory) \
       LIST_TEST(FileRef_RenameFileAndDirectory) \
       LIST_TEST(FileRef_Query) \
       LIST_TEST(FileRef_FileNameEscaping) \
   )
 
 // Note, the FileRef tests are split into two, because all of them together
 // sometimes take too long on windows: crbug.com/336999
-IN_PROC_BROWSER_TEST_F(PPAPITest, FileRef1) {
-  RUN_FILEREF_SUBTESTS_1;
-}
-IN_PROC_BROWSER_TEST_F(PPAPITest, FileRef2) {
-  RUN_FILEREF_SUBTESTS_2;
-}
 // This test only works as an in-process test. See crbug.com/241646.

[dmichael (off chromium), 2015/02/18 19:08:31]

This comment isn't quite right now...  maybe just change to:
FileRef_ReadDirectoryEntries is flaky, so left out. See crbug.com/241646.

...for now.

[jam, 2015/02/18 20:25:21]

Done.

-IN_PROC_BROWSER_TEST_F(PPAPITest, FileRef_ReadDirectoryEntries) {
-  RunTestViaHTTP(LIST_TEST(FileRef_ReadDirectoryEntries));
-}
 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, FileRef1) {
   RUN_FILEREF_SUBTESTS_1;
 }
 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, FileRef2) {
   RUN_FILEREF_SUBTESTS_2;
 }
 
 #if defined(OS_MACOSX) && defined(ADDRESS_SANITIZER)
 // Flaky on Mac ASAN: http://crbug.com/437411.
 #define MAYBE_FileRef1 DISABLED_FileRef1
 #else
 #define MAYBE_FileRef1 FileRef1
 #endif
 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, MAYBE_FileRef1) {
   RUN_FILEREF_SUBTESTS_1;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, FileRef2) {
   RUN_FILEREF_SUBTESTS_2;
 }
-// Flaky on 32-bit linux bot; http://crbug.com/308908
-// Glibc not available on ARM
-#if (defined(OS_LINUX) && defined(ARCH_CPU_X86)) \
-    || defined(ARCH_CPU_ARM_FAMILY)
-#define MAYBE_NaCl_Glibc_FileRef1 DISABLED_FileRef1
-#define MAYBE_NaCl_Glibc_FileRef2 DISABLED_FileRef2
-#else
-#define MAYBE_NaCl_Glibc_FileRef1 FileRef1
-#define MAYBE_NaCl_Glibc_FileRef2 FileRef2
-#endif
-IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_NaCl_Glibc_FileRef1) {
-  RUN_FILEREF_SUBTESTS_1;
-}
-IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_NaCl_Glibc_FileRef2) {
-  RUN_FILEREF_SUBTESTS_2;
-}
 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, FileRef1) {
   RUN_FILEREF_SUBTESTS_1;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, FileRef2) {
   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
 #endif
 
 TEST_PPAPI_NACL(MAYBE_FileSystem)
 
 #if defined(OS_MACOSX)
 // http://crbug.com/103912
 #define MAYBE_Fullscreen DISABLED_Fullscreen
 #elif defined(OS_LINUX)
 // http://crbug.com/146008
 #define MAYBE_Fullscreen DISABLED_Fullscreen
 #elif defined(OS_WIN)
 // http://crbug.com/342269
 #define MAYBE_Fullscreen DISABLED_Fullscreen
 #else
 #define MAYBE_Fullscreen Fullscreen
 #endif
 
-TEST_PPAPI_IN_PROCESS_VIA_HTTP(MAYBE_Fullscreen)
 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(MAYBE_Fullscreen)
 TEST_PPAPI_NACL(MAYBE_Fullscreen)
 
 TEST_PPAPI_OUT_OF_PROCESS(X509CertificatePrivate)
 
-TEST_PPAPI_IN_PROCESS(UMA)
 TEST_PPAPI_OUT_OF_PROCESS(UMA)
 TEST_PPAPI_NACL(UMA)
 
 // NetAddress tests.
 #define RUN_NETADDRESS_SUBTESTS \
   RunTestViaHTTP( \
       LIST_TEST(NetAddress_IPv4Address) \
       LIST_TEST(NetAddress_IPv6Address) \
       LIST_TEST(NetAddress_DescribeAsString) \
   )
 
 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, NetAddress) {
   RUN_NETADDRESS_SUBTESTS;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, NetAddress) {
   RUN_NETADDRESS_SUBTESTS;
 }
-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) \
       LIST_TEST(NetAddressPrivate_GetFamily) \
       LIST_TEST(NetAddressPrivate_GetPort) \
       LIST_TEST(NetAddressPrivate_GetAddress) \
       LIST_TEST(NetAddressPrivate_GetScopeID) \
   )
 
-IN_PROC_BROWSER_TEST_F(PPAPITest, NetAddressPrivate) {
-  RUN_NETADDRESS_PRIVATE_SUBTESTS;
-}
 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, NetAddressPrivate) {
   RUN_NETADDRESS_PRIVATE_SUBTESTS;
 }
 
 #define RUN_NETADDRESS_PRIVATE_UNTRUSTED_SUBTESTS \
   RunTestViaHTTP( \
       LIST_TEST(NetAddressPrivateUntrusted_AreEqual) \
       LIST_TEST(NetAddressPrivateUntrusted_AreHostsEqual) \
       LIST_TEST(NetAddressPrivateUntrusted_Describe) \
       LIST_TEST(NetAddressPrivateUntrusted_ReplacePort) \
       LIST_TEST(NetAddressPrivateUntrusted_GetAnyAddress) \
       LIST_TEST(NetAddressPrivateUntrusted_GetFamily) \
       LIST_TEST(NetAddressPrivateUntrusted_GetPort) \
       LIST_TEST(NetAddressPrivateUntrusted_GetAddress) \
   )
 
 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, NetAddressPrivate) {
   RUN_NETADDRESS_PRIVATE_UNTRUSTED_SUBTESTS;
 }
-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;
-}
 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, Flash) {
   RUN_FLASH_SUBTESTS;
 }
 
 // In-process WebSocket tests. Note, the WebSocket tests are split into two,
 // because all of them together sometimes take too long on windows:
 // crbug.com/336999
 #define RUN_WEBSOCKET_SUBTESTS_1 \
   RunTestWithWebSocketServer( \
       LIST_TEST(WebSocket_IsWebSocket) \
@@ skipping 24 matching lines @@
       LIST_TEST(WebSocket_UtilityGetURL) \
       LIST_TEST(WebSocket_UtilityValidConnect) \
       LIST_TEST(WebSocket_UtilityInvalidClose) \
       LIST_TEST(WebSocket_UtilityValidClose) \
       LIST_TEST(WebSocket_UtilityGetProtocol) \
       LIST_TEST(WebSocket_UtilityTextSendReceive) \
       LIST_TEST(WebSocket_UtilityBinarySendReceive) \
       LIST_TEST(WebSocket_UtilityBufferedAmount) \
   )
 
-IN_PROC_BROWSER_TEST_F(PPAPITest, WebSocket1) {
-  RUN_WEBSOCKET_SUBTESTS_1;
-}
-IN_PROC_BROWSER_TEST_F(PPAPITest, WebSocket2) {
-  RUN_WEBSOCKET_SUBTESTS_2;
-}
 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, WebSocket1) {
   RUN_WEBSOCKET_SUBTESTS_1;
 }
 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, WebSocket2) {
   RUN_WEBSOCKET_SUBTESTS_2;
 }
-IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(WebSocket1)) {
-  RUN_WEBSOCKET_SUBTESTS_1;
-}
-IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(WebSocket2)) {
-  RUN_WEBSOCKET_SUBTESTS_2;
-}
 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, WebSocket1) {
   RUN_WEBSOCKET_SUBTESTS_1;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, WebSocket2) {
   RUN_WEBSOCKET_SUBTESTS_2;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, WebSocket1) {
   RUN_WEBSOCKET_SUBTESTS_1;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, WebSocket2) {
@@ skipping 17 matching lines @@
 }
 
 // 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) {
@@ skipping 65 matching lines @@
 }
 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.
   GURL url = GetTestFileUrl("View_CreatedInvisible");
   chrome::NavigateParams params(browser(), url, ui::PAGE_TRANSITION_LINK);
@@ skipping 28 matching lines @@
   EXPECT_STREQ("TestPageHideShow:Hidden", handler.message().c_str());
   observer.Reset();
 
   // Switch back to the test tab.
   browser()->tab_strip_model()->ActivateTabAt(0, true);
 
   ASSERT_TRUE(observer.Run()) << handler.error_message();
   EXPECT_STREQ("PASS", handler.message().c_str());
 }
 
-// Tests that if a plugin accepts touch events, the browser knows to send touch
-// events to the renderer.
-IN_PROC_BROWSER_TEST_F(PPAPITest, InputEvent_AcceptTouchEvent) {
-  std::string positive_tests[] = { "InputEvent_AcceptTouchEvent_1",
-                                   "InputEvent_AcceptTouchEvent_2",
-                                   "InputEvent_AcceptTouchEvent_3",
-                                   "InputEvent_AcceptTouchEvent_4"
-                                 };
-
-  for (size_t i = 0; i < arraysize(positive_tests); ++i) {
-    RenderViewHost* host = browser()->tab_strip_model()->
-        GetActiveWebContents()->GetRenderViewHost();
-    RunTest(positive_tests[i]);
-    EXPECT_TRUE(content::RenderViewHostTester::HasTouchEventHandler(host));
-  }
-}

[dmichael (off chromium), 2015/02/18 19:08:31]

Hmm, we don't seem to have any other coverage of this API. Would it work if you
changed it from PPAPITest to OutOfProcessPPAPITest?

[jam, 2015/02/18 20:25:21]

Done.

-
 // View tests.
 #define RUN_VIEW_SUBTESTS \
   RunTestViaHTTP( \
       LIST_TEST(View_SizeChange) \
       LIST_TEST(View_ClipChange) \
       LIST_TEST(View_ScrollOffsetChange) \
   )
 
-IN_PROC_BROWSER_TEST_F(PPAPITest, View) {
-  RUN_VIEW_SUBTESTS;
-}
 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, View) {
   RUN_VIEW_SUBTESTS;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, View) {
   RUN_VIEW_SUBTESTS;
 }
-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;
-}
 #if defined(OS_LINUX)  // Disabled due to flakiness http://crbug.com/316925
 #define MAYBE_FlashMessageLoop DISABLED_FlashMessageLoop
 #else
 #define MAYBE_FlashMessageLoop FlashMessageLoop
 #endif
 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_FlashMessageLoop) {
   RUN_FLASH_MESSAGE_LOOP_SUBTESTS;
 }
 
 // The compositor test timeouts sometimes, so we have to split it to two
@@ skipping 100 matching lines @@
 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, FlashDRM) {
   RunTest(
 #if (defined(OS_WIN) && defined(ENABLE_RLZ)) || defined(OS_CHROMEOS)
           // Only implemented on Windows and ChromeOS currently.
           LIST_TEST(FlashDRM_GetDeviceID)
 #endif
           LIST_TEST(FlashDRM_GetHmonitor)
           LIST_TEST(FlashDRM_GetVoucherFile));
 }
 
-TEST_PPAPI_IN_PROCESS(TalkPrivate)
 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate)
 
 #if defined(OS_CHROMEOS)
 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate)
 #endif
 
 #if !defined(DISABLE_NACL)
 class PackagedAppTest : public ExtensionBrowserTest {
  public:
   explicit PackagedAppTest(const std::string& toolchain)
@@ skipping 116 matching lines @@
 #endif
 
 IN_PROC_BROWSER_TEST_F(MojoPPAPITest, MAYBE_MOJO(Mojo)) {
   RunTest();
 }
 
 IN_PROC_BROWSER_TEST_F(MojoPPAPITest, MAYBE_MOJO(MojoFailsWithoutFlag)) {
   RunTestWithoutFlag();
 }
 #endif