PPAPI: More test cleanup

ppapi/tests/test_graphics_3d.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 "ppapi/tests/test_graphics_3d.h"
 
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ skipping 119 matching lines @@
   glSetCurrentContextPPAPI(kInvalidContext);
 
   int32_t rv = SwapBuffersSync(&context);
   ASSERT_EQ(rv, PP_OK);
 
   PASS();
 }
 
 int32_t TestGraphics3D::SwapBuffersSync(pp::Graphics3D* context) {
   TestCompletionCallback callback(instance_->pp_instance(), callback_type());
-  int32_t rv = context->SwapBuffers(callback.GetCallback());
-  if (rv != PP_OK_COMPLETIONPENDING)
-    return rv;
-
-  return callback.WaitForResult();
+  callback.WaitForResult(context->SwapBuffers(callback.GetCallback()));
+  return callback.result();
 }
 
 std::string TestGraphics3D::CheckPixelPPAPI(
     pp::Graphics3D* context,
     int x, int y, const uint8_t expected_color[4]) {
   GLubyte pixel_color[4];
   opengl_es2_->ReadPixels(context->pp_resource(),
       x, y, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, pixel_color);
 
   ASSERT_EQ(pixel_color[0], expected_color[0]);
   ASSERT_EQ(pixel_color[1], expected_color[1]);
   ASSERT_EQ(pixel_color[2], expected_color[2]);
   ASSERT_EQ(pixel_color[3], expected_color[3]);
   PASS();
 }
 
 std::string TestGraphics3D::CheckPixelGL(
     int x, int y, const uint8_t expected_color[4]) {
   GLubyte pixel_color[4];
   glReadPixels(x, y, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, pixel_color);
 
   ASSERT_EQ(pixel_color[0], expected_color[0]);
   ASSERT_EQ(pixel_color[1], expected_color[1]);
   ASSERT_EQ(pixel_color[2], expected_color[2]);
   ASSERT_EQ(pixel_color[3], expected_color[3]);
   PASS();
 }