PPAPI: Refactor ppapi test callbacks to ease testing blocking callbacks.

ppapi/tests/test_url_request.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.
 //
 // Tests PPB_URLRequestInfo interface.
 
 #include "ppapi/tests/test_url_request.h"
 
 #include <string.h>
 #include <string>
@@ skipping 256 matching lines @@
     }
     ppb_var_interface_->Release(test_data[i].var);
   }
 
   ppb_core_interface_->ReleaseResource(url_request);
   return error;  // == PASS() if empty.
 }
 
 std::string TestURLRequest::LoadAndCompareBody(
     PP_Resource url_request, const std::string& expected_body) {
-  TestCompletionCallback test_callback(instance_->pp_instance(), true);
-  pp::CompletionCallback callback =
-      static_cast<pp::CompletionCallback>(test_callback);
-  int32_t result = ppb_url_loader_interface_->Open(
-      url_loader_, url_request, callback.pp_completion_callback());
-  ASSERT_EQ(PP_OK_COMPLETIONPENDING, result);
-  result = test_callback.WaitForResult();
-  ASSERT_EQ(PP_OK, result);
+  TestCompletionCallback callback(instance_->pp_instance(), PP_REQUIRED);
+  callback.WaitForResult(ppb_url_loader_interface_->Open(
+      url_loader_, url_request,
+      callback.GetCallback().pp_completion_callback()));
+  CHECK_CALLBACK_BEHAVIOR(callback);
+  ASSERT_EQ(PP_OK, callback.result());
 
   std::string error;
   PP_Resource url_response =
       ppb_url_loader_interface_->GetResponseInfo(url_loader_);
   if (url_response == kInvalidResource) {
     error = "PPB_URLLoader::GetResponseInfo() returned invalid resource";
   } else {
     PP_Var status = ppb_url_response_interface_->GetProperty(
         url_response, PP_URLRESPONSEPROPERTY_STATUSCODE);
     if (status.type != PP_VARTYPE_INT32 && status.value.as_int != 200)
       error = ReportError("PPB_URLLoader::Open() status", status.value.as_int);
 
     std::string actual_body;
     for (; error.empty();) {  // Read the entire body in this loop.
       const size_t kBufferSize = 32;
       char buf[kBufferSize];
-      result = ppb_url_loader_interface_->ReadResponseBody(
+      callback.WaitForResult(ppb_url_loader_interface_->ReadResponseBody(
           url_loader_, buf, kBufferSize,
-          callback.pp_completion_callback());
-      if (PP_OK_COMPLETIONPENDING != result) {
-        error = ReportError("PPB_URLLoader::ReadResponseBody()", result);
+          callback.GetCallback().pp_completion_callback()));
+      if (callback.failed())
+        error.assign(callback.errors());
+      else if (callback.result() < PP_OK)
+        error.assign(ReportError("PPB_URLLoader::ReadResponseBody()",
+                                 callback.result()));
+      if (callback.result() <= PP_OK || callback.failed())
         break;
-      }
-      result = test_callback.WaitForResult();
-      if (result < PP_OK)
-        error = ReportError("PPB_URLLoader::ReadResponseBody()", result);
-      if (result <= PP_OK)
-        break;
-      actual_body.append(buf, result);
+      actual_body.append(buf, callback.result());
     }
     if (actual_body != expected_body)
       error = "PPB_URLLoader::ReadResponseBody() read unexpected response";
   }
   ppb_core_interface_->ReleaseResource(url_response);
   return error;
 }
 
 // Tests
 //   PP_Bool AppendDataToBody(
@@ skipping 67 matching lines @@
     }
   }
   for (int i = 0; i < num_created; i++) {
     ppb_core_interface_->ReleaseResource(url_request_info[i]);
     if (PP_TRUE ==
         ppb_url_request_interface_->IsURLRequestInfo(url_request_info[i]))
       error = "IsURLREquestInfo() succeeded after release";
   }
   return error;  // == PASS() if empty.
 }