Pepper: Move more stuff to content_browsertests.

This moves additional tests to content_browsertests. I keep these migrations
relatively small so I don't have to debug much if something fails.

Additionally, this change adds test coverage for NaCl for MessageLoop testing,
and restores testing for MessageLoop_Post.

BUG=371873

Review URL: https://codereview.chromium.org/303313002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273974 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 5 insertions, 45 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)
diff --git a/chrome/test/ppapi/ppapi_test.cc b/chrome/test/ppapi/ppapi_test.cc
index 74fedbe..7bd3284 100644
--- a/chrome/test/ppapi/ppapi_test.cc
+++ b/chrome/test/ppapi/ppapi_test.cc
@@ -172,13 +172,6 @@ void PPAPITestBase::RunTest(const std::string& test_case) {
   RunTestURL(url);
 }
 
-void PPAPITestBase::RunTestAndReload(const std::string& test_case) {
-  GURL url = GetTestFileUrl(test_case);
-  RunTestURL(url);
-  // If that passed, we simply run the test again, which navigates again.
-  RunTestURL(url);
-}
-
 void PPAPITestBase::RunTestViaHTTP(const std::string& test_case) {
   base::FilePath document_root;
   ASSERT_TRUE(ui_test_utils::GetRelativeBuildDirectory(&document_root));
@@ -360,12 +353,6 @@ void PPAPINaClTest::RunTest(const std::string& test_case) {
 #endif
 }
 
-void PPAPINaClTest::RunTestAndReload(const std::string& test_case) {
-#if !defined(DISABLE_NACL)
-  PPAPITestBase::RunTestAndReload(test_case);
-#endif
-}
-
 void PPAPINaClTest::RunTestViaHTTP(const std::string& test_case) {
 #if !defined(DISABLE_NACL)
   PPAPITestBase::RunTestViaHTTP(test_case);
diff --git a/chrome/test/ppapi/ppapi_test.h b/chrome/test/ppapi/ppapi_test.h
index 181a50d..9d6c209 100644
--- a/chrome/test/ppapi/ppapi_test.h
+++ b/chrome/test/ppapi/ppapi_test.h
@@ -49,9 +49,6 @@ class PPAPITestBase : public InProcessBrowserTest {
   // Returns the URL to load for file: tests.
   GURL GetTestFileUrl(const std::string& test_case);
   virtual void RunTest(const std::string& test_case);
-  // Run the test and reload. This can test for clean shutdown, including leaked
-  // instance object vars.
-  virtual void RunTestAndReload(const std::string& test_case);
   virtual void RunTestViaHTTP(const std::string& test_case);
   virtual void RunTestWithSSLServer(const std::string& test_case);
   virtual void RunTestWithWebSocketServer(const std::string& test_case);
@@ -131,7 +128,6 @@ class PPAPINaClTest : public PPAPITestBase {
   virtual void SetUpOnMainThread() OVERRIDE;
   // PPAPITestBase overrides.
   virtual void RunTest(const std::string& test_case) OVERRIDE;
-  virtual void RunTestAndReload(const std::string& test_case) OVERRIDE;
   virtual void RunTestViaHTTP(const std::string& test_case) OVERRIDE;
   virtual void RunTestWithSSLServer(const std::string& test_case) OVERRIDE;
   virtual void RunTestWithWebSocketServer(