Switch FlushCallback to be a PP_CompletionCallback....

cpp/device_context_2d.cc

 // Copyright (c) 2010 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/cpp/device_context_2d.h"
 
+#include "ppapi/c/pp_errors.h"
+#include "ppapi/c/ppb_device_context_2d.h"
+#include "ppapi/cpp/completion_callback.h"
 #include "ppapi/cpp/image_data.h"
 #include "ppapi/cpp/module.h"
 
 namespace pp {
 
 static PPB_DeviceContext2D const* device_context_2d_funcs = NULL;
 
 static bool EnsureFuncs() {
   if (!device_context_2d_funcs) {
     device_context_2d_funcs = reinterpret_cast<PPB_DeviceContext2D const*>(
@@ skipping 65 matching lines @@
   if (device_context_2d_funcs->ReplaceContents(pp_resource(),
                                                image->pp_resource())) {
     // On success, reset the image data. This is to help prevent people
     // from continuing to use the resource which will result in artifacts.
     *image = ImageData();
     return true;
   }
   return false;
 }
 
-bool DeviceContext2D::Flush(PPB_DeviceContext2D_FlushCallback callback,
-                            void* callback_data) {
-  if (!EnsureFuncs() || is_null())
-    return false;
-  return device_context_2d_funcs->Flush(pp_resource(), callback, callback_data);
+int32_t DeviceContext2D::Flush(const CompletionCallback& cc) {
+  if (!EnsureFuncs())
+    return PP_Error_NoInterface;
+  if (is_null())
+    return PP_Error_BadResource;
+  return device_context_2d_funcs->Flush(pp_resource(),
+                                        cc.pp_completion_callback());
 }
 
 }  // namespace pp