PPAPI: More test cleanup

ppapi/tests/test_graphics_2d.h

 // 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.
 
 #ifndef PPAPI_TESTS_TEST_GRAPHICS_2D_H_
 #define PPAPI_TESTS_TEST_GRAPHICS_2D_H_
 
 #include <string>
 
 #include "ppapi/c/pp_stdint.h"
@@ skipping 48 matching lines @@
                        const pp::Rect& square, uint32_t square_color) const;
 
   // Validates that the given device context is a single color with a square of
   // another color inside it.
   bool IsSquareInDC(const pp::Graphics2D& dc, uint32_t background_color,
                     const pp::Rect& square, uint32_t square_color) const;
 
   // Validates that the given device context is filled with the given color.
   bool IsDCUniformColor(const pp::Graphics2D& dc, uint32_t color) const;
 
-  // Returns true if Graphics2D resource is created correctly.
-  bool ResourceHealthCheck(pp::Instance* instance, pp::Graphics2D* context);
-  bool ResourceHealthCheckForC(pp::Instance* instance, PP_Resource graphics_2d);
-
   // Issues a flush on the given device context and blocks until the flush
-  // has issued its callback. Returns true on success.
-  bool FlushAndWaitForDone(pp::Graphics2D* context);
+  // has issued its callback. Returns an empty string on success or an error
+  // message on failure.
+  std::string FlushAndWaitForDone(pp::Graphics2D* context);
 
   // Creates an image and replaces the contents of the Graphics2D with the
   // image, waiting for completion. This returns the resource ID of the image
   // data we created. This image data will be released by the time the call
   // completes, but it can be used for comparisons later.
   //
   // Returns 0 on failure.
   PP_Resource ReplaceContentsAndReturnID(pp::Graphics2D* dc,
                                          const pp::Size& size);
 
@@ skipping 14 matching lines @@
   std::string TestPaint();
   std::string TestScroll();
   std::string TestReplace();
   std::string TestFlush();
   std::string TestFlushOffscreenUpdate();
   std::string TestDev();
   std::string TestReplaceContentsCaching();
   std::string TestBindNull();
 
   // Used by the tests that access the C API directly.
-  const PPB_Graphics2D* graphics_2d_interface_;
-  const PPB_ImageData* image_data_interface_;
+  const PPB_Graphics2D_1_1* graphics_2d_interface_;
+  const PPB_ImageData_1_0* image_data_interface_;
 
   // Used to indicate that DidChangeView has happened, in order to make plugin
   // and ui synchronous.
   bool is_view_changed_;
 
   // Set to true to request that the next invocation of DidChangeView should
   // post a quit to the message loop. DidChangeView will also reset the flag so
   // this will only happen once.
   bool post_quit_on_view_changed_;
 };
 
 #endif  // PPAPI_TESTS_TEST_GRAPHICS_2D_H_