PPAPI: More test cleanup

ppapi/tests/test_tcp_server_socket_private_disallowed.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_tcp_server_socket_private_disallowed.h"
 
 #include <cstddef>
 
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/private/net_address_private.h"
@@ skipping 35 matching lines @@
   if (!net_address_private_is_available)
     instance_->AppendError("PPB_NetAddress_Private interface not available");
 
   return core_interface_ &&
       tcp_server_socket_private_interface_ &&
       net_address_private_is_available &&
       CheckTestingInterface();
 }
 
 void TestTCPServerSocketPrivateDisallowed::RunTests(const std::string& filter) {
-  RUN_TEST_FORCEASYNC_AND_NOT(Listen, filter);
+  RUN_CALLBACK_TEST(TestTCPServerSocketPrivateDisallowed, Listen, filter);
 }
 
 std::string TestTCPServerSocketPrivateDisallowed::TestListen() {
   PP_Resource socket =
       tcp_server_socket_private_interface_->Create(instance_->pp_instance());
   ASSERT_TRUE(socket != 0);
   ASSERT_TRUE(tcp_server_socket_private_interface_->IsTCPServerSocket(socket));
 
   PP_NetAddress_Private base_address, current_address;
   pp::NetAddressPrivate::GetAnyAddress(false, &base_address);
 
   for (uint16_t port = kPortScanFrom; port < kPortScanTo; ++port) {
     ASSERT_TRUE(pp::NetAddressPrivate::ReplacePort(base_address,
                                                    port,
                                                    &current_address));
-    TestCompletionCallback callback(instance_->pp_instance(), force_async_);
-    int32_t rv = tcp_server_socket_private_interface_->Listen(
+    TestCompletionCallback callback(instance_->pp_instance(), callback_type());
+    callback.WaitForResult(tcp_server_socket_private_interface_->Listen(
         socket,
         &current_address,
         1,
-        callback.GetCallback().pp_completion_callback());
-    if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
-      return ReportError("PPB_TCPServerSocket_Private::Listen force_async", rv);
-    if (rv == PP_OK_COMPLETIONPENDING)
-      rv = callback.WaitForResult();
-    ASSERT_NE(PP_OK, rv);
+        callback.GetCallback().pp_completion_callback()));
+    CHECK_CALLBACK_BEHAVIOR(callback);
+    ASSERT_NE(PP_OK, callback.result());
   }
 
   PASS();
 }