Revert 111666 - Move PepperTCPSocket and PepperUDPSocket from pepper_message_filter to separate files.

This CL also combines SocketManager/TCPSocketManger/UDPSocketManager into PepperMessageFilter.

BUG=None
TEST=OutOfProcessPPAPITest.TCPSocketPrivate passes.


Review URL: http://codereview.chromium.org/8586008

TBR=yzshen@chromium.org
Review URL: http://codereview.chromium.org/8715002

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

2 files changed, 0 insertions, 104 deletions

diff --git a/ppapi/shared_impl/private/net_address_private_impl.cc b/ppapi/shared_impl/private/net_address_private_impl.cc
index 1cc161f..817d8fc 100644
--- a/ppapi/shared_impl/private/net_address_private_impl.cc
+++ b/ppapi/shared_impl/private/net_address_private_impl.cc
@@ -12,8 +12,6 @@
 #include "base/logging.h"
 #include "base/stringprintf.h"
 #include "build/build_config.h"
-#include "net/base/address_list.h"
-#include "net/base/ip_endpoint.h"
 #include "net/base/net_util.h"
 #include "net/base/sys_addrinfo.h"
 #include "net/base/sys_byteorder.h"
@@ -43,14 +41,6 @@ namespace ppapi {
 
 namespace {
 
-// This assert fails on OpenBSD for an unknown reason at the moment.
-#if !defined(OS_OPENBSD)
-// Make sure the storage in |PP_NetAddress_Private| is big enough. (Do it here
-// since the data is opaque elsewhere.)
-COMPILE_ASSERT(sizeof(reinterpret_cast<PP_NetAddress_Private*>(0)->data) >=
-               sizeof(sockaddr_storage), PP_NetAddress_Private_data_too_small);
-#endif
-
 inline sa_family_t GetFamily(const PP_NetAddress_Private& addr) {
   return reinterpret_cast<const sockaddr*>(addr.data)->sa_family;
 }
@@ -289,9 +279,6 @@ GetPPB_NetAddress_Private_Thunk() {
 }  // namespace thunk
 
 // static
-const PP_NetAddress_Private NetAddressPrivateImpl::kInvalidNetAddress = { 0 };
-
-// static
 bool NetAddressPrivateImpl::ValidateNetAddress(
     const PP_NetAddress_Private& addr) {
   if (addr.size < sizeof(reinterpret_cast<sockaddr*>(0)->sa_family))
@@ -310,69 +297,4 @@ bool NetAddressPrivateImpl::ValidateNetAddress(
   return false;
 }
 
-// static
-bool NetAddressPrivateImpl::SockaddrToNetAddress(
-    const sockaddr* sa,
-    uint32_t sa_length,
-    PP_NetAddress_Private* net_addr) {
-  if (!sa || sa_length == 0 || !net_addr)
-    return false;
-
-  CHECK_LE(sa_length, sizeof(net_addr->data));
-  net_addr->size = sa_length;
-  memcpy(net_addr->data, sa, net_addr->size);
-  return true;
-}
-
-// static
-bool NetAddressPrivateImpl::IPEndPointToNetAddress(
-    const net::IPEndPoint& ip,
-    PP_NetAddress_Private* net_addr) {
-  sockaddr_storage storage = { 0 };
-  size_t length = sizeof(storage);
-
-  return ip.ToSockAddr(reinterpret_cast<sockaddr*>(&storage), &length) &&
-      SockaddrToNetAddress(reinterpret_cast<const sockaddr*>(&storage), length,
-                           net_addr);
-}
-
-// static
-bool NetAddressPrivateImpl::AddressListToNetAddress(
-    const net::AddressList& address_list,
-    PP_NetAddress_Private* net_addr) {
-  const addrinfo* head = address_list.head();
-  return head && SockaddrToNetAddress(head->ai_addr, head->ai_addrlen,
-                                      net_addr);
-}
-
-// static
-bool NetAddressPrivateImpl::NetAddressToIPEndPoint(
-    const PP_NetAddress_Private& net_addr,
-    net::IPEndPoint* ip_end_point) {
-  if (!ip_end_point || !ValidateNetAddress(net_addr))
-    return false;
-
-  if (!ip_end_point->FromSockAddr(
-      reinterpret_cast<const sockaddr*>(net_addr.data), net_addr.size)) {
-    return false;
-  }
-
-  return true;
-}
-
-// static
-bool NetAddressPrivateImpl::NetAddressToAddressList(
-    const PP_NetAddress_Private& net_addr, net::AddressList* address_list) {
-  if (!address_list)
-    return false;
-
-  net::IPEndPoint ip_end_point;
-  if (!NetAddressToIPEndPoint(net_addr, &ip_end_point))
-    return false;
-
-  *address_list = net::AddressList::CreateFromIPAddress(ip_end_point.address(),
-                                                        ip_end_point.port());
-  return true;
-}
-
 }  // namespace ppapi
diff --git a/ppapi/shared_impl/private/net_address_private_impl.h b/ppapi/shared_impl/private/net_address_private_impl.h
index 8212f10..e5ae6fa 100644
--- a/ppapi/shared_impl/private/net_address_private_impl.h
+++ b/ppapi/shared_impl/private/net_address_private_impl.h
@@ -6,16 +6,9 @@
 #define PPAPI_SHARED_IMPL_PRIVATE_NET_ADDRESS_PRIVATE_IMPL_H_
 
 #include "base/basictypes.h"
-#include "ppapi/c/pp_stdint.h"
 #include "ppapi/shared_impl/ppapi_shared_export.h"
 
 struct PP_NetAddress_Private;
-struct sockaddr;
-
-namespace net {
-class AddressList;
-class IPEndPoint;
-}
 
 namespace ppapi {
 
@@ -23,25 +16,6 @@ class PPAPI_SHARED_EXPORT NetAddressPrivateImpl {
  public:
   static bool ValidateNetAddress(const PP_NetAddress_Private& addr);
 
-  static bool SockaddrToNetAddress(const sockaddr* sa,
-                                   uint32_t sa_length,
-                                   PP_NetAddress_Private* net_addr);
-
-  static bool IPEndPointToNetAddress(const net::IPEndPoint& ip,
-                                     PP_NetAddress_Private* net_addr);
-
-  // Converts the first address to a PP_NetAddress_Private.
-  static bool AddressListToNetAddress(const net::AddressList& address_list,
-                                      PP_NetAddress_Private* net_addr);
-
-  static bool NetAddressToIPEndPoint(const PP_NetAddress_Private& net_addr,
-                                     net::IPEndPoint* ip_end_point);
-
-  static bool NetAddressToAddressList(const PP_NetAddress_Private& net_addr,
-                                      net::AddressList* address_list);
-
-  static const PP_NetAddress_Private kInvalidNetAddress;
-
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(NetAddressPrivateImpl);
 };