PPAPI: More test cleanup

ppapi/tests/test_tcp_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_socket_private_disallowed.h"
 
 #include "ppapi/cpp/module.h"
 #include "ppapi/tests/test_utils.h"
 #include "ppapi/tests/testing_instance.h"
 
@@ skipping 21 matching lines @@
 
 void TestTCPSocketPrivateDisallowed::RunTests(const std::string& filter) {
   RUN_TEST(Connect, filter);
 }
 
 std::string TestTCPSocketPrivateDisallowed::TestConnect() {
   PP_Resource socket =
       tcp_socket_private_interface_->Create(instance_->pp_instance());
   if (0 != socket) {
     TestCompletionCallback callback(instance_->pp_instance());
-    int32_t rv = tcp_socket_private_interface_->Connect(
+    callback.WaitForResult(tcp_socket_private_interface_->Connect(
         socket, kServerName, kPort,
-        callback.GetCallback().pp_completion_callback());
-
-    if (PP_OK_COMPLETIONPENDING == rv)
-      rv = callback.WaitForResult();
-
-    if (PP_ERROR_FAILED != rv)
-      return "PPB_TCPSocket_Private can connect without allowing switch";
+        callback.GetCallback().pp_completion_callback()));
+    CHECK_CALLBACK_BEHAVIOR(callback);
+    ASSERT_EQ(PP_ERROR_FAILED, callback.result());
   }
   PASS();
 }