PPAPI: More test cleanup

ppapi/tests/test_net_address_private_untrusted.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_net_address_private_untrusted.h"
 
 #include <limits>
 #include <sstream>
 
 #include "ppapi/c/pp_errors.h"
@@ skipping 39 matching lines @@
   RUN_TEST(GetFamily, filter);
   RUN_TEST(GetPort, filter);
   RUN_TEST(GetAddress, filter);
 }
 
 int32_t TestNetAddressPrivateUntrusted::Connect(TCPSocketPrivate* socket,
                                                 const std::string& host,
                                                 uint16_t port) {
   TestCompletionCallback callback(instance_->pp_instance(), false);
 
-  int32_t rv = socket->Connect(host.c_str(), port, callback.GetCallback());
-  if (rv == PP_OK_COMPLETIONPENDING)
-    rv = callback.WaitForResult();
-  return rv;
+  callback.WaitForResult(
+      socket->Connect(host.c_str(), port, callback.GetCallback()));
+  return callback.result();
 }
 
 std::string TestNetAddressPrivateUntrusted::TestAreEqual() {
   pp::TCPSocketPrivate socket(instance_);
   int32_t rv = Connect(&socket, host_, port_);
   if (rv != PP_OK)
     return ReportError("pp::TCPSocketPrivate::Connect", rv);
 
   PP_NetAddress_Private local_address, remote_address;
   ASSERT_TRUE(socket.GetLocalAddress(&local_address));
@@ skipping 122 matching lines @@
   ASSERT_TRUE(socket.GetRemoteAddress(&remote_address));
 
   static const uint16_t buffer_size = sizeof(remote_address.data);
   char buffer[buffer_size];
   ASSERT_TRUE(NetAddressPrivate::GetAddress(remote_address, buffer,
                                             buffer_size));
 
   socket.Disconnect();
   PASS();
 }