Revert 184399 - PepperUDPSocketPrivateHost is switched to PepperUDPSocketPrivateMessageFilter. Also, deleted obsolete methods from pepper socket utils.

BUG=164370
TEST=browser_tests:*UDPSocketPrivate*


Review URL: https://chromiumcodereview.appspot.com/12263038

TBR=ygorshenin@chromium.org
Review URL: https://codereview.chromium.org/12390066

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185984 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 21 insertions, 17 deletions

diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h
index 1019514..afe63e3 100644
--- a/ppapi/proxy/ppapi_messages.h
+++ b/ppapi/proxy/ppapi_messages.h
@@ -1222,12 +1222,15 @@ IPC_MESSAGE_CONTROL2(PpapiHostMsg_UDPSocketPrivate_SendTo,
                      std::string /* data */,
                      PP_NetAddress_Private /* net_addr */)
 IPC_MESSAGE_CONTROL0(PpapiHostMsg_UDPSocketPrivate_Close)
-IPC_MESSAGE_CONTROL1(PpapiPluginMsg_UDPSocketPrivate_BindReply,
+IPC_MESSAGE_CONTROL2(PpapiPluginMsg_UDPSocketPrivate_BindReply,
+                     bool /* succeeded */,
                      PP_NetAddress_Private /* bound_addr */)
-IPC_MESSAGE_CONTROL2(PpapiPluginMsg_UDPSocketPrivate_RecvFromReply,
+IPC_MESSAGE_CONTROL3(PpapiPluginMsg_UDPSocketPrivate_RecvFromReply,
+                     bool /* succeeded */,
                      std::string /* data */,
                      PP_NetAddress_Private /* remote_addr */)
-IPC_MESSAGE_CONTROL1(PpapiPluginMsg_UDPSocketPrivate_SendToReply,
+IPC_MESSAGE_CONTROL2(PpapiPluginMsg_UDPSocketPrivate_SendToReply,
+                     bool /* succeeded */,
                      int32_t /* bytes_written */)
 
 // PPB_TCPServerSocket_Private.
diff --git a/ppapi/proxy/udp_socket_private_resource.cc b/ppapi/proxy/udp_socket_private_resource.cc
index 608fc00..5469f30 100644
--- a/ppapi/proxy/udp_socket_private_resource.cc
+++ b/ppapi/proxy/udp_socket_private_resource.cc
@@ -77,7 +77,7 @@ int32_t UDPSocketPrivateResource::Bind(
 
   bind_callback_ = callback;
 
-  // Send the request, the browser will call us back via BindReply.
+  // Send the request, the browser will call us back via BindACK.
   SendBind(*addr);
   return PP_OK_COMPLETIONPENDING;
 }
@@ -105,7 +105,7 @@ int32_t UDPSocketPrivateResource::RecvFrom(
   bytes_to_read_ = std::min(num_bytes, kMaxReadSize);
   recvfrom_callback_ = callback;
 
-  // Send the request, the browser will call us back via RecvFromReply.
+  // Send the request, the browser will call us back via RecvFromACK.
   SendRecvFrom(bytes_to_read_);
   return PP_OK_COMPLETIONPENDING;
 }
@@ -141,7 +141,7 @@ int32_t UDPSocketPrivateResource::SendTo(
 
   sendto_callback_ = callback;
 
-  // Send the request, the browser will call us back via SendToReply.
+  // Send the request, the browser will call us back via SendToACK.
   SendSendTo(std::string(buffer, num_bytes), *addr);
   return PP_OK_COMPLETIONPENDING;
 }
@@ -200,26 +200,27 @@ void UDPSocketPrivateResource::SendClose() {
 
 void UDPSocketPrivateResource::OnPluginMsgBindReply(
     const ResourceMessageReplyParams& params,
+    bool succeeded,
     const PP_NetAddress_Private& bound_addr) {
   if (!TrackedCallback::IsPending(bind_callback_)) {
     NOTREACHED();
     return;
   }
-  if (params.result() == PP_OK)
+  if (succeeded)
     bound_ = true;
   bound_addr_ = bound_addr;
-  bind_callback_->Run(params.result());
+  bind_callback_->Run(succeeded ? PP_OK : PP_ERROR_FAILED);
 }
 
 void UDPSocketPrivateResource::OnPluginMsgRecvFromReply(
     const ResourceMessageReplyParams& params,
+    bool succeeded,
     const std::string& data,
     const PP_NetAddress_Private& addr) {
   if (!TrackedCallback::IsPending(recvfrom_callback_) || !read_buffer_) {
     NOTREACHED();
     return;
   }
-  bool succeeded = (params.result() == PP_OK);
   if (succeeded) {
     CHECK_LE(static_cast<int32_t>(data.size()), bytes_to_read_);
     if (!data.empty())
@@ -229,23 +230,20 @@ void UDPSocketPrivateResource::OnPluginMsgRecvFromReply(
   bytes_to_read_ = -1;
   recvfrom_addr_ = addr;
 
-  if (succeeded)
-    recvfrom_callback_->Run(static_cast<int32_t>(data.size()));
-  else
-    recvfrom_callback_->Run(params.result());
+  recvfrom_callback_->Run(succeeded ? static_cast<int32_t>(data.size()) :
+      static_cast<int32_t>(PP_ERROR_FAILED));
 }
 
 void UDPSocketPrivateResource::OnPluginMsgSendToReply(
     const ResourceMessageReplyParams& params,
+    bool succeeded,
     int32_t bytes_written) {
   if (!TrackedCallback::IsPending(sendto_callback_)) {
     NOTREACHED();
     return;
   }
-  if (params.result() == PP_OK)
-    sendto_callback_->Run(bytes_written);
-  else
-    sendto_callback_->Run(params.result());
+  sendto_callback_->Run(
+      succeeded ? bytes_written : static_cast<int32_t>(PP_ERROR_FAILED));
 }
 
 }  // namespace proxy
diff --git a/ppapi/proxy/udp_socket_private_resource.h b/ppapi/proxy/udp_socket_private_resource.h
index 6403f6b..d49e085 100644
--- a/ppapi/proxy/udp_socket_private_resource.h
+++ b/ppapi/proxy/udp_socket_private_resource.h
@@ -62,11 +62,14 @@ class PPAPI_PROXY_EXPORT UDPSocketPrivateResource
 
   // IPC message handlers.
   void OnPluginMsgBindReply(const ResourceMessageReplyParams& params,
+                            bool succeeded,
                             const PP_NetAddress_Private& bound_addr);
   void OnPluginMsgRecvFromReply(const ResourceMessageReplyParams& params,
+                                bool succeeded,
                                 const std::string& data,
                                 const PP_NetAddress_Private& addr);
   void OnPluginMsgSendToReply(const ResourceMessageReplyParams& params,
+                              bool succeeded,
                               int32_t bytes_written);
 
   bool bound_;