PPB_UDPSocket_Private is switched to the new Pepper proxy.

ppapi/proxy/udp_socket_private_resource.cc

Index: ppapi/proxy/udp_socket_private_resource.cc
diff --git a/ppapi/shared_impl/private/udp_socket_private_impl.cc b/ppapi/proxy/udp_socket_private_resource.cc
similarity index 55%
rename from ppapi/shared_impl/private/udp_socket_private_impl.cc
rename to ppapi/proxy/udp_socket_private_resource.cc
index 288c38f908e3a752def689670cfee5c6c0e24dac..5469f3082edb58534158efc5a17699baeb738383 100644
--- a/ppapi/shared_impl/private/udp_socket_private_impl.cc
+++ b/ppapi/proxy/udp_socket_private_resource.cc
@@ -2,47 +2,52 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ppapi/shared_impl/private/udp_socket_private_impl.h"
-
-#include <string.h>
+#include "ppapi/proxy/udp_socket_private_resource.h"
 
 #include <algorithm>
+#include <cstring>
 
 #include "base/basictypes.h"
-#include "base/bind.h"
 #include "base/logging.h"
-#include "base/message_loop.h"
 #include "ppapi/c/pp_bool.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
+#include "ppapi/proxy/ppapi_messages.h"
 
 namespace ppapi {
+namespace proxy {
+
+const int32_t UDPSocketPrivateResource::kMaxReadSize = 1024 * 1024;
+const int32_t UDPSocketPrivateResource::kMaxWriteSize = 1024 * 1024;
+
+UDPSocketPrivateResource::UDPSocketPrivateResource(Connection connection,
+                                                   PP_Instance instance)
+    : PluginResource(connection, instance),
+      bound_(false),
+      closed_(false),
+      read_buffer_(NULL),
+      bytes_to_read_(-1) {
+  recvfrom_addr_.size = 0;
+  memset(recvfrom_addr_.data, 0,
+         arraysize(recvfrom_addr_.data) * sizeof(*recvfrom_addr_.data));
+  bound_addr_.size = 0;
+  memset(bound_addr_.data, 0,
+         arraysize(bound_addr_.data) * sizeof(*bound_addr_.data));
 
-const int32_t UDPSocketPrivateImpl::kMaxReadSize = 1024 * 1024;
-const int32_t UDPSocketPrivateImpl::kMaxWriteSize = 1024 * 1024;
-
-UDPSocketPrivateImpl::UDPSocketPrivateImpl(const HostResource& resource,
-                                           uint32 socket_id)
-    : Resource(OBJECT_IS_PROXY, resource) {
-  Init(socket_id);
-}
-
-UDPSocketPrivateImpl::UDPSocketPrivateImpl(PP_Instance instance,
-                                           uint32 socket_id)
-    : Resource(OBJECT_IS_IMPL, instance) {
-  Init(socket_id);
+  SendCreate(BROWSER, PpapiHostMsg_UDPSocketPrivate_Create());
 }
 
-UDPSocketPrivateImpl::~UDPSocketPrivateImpl() {
+UDPSocketPrivateResource::~UDPSocketPrivateResource() {
 }
 
 thunk::PPB_UDPSocket_Private_API*
-UDPSocketPrivateImpl::AsPPB_UDPSocket_Private_API() {
+UDPSocketPrivateResource::AsPPB_UDPSocket_Private_API() {
   return this;
 }
 
-int32_t UDPSocketPrivateImpl::SetSocketFeature(PP_UDPSocketFeature_Private name,
-                                               PP_Var value) {
+int32_t UDPSocketPrivateResource::SetSocketFeature(
+    PP_UDPSocketFeature_Private name,
+    PP_Var value) {
   if (bound_ || closed_)
     return PP_ERROR_FAILED;
 
@@ -60,8 +65,9 @@ int32_t UDPSocketPrivateImpl::SetSocketFeature(PP_UDPSocketFeature_Private name,
   return PP_OK;
 }
 
-int32_t UDPSocketPrivateImpl::Bind(const PP_NetAddress_Private* addr,
-                                   scoped_refptr<TrackedCallback> callback) {
+int32_t UDPSocketPrivateResource::Bind(
+    const PP_NetAddress_Private* addr,
+    scoped_refptr<TrackedCallback> callback) {
   if (!addr)
     return PP_ERROR_BADARGUMENT;
   if (bound_ || closed_)
@@ -76,7 +82,7 @@ int32_t UDPSocketPrivateImpl::Bind(const PP_NetAddress_Private* addr,
   return PP_OK_COMPLETIONPENDING;
 }
 
-PP_Bool UDPSocketPrivateImpl::GetBoundAddress(PP_NetAddress_Private* addr) {
+PP_Bool UDPSocketPrivateResource::GetBoundAddress(PP_NetAddress_Private* addr) {
   if (!addr || !bound_ || closed_)
     return PP_FALSE;
 
@@ -84,7 +90,7 @@ PP_Bool UDPSocketPrivateImpl::GetBoundAddress(PP_NetAddress_Private* addr) {
   return PP_TRUE;
 }
 
-int32_t UDPSocketPrivateImpl::RecvFrom(
+int32_t UDPSocketPrivateResource::RecvFrom(
     char* buffer,
     int32_t num_bytes,
     scoped_refptr<TrackedCallback> callback) {
@@ -104,18 +110,25 @@ int32_t UDPSocketPrivateImpl::RecvFrom(
   return PP_OK_COMPLETIONPENDING;
 }
 
-PP_Bool UDPSocketPrivateImpl::GetRecvFromAddress(PP_NetAddress_Private* addr) {
+PP_Bool UDPSocketPrivateResource::GetRecvFromAddress(
+    PP_NetAddress_Private* addr) {
   if (!addr)
     return PP_FALSE;
-
   *addr = recvfrom_addr_;
   return PP_TRUE;
 }
 
-int32_t UDPSocketPrivateImpl::SendTo(const char* buffer,
-                                     int32_t num_bytes,
-                                     const PP_NetAddress_Private* addr,
-                                     scoped_refptr<TrackedCallback> callback) {
+void UDPSocketPrivateResource::PostAbortIfNecessary(
+    scoped_refptr<TrackedCallback>* callback) {
+  if (TrackedCallback::IsPending(*callback))
+    (*callback)->PostAbort();
+}
+
+int32_t UDPSocketPrivateResource::SendTo(
+    const char* buffer,
+    int32_t num_bytes,
+    const PP_NetAddress_Private* addr,
+    scoped_refptr<TrackedCallback> callback) {
   if (!buffer || num_bytes <= 0 || !addr)
     return PP_ERROR_BADARGUMENT;
   if (!bound_)
@@ -133,7 +146,7 @@ int32_t UDPSocketPrivateImpl::SendTo(const char* buffer,
   return PP_OK_COMPLETIONPENDING;
 }
 
-void UDPSocketPrivateImpl::Close() {
+void UDPSocketPrivateResource::Close() {
   if(closed_)
     return;
 
@@ -142,30 +155,65 @@ void UDPSocketPrivateImpl::Close() {
 
   SendClose();
 
-  socket_id_ = 0;
-
   PostAbortIfNecessary(&bind_callback_);
   PostAbortIfNecessary(&recvfrom_callback_);
   PostAbortIfNecessary(&sendto_callback_);
 }
 
-void UDPSocketPrivateImpl::OnBindCompleted(
+void UDPSocketPrivateResource::SendBoolSocketFeature(int32_t name, bool value) {
+  PpapiHostMsg_UDPSocketPrivate_SetBoolSocketFeature msg(name, value);
+  Post(BROWSER, msg);
+}
+
+void UDPSocketPrivateResource::SendBind(const PP_NetAddress_Private& addr) {
+  PpapiHostMsg_UDPSocketPrivate_Bind msg(addr);
+  Call<PpapiPluginMsg_UDPSocketPrivate_BindReply>(
+      BROWSER,
+      msg,
+      base::Bind(&UDPSocketPrivateResource::OnPluginMsgBindReply,
+                 base::Unretained(this)));
+}
+
+void UDPSocketPrivateResource::SendRecvFrom(int32_t num_bytes) {
+  PpapiHostMsg_UDPSocketPrivate_RecvFrom msg(num_bytes);
+  Call<PpapiPluginMsg_UDPSocketPrivate_RecvFromReply>(
+      BROWSER,
+      msg,
+      base::Bind(&UDPSocketPrivateResource::OnPluginMsgRecvFromReply,
+                 base::Unretained(this)));
+}
+
+void UDPSocketPrivateResource::SendSendTo(const std::string& buffer,
+                                          const PP_NetAddress_Private& addr) {
+  PpapiHostMsg_UDPSocketPrivate_SendTo msg(buffer, addr);
+  Call<PpapiPluginMsg_UDPSocketPrivate_SendToReply>(
+      BROWSER,
+      msg,
+      base::Bind(&UDPSocketPrivateResource::OnPluginMsgSendToReply,
+                 base::Unretained(this)));
+}
+
+void UDPSocketPrivateResource::SendClose() {
+  PpapiHostMsg_UDPSocketPrivate_Close msg;
+  Post(BROWSER, msg);
+}
+
+void UDPSocketPrivateResource::OnPluginMsgBindReply(
+    const ResourceMessageReplyParams& params,
     bool succeeded,
-    const PP_NetAddress_Private& addr) {
+    const PP_NetAddress_Private& bound_addr) {
   if (!TrackedCallback::IsPending(bind_callback_)) {
     NOTREACHED();
     return;
   }
-
   if (succeeded)
     bound_ = true;
-
-  bound_addr_ = addr;
-
+  bound_addr_ = bound_addr;
   bind_callback_->Run(succeeded ? PP_OK : PP_ERROR_FAILED);
 }
 
-void UDPSocketPrivateImpl::OnRecvFromCompleted(
+void UDPSocketPrivateResource::OnPluginMsgRecvFromReply(
+    const ResourceMessageReplyParams& params,
     bool succeeded,
     const std::string& data,
     const PP_NetAddress_Private& addr) {
@@ -173,7 +221,6 @@ void UDPSocketPrivateImpl::OnRecvFromCompleted(
     NOTREACHED();
     return;
   }
-
   if (succeeded) {
     CHECK_LE(static_cast<int32_t>(data.size()), bytes_to_read_);
     if (!data.empty())
@@ -187,37 +234,17 @@ void UDPSocketPrivateImpl::OnRecvFromCompleted(
       static_cast<int32_t>(PP_ERROR_FAILED));
 }
 
-void UDPSocketPrivateImpl::OnSendToCompleted(bool succeeded,
-                                             int32_t bytes_written) {
+void UDPSocketPrivateResource::OnPluginMsgSendToReply(
+    const ResourceMessageReplyParams& params,
+    bool succeeded,
+    int32_t bytes_written) {
   if (!TrackedCallback::IsPending(sendto_callback_)) {
     NOTREACHED();
     return;
   }
-
   sendto_callback_->Run(
       succeeded ? bytes_written : static_cast<int32_t>(PP_ERROR_FAILED));
 }
 
-void UDPSocketPrivateImpl::Init(uint32 socket_id) {
-  DCHECK(socket_id != 0);
-  socket_id_ = socket_id;
-  bound_ = false;
-  closed_ = false;
-  read_buffer_ = NULL;
-  bytes_to_read_ = -1;
-
-  recvfrom_addr_.size = 0;
-  memset(recvfrom_addr_.data, 0,
-         arraysize(recvfrom_addr_.data) * sizeof(*recvfrom_addr_.data));
-  bound_addr_.size = 0;
-  memset(bound_addr_.data, 0,
-         arraysize(bound_addr_.data) * sizeof(*bound_addr_.data));
-}
-
-void UDPSocketPrivateImpl::PostAbortIfNecessary(
-    scoped_refptr<TrackedCallback>* callback) {
-  if (TrackedCallback::IsPending(*callback))
-    (*callback)->PostAbort();
-}
-
+}  // namespace proxy
 }  // namespace ppapi