PPAPI: Convert even more tests to run in 1 fixture

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 909 matching lines @@
 }
 
 // NaClGLibc AudioConfig tests
 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(AudioConfig)) {
   RunTestViaHTTP(
       LIST_TEST(AudioConfig_RecommendSampleRate)
       LIST_TEST(AudioConfig_ValidConfigs)
       LIST_TEST(AudioConfig_InvalidConfigs));
 }
 
-// Only run audio output tests if we have an audio device available.
-// TODO(raymes): We should probably test scenarios where there is no audio
-// device available.
-TEST_PPAPI_IN_PROCESS(Audio_Creation)
-TEST_PPAPI_IN_PROCESS(Audio_DestroyNoStop)
-TEST_PPAPI_IN_PROCESS(Audio_Failures)
-TEST_PPAPI_IN_PROCESS(Audio_AudioCallback1)
-TEST_PPAPI_IN_PROCESS(Audio_AudioCallback2)
-TEST_PPAPI_OUT_OF_PROCESS(Audio_Creation)
-TEST_PPAPI_OUT_OF_PROCESS(Audio_DestroyNoStop)
-TEST_PPAPI_OUT_OF_PROCESS(Audio_Failures)
-TEST_PPAPI_OUT_OF_PROCESS(Audio_AudioCallback1)
-TEST_PPAPI_OUT_OF_PROCESS(Audio_AudioCallback2)
-TEST_PPAPI_NACL(Audio_Creation)
-TEST_PPAPI_NACL(Audio_DestroyNoStop)
-TEST_PPAPI_NACL(Audio_Failures)
-TEST_PPAPI_NACL(Audio_AudioCallback1)
-TEST_PPAPI_NACL(Audio_AudioCallback2)
+IN_PROC_BROWSER_TEST_F(PPAPITest, Audio) {
+  RunTest(LIST_TEST(Audio_Creation)
+          LIST_TEST(Audio_DestroyNoStop)
+          LIST_TEST(Audio_Failures)
+          LIST_TEST(Audio_AudioCallback1)
+          LIST_TEST(Audio_AudioCallback2));
+}
+IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, Audio) {
+  RunTest(LIST_TEST(Audio_Creation)
+          LIST_TEST(Audio_DestroyNoStop)
+          LIST_TEST(Audio_Failures)
+          LIST_TEST(Audio_AudioCallback1)
+          LIST_TEST(Audio_AudioCallback2));
+}
+IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, Audio) {
+  RunTestViaHTTP(LIST_TEST(Audio_Creation)
+                 LIST_TEST(Audio_DestroyNoStop)
+                 LIST_TEST(Audio_Failures)
+                 LIST_TEST(Audio_AudioCallback1)
+                 LIST_TEST(Audio_AudioCallback2));
+}
+IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(Audio)) {
+  RunTestViaHTTP(LIST_TEST(Audio_Creation)
+                 LIST_TEST(Audio_DestroyNoStop)
+                 LIST_TEST(Audio_Failures)
+                 LIST_TEST(Audio_AudioCallback1)
+                 LIST_TEST(Audio_AudioCallback2));
+}
 
 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.
@@ skipping 47 matching lines @@
                                  };
 
   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));
   }
 }
 
-TEST_PPAPI_IN_PROCESS(View_SizeChange);
-TEST_PPAPI_OUT_OF_PROCESS(View_SizeChange);
-TEST_PPAPI_NACL(View_SizeChange);
-TEST_PPAPI_IN_PROCESS(View_ClipChange);
-TEST_PPAPI_OUT_OF_PROCESS(View_ClipChange);
-TEST_PPAPI_NACL(View_ClipChange);
+IN_PROC_BROWSER_TEST_F(PPAPITest, View) {
+  RunTest(LIST_TEST(View_SizeChange)
+          LIST_TEST(View_ClipChange));
+}
+IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, View) {
+  RunTest(LIST_TEST(View_SizeChange)
+          LIST_TEST(View_ClipChange));
+}
+IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, View) {
+  RunTestViaHTTP(LIST_TEST(View_SizeChange)
+                 LIST_TEST(View_ClipChange));
+}
+IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, View) {
+  RunTestViaHTTP(LIST_TEST(View_SizeChange)
+                 LIST_TEST(View_ClipChange));
+}
 
-TEST_PPAPI_IN_PROCESS(ResourceArray_Basics)
-TEST_PPAPI_IN_PROCESS(ResourceArray_OutOfRangeAccess)
-TEST_PPAPI_IN_PROCESS(ResourceArray_EmptyArray)
-TEST_PPAPI_IN_PROCESS(ResourceArray_InvalidElement)
-TEST_PPAPI_OUT_OF_PROCESS(ResourceArray_Basics)
-TEST_PPAPI_OUT_OF_PROCESS(ResourceArray_OutOfRangeAccess)
-TEST_PPAPI_OUT_OF_PROCESS(ResourceArray_EmptyArray)
-TEST_PPAPI_OUT_OF_PROCESS(ResourceArray_InvalidElement)
+IN_PROC_BROWSER_TEST_F(PPAPITest, ResourceArray) {
+  RunTest(LIST_TEST(ResourceArray_Basics)
+          LIST_TEST(ResourceArray_OutOfRangeAccess)
+          LIST_TEST(ResourceArray_EmptyArray)
+          LIST_TEST(ResourceArray_InvalidElement));
+}
+IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, ResourceArray) {
+  RunTest(LIST_TEST(ResourceArray_Basics)
+          LIST_TEST(ResourceArray_OutOfRangeAccess)
+          LIST_TEST(ResourceArray_EmptyArray)
+          LIST_TEST(ResourceArray_InvalidElement));
+}
 
-TEST_PPAPI_IN_PROCESS(FlashMessageLoop_Basics)
-TEST_PPAPI_IN_PROCESS(FlashMessageLoop_RunWithoutQuit)
-TEST_PPAPI_OUT_OF_PROCESS(FlashMessageLoop_Basics)
-TEST_PPAPI_OUT_OF_PROCESS(FlashMessageLoop_RunWithoutQuit)
+IN_PROC_BROWSER_TEST_F(PPAPITest, FlashMessageLoop) {
+  RunTest(LIST_TEST(FlashMessageLoop_Basics)
+          LIST_TEST(FlashMessageLoop_RunWithoutQuit));
+}
+IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, FlashMessageLoop) {
+  RunTest(LIST_TEST(FlashMessageLoop_Basics)
+          LIST_TEST(FlashMessageLoop_RunWithoutQuit));
+}
 
 TEST_PPAPI_IN_PROCESS(MouseCursor)
 TEST_PPAPI_OUT_OF_PROCESS(MouseCursor)
 TEST_PPAPI_NACL(MouseCursor)
 
 // PPB_Printing only implemented for out of process.
 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
@@ skipping 21 matching lines @@
 #define MAYBE_FlashFullscreen DISABLED_FlashFullscreen
 #else
 #define MAYBE_FlashFullscreen FlashFullscreen
 #endif
 TEST_PPAPI_OUT_OF_PROCESS(MAYBE_FlashFullscreen)
 
 TEST_PPAPI_IN_PROCESS(TalkPrivate)
 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate)
 
 #endif // ADDRESS_SANITIZER