From 3860209812b3c57373dcd33c17cf31a1786d554b Mon Sep 17 00:00:00 2001
From: "rsleevi@chromium.org"
 <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 29 Mar 2013 19:11:18 +0000
Subject: Revert 191401 "Implemented queued UDP SendTo/RecvFrom requests. ..."

Broken on Linux ChromiumOS

> Implemented queued UDP SendTo/RecvFrom requests. Exposed SO_SNDBUF and SO_RVFBUF socket options.
>
> BUG=154338
> TEST=browser_tests:*UDPSocketPrivate*
> TBR=jschuh
>
> Review URL: https://chromiumcodereview.appspot.com/12316095

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191415 0039d316-1c4b-4281-b951-d872f2087c98
---
 ppapi/cpp/private/udp_socket_private.cc | 45 ++-------------------------------
 1 file changed, 2 insertions(+), 43 deletions(-)

(limited to 'ppapi/cpp/private/udp_socket_private.cc')

diff --git a/ppapi/cpp/private/udp_socket_private.cc b/ppapi/cpp/private/udp_socket_private.cc
index 705ffa6..c100924 100644
--- a/ppapi/cpp/private/udp_socket_private.cc
+++ b/ppapi/cpp/private/udp_socket_private.cc
@@ -16,10 +16,6 @@ namespace pp {
 
 namespace {
 
-template <> const char* interface_name<PPB_UDPSocket_Private_0_5>() {
-  return PPB_UDPSOCKET_PRIVATE_INTERFACE_0_5;
-}
-
 template <> const char* interface_name<PPB_UDPSocket_Private_0_4>() {
   return PPB_UDPSOCKET_PRIVATE_INTERFACE_0_4;
 }
@@ -31,10 +27,7 @@ template <> const char* interface_name<PPB_UDPSocket_Private_0_3>() {
 }  // namespace
 
 UDPSocketPrivate::UDPSocketPrivate(const InstanceHandle& instance) {
-  if (has_interface<PPB_UDPSocket_Private_0_5>()) {
-    PassRefFromConstructor(get_interface<PPB_UDPSocket_Private_0_5>()->Create(
-        instance.pp_instance()));
-  } else if (has_interface<PPB_UDPSocket_Private_0_4>()) {
+  if (has_interface<PPB_UDPSocket_Private_0_4>()) {
     PassRefFromConstructor(get_interface<PPB_UDPSocket_Private_0_4>()->Create(
         instance.pp_instance()));
   } else if (has_interface<PPB_UDPSocket_Private_0_3>()) {
@@ -45,17 +38,12 @@ UDPSocketPrivate::UDPSocketPrivate(const InstanceHandle& instance) {
 
 // static
 bool UDPSocketPrivate::IsAvailable() {
-  return has_interface<PPB_UDPSocket_Private_0_5>() ||
-      has_interface<PPB_UDPSocket_Private_0_4>() ||
+  return has_interface<PPB_UDPSocket_Private_0_4>() ||
       has_interface<PPB_UDPSocket_Private_0_3>();
 }
 
 int32_t UDPSocketPrivate::SetSocketFeature(PP_UDPSocketFeature_Private name,
                                            const Var& value) {
-  if (has_interface<PPB_UDPSocket_Private_0_5>()) {
-    return get_interface<PPB_UDPSocket_Private_0_5>()->SetSocketFeature(
-        pp_resource(), name, value.pp_var());
-  }
   if (has_interface<PPB_UDPSocket_Private_0_4>()) {
     return get_interface<PPB_UDPSocket_Private_0_4>()->SetSocketFeature(
         pp_resource(), name, value.pp_var());
@@ -65,10 +53,6 @@ int32_t UDPSocketPrivate::SetSocketFeature(PP_UDPSocketFeature_Private name,
 
 int32_t UDPSocketPrivate::Bind(const PP_NetAddress_Private* addr,
                                const CompletionCallback& callback) {
-  if (has_interface<PPB_UDPSocket_Private_0_5>()) {
-    return get_interface<PPB_UDPSocket_Private_0_5>()->Bind(
-        pp_resource(), addr, callback.pp_completion_callback());
-  }
   if (has_interface<PPB_UDPSocket_Private_0_4>()) {
     return get_interface<PPB_UDPSocket_Private_0_4>()->Bind(
         pp_resource(), addr, callback.pp_completion_callback());
@@ -81,12 +65,6 @@ int32_t UDPSocketPrivate::Bind(const PP_NetAddress_Private* addr,
 }
 
 bool UDPSocketPrivate::GetBoundAddress(PP_NetAddress_Private* addr) {
-  if (has_interface<PPB_UDPSocket_Private_0_5>()) {
-    PP_Bool result =
-        get_interface<PPB_UDPSocket_Private_0_5>()->GetBoundAddress(
-            pp_resource(), addr);
-    return PP_ToBool(result);
-  }
   if (has_interface<PPB_UDPSocket_Private_0_4>()) {
     PP_Bool result =
         get_interface<PPB_UDPSocket_Private_0_4>()->GetBoundAddress(
@@ -116,18 +94,6 @@ int32_t UDPSocketPrivate::RecvFrom(char* buffer,
   return callback.MayForce(PP_ERROR_NOINTERFACE);
 }
 
-int32_t UDPSocketPrivate::RecvFrom(char* buffer,
-                                   int32_t num_bytes,
-                                   PP_NetAddress_Private* addr,
-                                   const CompletionCallback& callback) {
-  if (has_interface<PPB_UDPSocket_Private_0_5>()) {
-    return get_interface<PPB_UDPSocket_Private_0_5>()->RecvFrom(
-        pp_resource(), buffer, num_bytes, addr,
-        callback.pp_completion_callback());
-  }
-  return callback.MayForce(PP_ERROR_NOINTERFACE);
-}
-
 bool UDPSocketPrivate::GetRecvFromAddress(PP_NetAddress_Private* addr) {
   if (has_interface<PPB_UDPSocket_Private_0_4>()) {
     PP_Bool result =
@@ -148,11 +114,6 @@ int32_t UDPSocketPrivate::SendTo(const char* buffer,
                                  int32_t num_bytes,
                                  const PP_NetAddress_Private* addr,
                                  const CompletionCallback& callback) {
-  if (has_interface<PPB_UDPSocket_Private_0_5>()) {
-    return get_interface<PPB_UDPSocket_Private_0_5>()->SendTo(
-        pp_resource(), buffer, num_bytes, addr,
-        callback.pp_completion_callback());
-  }
   if (has_interface<PPB_UDPSocket_Private_0_4>()) {
     return get_interface<PPB_UDPSocket_Private_0_4>()->SendTo(
         pp_resource(), buffer, num_bytes, addr,
@@ -167,8 +128,6 @@ int32_t UDPSocketPrivate::SendTo(const char* buffer,
 }
 
 void UDPSocketPrivate::Close() {
-  if (has_interface<PPB_UDPSocket_Private_0_5>())
-    return get_interface<PPB_UDPSocket_Private_0_5>()->Close(pp_resource());
   if (has_interface<PPB_UDPSocket_Private_0_4>())
     return get_interface<PPB_UDPSocket_Private_0_4>()->Close(pp_resource());
   if (has_interface<PPB_UDPSocket_Private_0_3>())
-- 
cgit v1.1