TCPSockets are switched to the new Pepper proxy.

ppapi/proxy/udp_socket_resource_base.cc

 // Copyright 2013 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/proxy/udp_socket_resource_base.h"
 
 #include <algorithm>
 #include <cstring>
 
 #include "base/logging.h"
 #include "ppapi/c/pp_bool.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
+#include "ppapi/proxy/error_conversion.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/shared_impl/socket_option_data.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/resource_creation_api.h"
 
 namespace ppapi {
 namespace proxy {
 
-namespace {
-
-int32_t ConvertPPError(int32_t pp_error, bool private_api) {
-  // The private API doesn't return network-specific error codes or
-  // PP_ERROR_NOACCESS. In order to preserve the behavior, we convert those to
-  // PP_ERROR_FAILED.
-  if (private_api &&
-      (pp_error <= PP_ERROR_CONNECTION_CLOSED ||
-       pp_error == PP_ERROR_NOACCESS)) {
-    return PP_ERROR_FAILED;
-  }
-
-  return pp_error;
-}
-
-}  // namespace
-
 const int32_t UDPSocketResourceBase::kMaxReadSize = 1024 * 1024;
 const int32_t UDPSocketResourceBase::kMaxWriteSize = 1024 * 1024;
 const int32_t UDPSocketResourceBase::kMaxSendBufferSize =
     1024 * UDPSocketResourceBase::kMaxWriteSize;
 const int32_t UDPSocketResourceBase::kMaxReceiveBufferSize =
     1024 * UDPSocketResourceBase::kMaxReadSize;
 
 
 UDPSocketResourceBase::UDPSocketResourceBase(Connection connection,
                                              PP_Instance instance,
@@ skipping 171 matching lines @@
 void UDPSocketResourceBase::PostAbortIfNecessary(
     scoped_refptr<TrackedCallback>* callback) {
   if (TrackedCallback::IsPending(*callback))
     (*callback)->PostAbort();
 }
 
 void UDPSocketResourceBase::OnPluginMsgSetOptionReply(
     scoped_refptr<TrackedCallback> callback,
     const ResourceMessageReplyParams& params) {
   if (TrackedCallback::IsPending(callback))
-    callback->Run(ConvertPPError(params.result(), private_api_));
+    RunCallback(callback, params.result());
 }
 
 void UDPSocketResourceBase::OnPluginMsgBindReply(
     const ResourceMessageReplyParams& params,
     const PP_NetAddress_Private& bound_addr) {
   // It is possible that |bind_callback_| is pending while |closed_| is true:
   // CloseImpl() has been called, but a BindReply came earlier than the task to
   // abort |bind_callback_|. We don't want to update |bound_| or |bound_addr_|
   // in that case.
   if (!TrackedCallback::IsPending(bind_callback_) || closed_)
     return;
 
   if (params.result() == PP_OK)
     bound_ = true;
   bound_addr_ = bound_addr;
-  bind_callback_->Run(ConvertPPError(params.result(), private_api_));
+  RunCallback(bind_callback_, params.result());
 }
 
 void UDPSocketResourceBase::OnPluginMsgRecvFromReply(
     PP_Resource* output_addr,
     const ResourceMessageReplyParams& params,
     const std::string& data,
     const PP_NetAddress_Private& addr) {
   // It is possible that |recvfrom_callback_| is pending while |read_buffer_| is
   // NULL: CloseImpl() has been called, but a RecvFromReply came earlier than
   // the task to abort |recvfrom_callback_|. We shouldn't access the buffer in
@@ skipping 16 matching lines @@
     CHECK_LE(static_cast<int32_t>(data.size()), bytes_to_read_);
     if (!data.empty())
       memcpy(read_buffer_, data.c_str(), data.size());
   }
 
   read_buffer_ = NULL;
   bytes_to_read_ = -1;
   recvfrom_addr_ = addr;
 
   if (result == PP_OK)
-    recvfrom_callback_->Run(static_cast<int32_t>(data.size()));
+    RunCallback(recvfrom_callback_, static_cast<int32_t>(data.size()));
   else
-    recvfrom_callback_->Run(ConvertPPError(result, private_api_));
+    RunCallback(recvfrom_callback_, result);
 }
 
 void UDPSocketResourceBase::OnPluginMsgSendToReply(
     const ResourceMessageReplyParams& params,
     int32_t bytes_written) {
   if (!TrackedCallback::IsPending(sendto_callback_))
     return;
 
   if (params.result() == PP_OK)
-    sendto_callback_->Run(bytes_written);
+    RunCallback(sendto_callback_, bytes_written);
   else
-    sendto_callback_->Run(ConvertPPError(params.result(), private_api_));
+    RunCallback(sendto_callback_, params.result());
+}
+
+void UDPSocketResourceBase::RunCallback(scoped_refptr<TrackedCallback> callback,
+                                        int32_t pp_result) {
+  callback->Run(ConvertNetworkAPIErrorForCompatibility(pp_result,
+                                                       private_api_));
 }
 
 }  // namespace proxy
 }  // namespace ppapi