diff options
Diffstat (limited to 'chrome/test/ppapi/ppapi_browsertest.cc')
| -rw-r--r-- | chrome/test/ppapi/ppapi_browsertest.cc | 33 |
1 files changed, 5 insertions, 28 deletions
diff --git a/chrome/test/ppapi/ppapi_browsertest.cc b/chrome/test/ppapi/ppapi_browsertest.cc index 7bf15cd..5a699e9 100644 --- a/chrome/test/ppapi/ppapi_browsertest.cc +++ b/chrome/test/ppapi/ppapi_browsertest.cc @@ -206,18 +206,6 @@ TEST_PPAPI_NACL(InputEvent) 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) @@ -1216,40 +1204,29 @@ 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) |