Pepper: Move more stuff to content_browsertests.

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 "chrome/test/ppapi/ppapi_test.h"
 
 #include "base/test/test_timeouts.h"
 #include "build/build_config.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 188 matching lines @@
 // Flaky on Linux and Windows. http://crbug.com/135403
 #if defined(OS_LINUX) || defined(OS_WIN)
 #define MAYBE_ImeInputEvent DISABLED_ImeInputEvent
 #else
 #define MAYBE_ImeInputEvent ImeInputEvent
 #endif
 
 TEST_PPAPI_OUT_OF_PROCESS(MAYBE_ImeInputEvent)
 TEST_PPAPI_NACL(MAYBE_ImeInputEvent)
 
-// We run and reload the RecursiveObjects test to ensure that the InstanceObject
-// (and others) are properly cleaned up after the first run.
-IN_PROC_BROWSER_TEST_F(PPAPITest, Instance_RecursiveObjects) {
-  RunTestAndReload("Instance_RecursiveObjects");
-}
-// TODO(dmichael): Make it work out-of-process (or at least see whether we
-//                 care).
-IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest,
-                       DISABLED_Instance_RecursiveObjects) {
-  RunTestAndReload("Instance_RecursiveObjects");
-}
-
 // Graphics2D_Dev isn't supported in NaCl, only test the other interfaces
 // TODO(jhorwich) Enable when Graphics2D_Dev interfaces are proxied in NaCl.
 TEST_PPAPI_NACL(Graphics2D_InvalidResource)
 TEST_PPAPI_NACL(Graphics2D_InvalidSize)
 TEST_PPAPI_NACL(Graphics2D_Humongous)
 TEST_PPAPI_NACL(Graphics2D_InitToZero)
 TEST_PPAPI_NACL(Graphics2D_Describe)
 TEST_PPAPI_NACL(Graphics2D_Paint)
 TEST_PPAPI_NACL(Graphics2D_Scroll)
 TEST_PPAPI_NACL(Graphics2D_Replace)
@@ skipping 978 matching lines @@
 }
 #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;
 }
 
-TEST_PPAPI_OUT_OF_PROCESS(MediaStreamAudioTrack)
 TEST_PPAPI_NACL(MediaStreamAudioTrack)
 
-TEST_PPAPI_OUT_OF_PROCESS(MediaStreamVideoTrack)
 TEST_PPAPI_NACL(MediaStreamVideoTrack)
 
-TEST_PPAPI_IN_PROCESS(MouseCursor)
-TEST_PPAPI_OUT_OF_PROCESS(MouseCursor)
 TEST_PPAPI_NACL(MouseCursor)
 
-// PPB_NetworkProxy is not supported in-process.
-TEST_PPAPI_OUT_OF_PROCESS(NetworkProxy)
 TEST_PPAPI_NACL(NetworkProxy)
 
-TEST_PPAPI_OUT_OF_PROCESS(TrueTypeFont)
 TEST_PPAPI_NACL(TrueTypeFont)
 
+// VideoDestination doesn't work in content_browsertests.
 TEST_PPAPI_OUT_OF_PROCESS(VideoDestination)
 TEST_PPAPI_NACL(VideoDestination)
 
+// VideoSource doesn't work in content_browsertests.
 TEST_PPAPI_OUT_OF_PROCESS(VideoSource)
 TEST_PPAPI_NACL(VideoSource)
 
-// PPB_Printing only implemented for out of process.
+// Printing doesn't work in content_browsertests.
 TEST_PPAPI_OUT_OF_PROCESS(Printing)
 
-// PPB_MessageLoop is only supported out-of-process.
-// TODO(dmichael): Enable for NaCl with the IPC proxy. crbug.com/116317
-TEST_PPAPI_OUT_OF_PROCESS(MessageLoop_Basics)
-// MessageLoop_Post starts a thread so only run it if pepper threads are
-// enabled.
-#ifdef ENABLE_PEPPER_THREADING
-TEST_PPAPI_OUT_OF_PROCESS(MessageLoop_Post)
-#endif
+TEST_PPAPI_NACL(MessageLoop_Basics)
+TEST_PPAPI_NACL(MessageLoop_Post)
 
 // Going forward, Flash APIs will only work out-of-process.
 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetLocalTimeZoneOffset)
 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetProxyForURL)
 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetSetting)
 TEST_PPAPI_OUT_OF_PROCESS(Flash_SetCrashData)
 // http://crbug.com/176822
 #if !defined(OS_WIN)
 TEST_PPAPI_OUT_OF_PROCESS(FlashClipboard)
 #endif
@@ skipping 25 matching lines @@
           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