Make the Pepper Flash net address just private, not Flash-specific.

Note that, though the PP_Flash_NetAddress struct is being renamed, binary
compatibility is being maintained. It's also safe to just rename the
PPB_Flash_NetAddress interface without maintaining backwards compatibility since
Pepper Flash isn't using it yet.

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

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

10 files changed, 131 insertions, 141 deletions

diff --git a/ppapi/cpp/private/flash_net_address.cc b/ppapi/cpp/private/flash_net_address.cc
deleted file mode 100644
index 93984d7..0000000
--- a/ppapi/cpp/private/flash_net_address.cc
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// TODO(viettrungluu): See the comment in corresponding .h file.
-
-#include "ppapi/cpp/private/flash_net_address.h"
-
-#include "ppapi/c/pp_bool.h"
-#include "ppapi/cpp/module.h"
-#include "ppapi/cpp/module_impl.h"
-#include "ppapi/cpp/var.h"
-#include "ppapi/c/private/ppb_flash_net_address.h"
-
-namespace pp {
-
-namespace {
-
-template <> const char* interface_name<PPB_Flash_NetAddress>() {
-  return PPB_FLASH_NETADDRESS_INTERFACE;
-}
-
-}  // namespace
-
-namespace flash {
-
-// static
-bool NetAddress::AreEqual(const PP_Flash_NetAddress& addr1,
-                          const PP_Flash_NetAddress& addr2) {
-  if (!has_interface<PPB_Flash_NetAddress>())
-    return false;
-  return !!get_interface<PPB_Flash_NetAddress>()->AreEqual(&addr1, &addr2);
-}
-
-// static
-bool NetAddress::AreHostsEqual(const PP_Flash_NetAddress& addr1,
-                               const PP_Flash_NetAddress& addr2) {
-  if (!has_interface<PPB_Flash_NetAddress>())
-    return false;
-  return !!get_interface<PPB_Flash_NetAddress>()->AreHostsEqual(&addr1, &addr2);
-}
-
-// static
-std::string NetAddress::Describe(const PP_Flash_NetAddress& addr,
-                                 bool include_port) {
-  if (!has_interface<PPB_Flash_NetAddress>())
-    return std::string();
-
-  Module* module = Module::Get();
-  if (!module)
-    return std::string();
-
-  Var result(Var::PassRef(),
-             get_interface<PPB_Flash_NetAddress>()->Describe(
-                 module->pp_module(),
-                 &addr,
-                 PP_FromBool(include_port)));
-  return result.is_string() ? result.AsString() : std::string();
-}
-
-// static
-bool NetAddress::ReplacePort(const PP_Flash_NetAddress& addr_in,
-                             uint16_t port,
-                             PP_Flash_NetAddress* addr_out) {
-  if (!has_interface<PPB_Flash_NetAddress>())
-    return false;
-  return !!get_interface<PPB_Flash_NetAddress>()->ReplacePort(&addr_in,
-                                                              port,
-                                                              addr_out);
-}
-
-// static
-void NetAddress::GetAnyAddress(bool is_ipv6, PP_Flash_NetAddress* addr) {
-  if (!has_interface<PPB_Flash_NetAddress>())
-    return;
-  get_interface<PPB_Flash_NetAddress>()->GetAnyAddress(PP_FromBool(is_ipv6),
-                                                       addr);
-}
-
-}  // namespace flash
-}  // namespace pp
diff --git a/ppapi/cpp/private/flash_net_address.h b/ppapi/cpp/private/flash_net_address.h
deleted file mode 100644
index f08cb52..0000000
--- a/ppapi/cpp/private/flash_net_address.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// TODO(viettrungluu): This (and the .cc file) contain C++ wrappers for things
-// in ppapi/c/private/ppb_flash_net_address.h. This is currently not used in
-// (or even compiled with) Chromium.
-
-#ifndef PPAPI_CPP_PRIVATE_FLASH_NET_ADDRESS_H_
-#define PPAPI_CPP_PRIVATE_FLASH_NET_ADDRESS_H_
-
-#include <string>
-
-#include "ppapi/c/pp_stdint.h"
-
-struct PP_Flash_NetAddress;
-
-namespace pp {
-namespace flash {
-
-class NetAddress {
- public:
-  static bool AreEqual(const PP_Flash_NetAddress& addr1,
-                       const PP_Flash_NetAddress& addr2);
-  static bool AreHostsEqual(const PP_Flash_NetAddress& addr1,
-                            const PP_Flash_NetAddress& addr2);
-  static std::string Describe(const PP_Flash_NetAddress& addr,
-                              bool include_port);
-  static bool ReplacePort(const PP_Flash_NetAddress& addr_in,
-                          uint16_t port,
-                          PP_Flash_NetAddress* addr_out);
-  static void GetAnyAddress(bool is_ipv6, PP_Flash_NetAddress* addr);
-};
-
-}  // namespace flash
-}  // namespace pp
-
-#endif  // PPAPI_CPP_PRIVATE_FLASH_NET_ADDRESS_H_
diff --git a/ppapi/cpp/private/flash_net_connector.cc b/ppapi/cpp/private/flash_net_connector.cc
index 05b26f2..faa6c9b3a 100644
--- a/ppapi/cpp/private/flash_net_connector.cc
+++ b/ppapi/cpp/private/flash_net_connector.cc
@@ -34,8 +34,8 @@ NetConnector::NetConnector(const Instance& instance) {
 int32_t NetConnector::ConnectTcp(const char* host,
                                  uint16_t port,
                                  PP_FileHandle* socket_out,
-                                 PP_Flash_NetAddress* local_addr_out,
-                                 PP_Flash_NetAddress* remote_addr_out,
+                                 PP_NetAddress_Private* local_addr_out,
+                                 PP_NetAddress_Private* remote_addr_out,
                                  const CompletionCallback& cc) {
   if (!has_interface<PPB_Flash_NetConnector>())
     return cc.MayForce(PP_ERROR_NOINTERFACE);
@@ -46,10 +46,10 @@ int32_t NetConnector::ConnectTcp(const char* host,
       cc.pp_completion_callback());
 }
 
-int32_t NetConnector::ConnectTcpAddress(const PP_Flash_NetAddress* addr,
+int32_t NetConnector::ConnectTcpAddress(const PP_NetAddress_Private* addr,
                                         PP_FileHandle* socket_out,
-                                        PP_Flash_NetAddress* local_addr_out,
-                                        PP_Flash_NetAddress* remote_addr_out,
+                                        PP_NetAddress_Private* local_addr_out,
+                                        PP_NetAddress_Private* remote_addr_out,
                                         const CompletionCallback& cc) {
   if (!has_interface<PPB_Flash_NetConnector>())
     return cc.MayForce(PP_ERROR_NOINTERFACE);
diff --git a/ppapi/cpp/private/flash_net_connector.h b/ppapi/cpp/private/flash_net_connector.h
index 56df193..b855250 100644
--- a/ppapi/cpp/private/flash_net_connector.h
+++ b/ppapi/cpp/private/flash_net_connector.h
@@ -26,13 +26,13 @@ class NetConnector : public Resource {
   int32_t ConnectTcp(const char* host,
                      uint16_t port,
                      PP_FileHandle* socket_out,
-                     PP_Flash_NetAddress* local_addr_out,
-                     PP_Flash_NetAddress* remote_addr_out,
+                     PP_NetAddress_Private* local_addr_out,
+                     PP_NetAddress_Private* remote_addr_out,
                      const CompletionCallback& cc);
-  int32_t ConnectTcpAddress(const PP_Flash_NetAddress* addr,
+  int32_t ConnectTcpAddress(const PP_NetAddress_Private* addr,
                             PP_FileHandle* socket_out,
-                            PP_Flash_NetAddress* local_addr_out,
-                            PP_Flash_NetAddress* remote_addr_out,
+                            PP_NetAddress_Private* local_addr_out,
+                            PP_NetAddress_Private* remote_addr_out,
                             const CompletionCallback& cc);
 };
 
diff --git a/ppapi/cpp/private/flash_tcp_socket.cc b/ppapi/cpp/private/flash_tcp_socket.cc
index 98e9906..0dec218 100644
--- a/ppapi/cpp/private/flash_tcp_socket.cc
+++ b/ppapi/cpp/private/flash_tcp_socket.cc
@@ -41,7 +41,7 @@ int32_t TCPSocket::Connect(const char* host,
       pp_resource(), host, port, callback.pp_completion_callback());
 }
 
-int32_t TCPSocket::ConnectWithNetAddress(const PP_Flash_NetAddress* addr,
+int32_t TCPSocket::ConnectWithNetAddress(const PP_NetAddress_Private* addr,
                                          const CompletionCallback& callback) {
   if (!has_interface<PPB_Flash_TCPSocket>())
     return callback.MayForce(PP_ERROR_NOINTERFACE);
@@ -49,7 +49,7 @@ int32_t TCPSocket::ConnectWithNetAddress(const PP_Flash_NetAddress* addr,
       pp_resource(), addr, callback.pp_completion_callback());
 }
 
-bool TCPSocket::GetLocalAddress(PP_Flash_NetAddress* local_addr) {
+bool TCPSocket::GetLocalAddress(PP_NetAddress_Private* local_addr) {
   if (!has_interface<PPB_Flash_TCPSocket>())
     return false;
 
@@ -58,7 +58,7 @@ bool TCPSocket::GetLocalAddress(PP_Flash_NetAddress* local_addr) {
   return PP_ToBool(result);
 }
 
-bool TCPSocket::GetRemoteAddress(PP_Flash_NetAddress* remote_addr) {
+bool TCPSocket::GetRemoteAddress(PP_NetAddress_Private* remote_addr) {
   if (!has_interface<PPB_Flash_TCPSocket>())
     return false;
   PP_Bool result = get_interface<PPB_Flash_TCPSocket>()->GetRemoteAddress(
diff --git a/ppapi/cpp/private/flash_tcp_socket.h b/ppapi/cpp/private/flash_tcp_socket.h
index b7ead00..41d21c0 100644
--- a/ppapi/cpp/private/flash_tcp_socket.h
+++ b/ppapi/cpp/private/flash_tcp_socket.h
@@ -27,10 +27,10 @@ class TCPSocket : public Resource {
   int32_t Connect(const char* host,
                   uint16_t port,
                   const CompletionCallback& callback);
-  int32_t ConnectWithNetAddress(const PP_Flash_NetAddress* addr,
+  int32_t ConnectWithNetAddress(const PP_NetAddress_Private* addr,
                                 const CompletionCallback& callback);
-  bool GetLocalAddress(PP_Flash_NetAddress* local_addr);
-  bool GetRemoteAddress(PP_Flash_NetAddress* remote_addr);
+  bool GetLocalAddress(PP_NetAddress_Private* local_addr);
+  bool GetRemoteAddress(PP_NetAddress_Private* remote_addr);
   int32_t SSLHandshake(const char* server_name,
                        uint16_t server_port,
                        const CompletionCallback& callback);
diff --git a/ppapi/cpp/private/flash_udp_socket.cc b/ppapi/cpp/private/flash_udp_socket.cc
index 1ac36a3..797f3ea 100644
--- a/ppapi/cpp/private/flash_udp_socket.cc
+++ b/ppapi/cpp/private/flash_udp_socket.cc
@@ -30,7 +30,7 @@ UDPSocket::UDPSocket(Instance* instance) {
   }
 }
 
-int32_t UDPSocket::Bind(const PP_Flash_NetAddress* addr,
+int32_t UDPSocket::Bind(const PP_NetAddress_Private* addr,
                         const CompletionCallback& callback) {
   if (!has_interface<PPB_Flash_UDPSocket>())
     return PP_ERROR_NOINTERFACE;
@@ -47,7 +47,7 @@ int32_t UDPSocket::RecvFrom(char* buffer,
       pp_resource(), buffer, num_bytes, callback.pp_completion_callback());
 }
 
-bool UDPSocket::GetRecvFromAddress(PP_Flash_NetAddress* addr) {
+bool UDPSocket::GetRecvFromAddress(PP_NetAddress_Private* addr) {
   if (!has_interface<PPB_Flash_UDPSocket>())
     return false;
 
@@ -58,7 +58,7 @@ bool UDPSocket::GetRecvFromAddress(PP_Flash_NetAddress* addr) {
 
 int32_t UDPSocket::SendTo(const char* buffer,
                           int32_t num_bytes,
-                          const struct PP_Flash_NetAddress* addr,
+                          const PP_NetAddress_Private* addr,
                           const CompletionCallback& callback) {
   if (!has_interface<PPB_Flash_UDPSocket>())
     return PP_ERROR_NOINTERFACE;
diff --git a/ppapi/cpp/private/flash_udp_socket.h b/ppapi/cpp/private/flash_udp_socket.h
index e472c00..b4b223e 100644
--- a/ppapi/cpp/private/flash_udp_socket.h
+++ b/ppapi/cpp/private/flash_udp_socket.h
@@ -20,15 +20,15 @@ class UDPSocket : public Resource {
  public:
   explicit UDPSocket(Instance* instance);
 
-  int32_t Bind(const PP_Flash_NetAddress* addr,
+  int32_t Bind(const PP_NetAddress_Private* addr,
                const CompletionCallback& callback);
   int32_t RecvFrom(char* buffer,
                    int32_t num_bytes,
                    const CompletionCallback& callback);
-  bool GetRecvFromAddress(PP_Flash_NetAddress* addr);
+  bool GetRecvFromAddress(PP_NetAddress_Private* addr);
   int32_t SendTo(const char* buffer,
                  int32_t num_bytes,
-                 const PP_Flash_NetAddress* addr,
+                 const PP_NetAddress_Private* addr,
                  const CompletionCallback& callback);
   void Close();
 };
diff --git a/ppapi/cpp/private/net_address_private.cc b/ppapi/cpp/private/net_address_private.cc
new file mode 100644
index 0000000..6b844da
--- /dev/null
+++ b/ppapi/cpp/private/net_address_private.cc
@@ -0,0 +1,77 @@
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "ppapi/cpp/private/net_address_private.h"
+
+#include "ppapi/c/pp_bool.h"
+#include "ppapi/cpp/module.h"
+#include "ppapi/cpp/module_impl.h"
+#include "ppapi/cpp/var.h"
+#include "ppapi/c/private/ppb_net_address_private.h"
+
+namespace pp {
+
+namespace {
+
+template <> const char* interface_name<PPB_NetAddress_Private>() {
+  return PPB_NETADDRESS_PRIVATE_INTERFACE;
+}
+
+}  // namespace
+
+// static
+bool NetAddress::AreEqual(const PP_NetAddress_Private& addr1,
+                          const PP_NetAddress_Private& addr2) {
+  if (!has_interface<PPB_NetAddress_Private>())
+    return false;
+  return !!get_interface<PPB_NetAddress_Private>()->AreEqual(&addr1, &addr2);
+}
+
+// static
+bool NetAddress::AreHostsEqual(const PP_NetAddress_Private& addr1,
+                               const PP_NetAddress_Private& addr2) {
+  if (!has_interface<PPB_NetAddress_Private>())
+    return false;
+  return !!get_interface<PPB_NetAddress_Private>()->AreHostsEqual(&addr1,
+                                                                  &addr2);
+}
+
+// static
+std::string NetAddress::Describe(const PP_NetAddress_Private& addr,
+                                 bool include_port) {
+  if (!has_interface<PPB_NetAddress_Private>())
+    return std::string();
+
+  Module* module = Module::Get();
+  if (!module)
+    return std::string();
+
+  Var result(Var::PassRef(),
+             get_interface<PPB_NetAddress_Private>()->Describe(
+                 module->pp_module(),
+                 &addr,
+                 PP_FromBool(include_port)));
+  return result.is_string() ? result.AsString() : std::string();
+}
+
+// static
+bool NetAddress::ReplacePort(const PP_NetAddress_Private& addr_in,
+                             uint16_t port,
+                             PP_NetAddress_Private* addr_out) {
+  if (!has_interface<PPB_NetAddress_Private>())
+    return false;
+  return !!get_interface<PPB_NetAddress_Private>()->ReplacePort(&addr_in,
+                                                                port,
+                                                                addr_out);
+}
+
+// static
+void NetAddress::GetAnyAddress(bool is_ipv6, PP_NetAddress_Private* addr) {
+  if (!has_interface<PPB_NetAddress_Private>())
+    return;
+  get_interface<PPB_NetAddress_Private>()->GetAnyAddress(PP_FromBool(is_ipv6),
+                                                         addr);
+}
+
+}  // namespace pp
diff --git a/ppapi/cpp/private/net_address_private.h b/ppapi/cpp/private/net_address_private.h
new file mode 100644
index 0000000..cc60a1b
--- /dev/null
+++ b/ppapi/cpp/private/net_address_private.h
@@ -0,0 +1,32 @@
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef PPAPI_CPP_PRIVATE_NET_ADDRESS_PRIVATE_H_
+#define PPAPI_CPP_PRIVATE_NET_ADDRESS_PRIVATE_H_
+
+#include <string>
+
+#include "ppapi/c/pp_stdint.h"
+
+struct PP_NetAddress_Private;
+
+namespace pp {
+
+class NetAddress {
+ public:
+  static bool AreEqual(const PP_NetAddress_Private& addr1,
+                       const PP_NetAddress_Private& addr2);
+  static bool AreHostsEqual(const PP_NetAddress_Private& addr1,
+                            const PP_NetAddress_Private& addr2);
+  static std::string Describe(const PP_NetAddress_Private& addr,
+                              bool include_port);
+  static bool ReplacePort(const PP_NetAddress_Private& addr_in,
+                          uint16_t port,
+                          PP_NetAddress_Private* addr_out);
+  static void GetAnyAddress(bool is_ipv6, PP_NetAddress_Private* addr);
+};
+
+}  // namespace pp
+
+#endif  // PPAPI_CPP_PRIVATE_NET_ADDRESS_PRIVATE_H_