PPB_UDPSocket_Private is switched to the new Pepper proxy.

ppapi/shared_impl/private/ppb_udp_socket_shared.cc

Index: ppapi/shared_impl/private/ppb_udp_socket_shared.cc
diff --git a/ppapi/shared_impl/private/udp_socket_private_impl.cc b/ppapi/shared_impl/private/ppb_udp_socket_shared.cc
similarity index 73%
rename from ppapi/shared_impl/private/udp_socket_private_impl.cc
rename to ppapi/shared_impl/private/ppb_udp_socket_shared.cc
index 288c38f908e3a752def689670cfee5c6c0e24dac..cb3a31ad1083f3f7c2ce59b44449b030177ffa6b 100644
--- a/ppapi/shared_impl/private/udp_socket_private_impl.cc
+++ b/ppapi/shared_impl/private/ppb_udp_socket_shared.cc
@@ -2,46 +2,39 @@
 // 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/shared_impl/private/ppb_udp_socket_shared.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"
 
 namespace ppapi {
 
-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);
-}
+const int32_t PPB_UDPSocket_Shared::kMaxReadSize = 1024 * 1024;
+const int32_t PPB_UDPSocket_Shared::kMaxWriteSize = 1024 * 1024;
 
-UDPSocketPrivateImpl::~UDPSocketPrivateImpl() {
+PPB_UDPSocket_Shared::PPB_UDPSocket_Shared()
+    : 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));
 }
 
-thunk::PPB_UDPSocket_Private_API*
-UDPSocketPrivateImpl::AsPPB_UDPSocket_Private_API() {
-  return this;
+PPB_UDPSocket_Shared::~PPB_UDPSocket_Shared() {
 }
 
-int32_t UDPSocketPrivateImpl::SetSocketFeature(PP_UDPSocketFeature_Private name,
+int32_t PPB_UDPSocket_Shared::SetSocketFeature(PP_UDPSocketFeature_Private name,
                                                PP_Var value) {
   if (bound_ || closed_)
     return PP_ERROR_FAILED;
@@ -60,7 +53,7 @@ int32_t UDPSocketPrivateImpl::SetSocketFeature(PP_UDPSocketFeature_Private name,
   return PP_OK;
 }
 
-int32_t UDPSocketPrivateImpl::Bind(const PP_NetAddress_Private* addr,
+int32_t PPB_UDPSocket_Shared::Bind(const PP_NetAddress_Private* addr,
                                    scoped_refptr<TrackedCallback> callback) {
   if (!addr)
     return PP_ERROR_BADARGUMENT;
@@ -76,7 +69,7 @@ int32_t UDPSocketPrivateImpl::Bind(const PP_NetAddress_Private* addr,
   return PP_OK_COMPLETIONPENDING;
 }
 
-PP_Bool UDPSocketPrivateImpl::GetBoundAddress(PP_NetAddress_Private* addr) {
+PP_Bool PPB_UDPSocket_Shared::GetBoundAddress(PP_NetAddress_Private* addr) {
   if (!addr || !bound_ || closed_)
     return PP_FALSE;
 
@@ -84,7 +77,7 @@ PP_Bool UDPSocketPrivateImpl::GetBoundAddress(PP_NetAddress_Private* addr) {
   return PP_TRUE;
 }
 
-int32_t UDPSocketPrivateImpl::RecvFrom(
+int32_t PPB_UDPSocket_Shared::RecvFrom(
     char* buffer,
     int32_t num_bytes,
     scoped_refptr<TrackedCallback> callback) {
@@ -104,7 +97,7 @@ int32_t UDPSocketPrivateImpl::RecvFrom(
   return PP_OK_COMPLETIONPENDING;
 }
 
-PP_Bool UDPSocketPrivateImpl::GetRecvFromAddress(PP_NetAddress_Private* addr) {
+PP_Bool PPB_UDPSocket_Shared::GetRecvFromAddress(PP_NetAddress_Private* addr) {
   if (!addr)
     return PP_FALSE;
 
@@ -112,7 +105,7 @@ PP_Bool UDPSocketPrivateImpl::GetRecvFromAddress(PP_NetAddress_Private* addr) {
   return PP_TRUE;
 }
 
-int32_t UDPSocketPrivateImpl::SendTo(const char* buffer,
+int32_t PPB_UDPSocket_Shared::SendTo(const char* buffer,
                                      int32_t num_bytes,
                                      const PP_NetAddress_Private* addr,
                                      scoped_refptr<TrackedCallback> callback) {
@@ -133,7 +126,7 @@ int32_t UDPSocketPrivateImpl::SendTo(const char* buffer,
   return PP_OK_COMPLETIONPENDING;
 }
 
-void UDPSocketPrivateImpl::Close() {
+void PPB_UDPSocket_Shared::Close() {
   if(closed_)
     return;
 
@@ -142,14 +135,12 @@ void UDPSocketPrivateImpl::Close() {
 
   SendClose();
 
-  socket_id_ = 0;
-
   PostAbortIfNecessary(&bind_callback_);
   PostAbortIfNecessary(&recvfrom_callback_);
   PostAbortIfNecessary(&sendto_callback_);
 }
 
-void UDPSocketPrivateImpl::OnBindCompleted(
+void PPB_UDPSocket_Shared::OnBindCompleted(
     bool succeeded,
     const PP_NetAddress_Private& addr) {
   if (!TrackedCallback::IsPending(bind_callback_)) {
@@ -165,7 +156,7 @@ void UDPSocketPrivateImpl::OnBindCompleted(
   bind_callback_->Run(succeeded ? PP_OK : PP_ERROR_FAILED);
 }
 
-void UDPSocketPrivateImpl::OnRecvFromCompleted(
+void PPB_UDPSocket_Shared::OnRecvFromCompleted(
     bool succeeded,
     const std::string& data,
     const PP_NetAddress_Private& addr) {
@@ -187,7 +178,7 @@ void UDPSocketPrivateImpl::OnRecvFromCompleted(
       static_cast<int32_t>(PP_ERROR_FAILED));
 }
 
-void UDPSocketPrivateImpl::OnSendToCompleted(bool succeeded,
+void PPB_UDPSocket_Shared::OnSendToCompleted(bool succeeded,
                                              int32_t bytes_written) {
   if (!TrackedCallback::IsPending(sendto_callback_)) {
     NOTREACHED();
@@ -198,23 +189,7 @@ void UDPSocketPrivateImpl::OnSendToCompleted(bool succeeded,
       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(
+void PPB_UDPSocket_Shared::PostAbortIfNecessary(
     scoped_refptr<TrackedCallback>* callback) {
   if (TrackedCallback::IsPending(*callback))
     (*callback)->PostAbort();