PPAPI/NaCl: Make related tests run in 1 fixture

ppapi/tests/test_image_data.cc

 // Copyright (c) 2011 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 "ppapi/tests/test_image_data.h"
 
 #include "ppapi/cpp/graphics_2d.h"
 #include "ppapi/cpp/image_data.h"
 #include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/tests/testing_instance.h"
 
 REGISTER_TEST_CASE(ImageData);
 
 bool TestImageData::Init() {
   image_data_interface_ = static_cast<const PPB_ImageData*>(
       pp::Module::Get()->GetBrowserInterface(PPB_IMAGEDATA_INTERFACE));
   return !!image_data_interface_;
 }
 
 void TestImageData::RunTests(const std::string& filter) {
-  instance_->LogTest("InvalidFormat", TestInvalidFormat());
-  instance_->LogTest("GetNativeFormat", TestGetNativeFormat());
-  instance_->LogTest("IsImageDataFormatSupported", TestFormatSupported());
-  instance_->LogTest("InvalidSize", TestInvalidSize());
-  instance_->LogTest("HugeSize", TestHugeSize());
-  instance_->LogTest("InitToZero", TestInitToZero());
-  instance_->LogTest("IsImageData", TestIsImageData());
+  RUN_TEST(InvalidFormat, filter);
+  RUN_TEST(GetNativeFormat, filter);
+  RUN_TEST(FormatSupported, filter);
+  RUN_TEST(InvalidSize, filter);
+  RUN_TEST(HugeSize, filter);
+  RUN_TEST(InitToZero, filter);
+  RUN_TEST(IsImageData, filter);
 }
 
 std::string TestImageData::TestInvalidFormat() {
   pp::ImageData a(instance_, static_cast<PP_ImageDataFormat>(1337),
                   pp::Size(16, 16), true);
   if (!a.is_null())
     return "Crazy image data format accepted";
 
   pp::ImageData b(instance_, static_cast<PP_ImageDataFormat>(-1),
                   pp::Size(16, 16), true);
@@ skipping 135 matching lines @@
   pp::Graphics2D device(instance_, pp::Size(w, h), true);
   if (device.is_null())
     return "Couldn't create device context";
   if (image_data_interface_->IsImageData(device.pp_resource()))
     return "Device context was reported as an image";
 
   ASSERT_SUBTEST_SUCCESS(SubTestIsImageData(PP_IMAGEDATAFORMAT_BGRA_PREMUL));
   ASSERT_SUBTEST_SUCCESS(SubTestIsImageData(PP_IMAGEDATAFORMAT_RGBA_PREMUL));
   PASS();
 }