Pepper: Move several tests to content_browsertests.

content/test/ppapi/ppapi_browsertest.cc

Index: content/test/ppapi/ppapi_browsertest.cc
diff --git a/content/test/ppapi/ppapi_browsertest.cc b/content/test/ppapi/ppapi_browsertest.cc
index 0a445b2b53e4f260f5cecd731375b0f56b323e9d..d6840435065460cef8396313f0674b83f197f741 100644
--- a/content/test/ppapi/ppapi_browsertest.cc
+++ b/content/test/ppapi/ppapi_browsertest.cc
@@ -27,11 +27,96 @@ namespace {
     RunTest(STRIP_PREFIXES(test_name)); \
   }
 
+TEST_PPAPI_IN_PROCESS(BrowserFont)
+// crbug.com/308949
+#if defined(OS_WIN)
+#define MAYBE_OUT_BrowserFont DISABLED_BrowserFont
+#else
+#define MAYBE_OUT_BrowserFont BrowserFont
+#endif
+TEST_PPAPI_OUT_OF_PROCESS(MAYBE_OUT_BrowserFont)
+
+TEST_PPAPI_IN_PROCESS(Buffer)
+TEST_PPAPI_OUT_OF_PROCESS(Buffer)
+
+TEST_PPAPI_IN_PROCESS(CharSet)
+TEST_PPAPI_OUT_OF_PROCESS(CharSet)
+
+TEST_PPAPI_IN_PROCESS(Console)
+TEST_PPAPI_OUT_OF_PROCESS(Console)
+
 TEST_PPAPI_IN_PROCESS(Crypto)
 TEST_PPAPI_OUT_OF_PROCESS(Crypto)
 
+TEST_PPAPI_IN_PROCESS(Graphics2D)
+TEST_PPAPI_OUT_OF_PROCESS(Graphics2D)
+
+TEST_PPAPI_IN_PROCESS(ImageData)
+TEST_PPAPI_OUT_OF_PROCESS(ImageData)
+
+TEST_PPAPI_OUT_OF_PROCESS(InputEvent)
+
+// "Instance" tests are really InstancePrivate tests. InstancePrivate is not
+// supported in NaCl, so these tests are only run trusted.
+// Also note that these tests are run separately on purpose (versus collapsed
+// in to one IN_PROC_BROWSER_TEST_F macro), because some of them have leaks
+// on purpose that will look like failures to tests that are run later.
+TEST_PPAPI_IN_PROCESS(Instance_ExecuteScript)
+TEST_PPAPI_OUT_OF_PROCESS(Instance_ExecuteScript)
+
+IN_PROC_BROWSER_TEST_F(PPAPITest,
+                       Instance_ExecuteScriptAtInstanceShutdown) {
+  // In other tests, we use one call to RunTest so that the tests can all run
+  // in one plugin instance. This saves time on loading the plugin (especially
+  // for NaCl). Here, we actually want to destroy the Instance, to test whether
+  // the destructor can run ExecuteScript successfully. That's why we have two
+  // separate calls to RunTest; the second one forces a navigation which
+  // destroys the instance from the prior RunTest.
+  // See test_instance_deprecated.cc for more information.
+  RunTest("Instance_SetupExecuteScriptAtInstanceShutdown");
+  RunTest("Instance_ExecuteScriptAtInstanceShutdown");
+}
+IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest,
+                       Instance_ExecuteScriptAtInstanceShutdown) {
+  // (See the comment for the in-process version of this test above)
+  RunTest("Instance_SetupExecuteScriptAtInstanceShutdown");
+  RunTest("Instance_ExecuteScriptAtInstanceShutdown");
+}
+
+TEST_PPAPI_IN_PROCESS(Instance_LeakedObjectDestructors)
+TEST_PPAPI_OUT_OF_PROCESS(Instance_LeakedObjectDestructors)
+
+TEST_PPAPI_IN_PROCESS(Memory)
+TEST_PPAPI_OUT_OF_PROCESS(Memory)
+
+// TODO(danakj): http://crbug.com/115286
+TEST_PPAPI_IN_PROCESS(DISABLED_Scrollbar)
+// http://crbug.com/89961
+TEST_PPAPI_OUT_OF_PROCESS(DISABLED_Scrollbar)
+
 TEST_PPAPI_IN_PROCESS(TraceEvent)
 TEST_PPAPI_OUT_OF_PROCESS(TraceEvent)
 
+TEST_PPAPI_IN_PROCESS(URLUtil)
+TEST_PPAPI_OUT_OF_PROCESS(URLUtil)
+
+TEST_PPAPI_IN_PROCESS(Var)
+TEST_PPAPI_OUT_OF_PROCESS(Var)
+
+// Flaky on mac, http://crbug.com/121107
+#if defined(OS_MACOSX)
+#define MAYBE_VarDeprecated DISABLED_VarDeprecated
+#else
+#define MAYBE_VarDeprecated VarDeprecated
+#endif
+TEST_PPAPI_IN_PROCESS(VarDeprecated)
+TEST_PPAPI_OUT_OF_PROCESS(MAYBE_VarDeprecated)
+
+TEST_PPAPI_IN_PROCESS(VarResource)
+TEST_PPAPI_OUT_OF_PROCESS(VarResource)
+
+TEST_PPAPI_IN_PROCESS(VideoDecoderDev)
+TEST_PPAPI_OUT_OF_PROCESS(VideoDecoderDev)
+
 }  // namespace
 }  // namespace content