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

4 files changed, 18 insertions, 60 deletions

diff --git a/ppapi/api/private/ppb_flash_net_connector.idl b/ppapi/api/private/ppb_flash_net_connector.idl
deleted file mode 100644
index 3886dad..0000000
--- a/ppapi/api/private/ppb_flash_net_connector.idl
+++ /dev/null
@@ -1,41 +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.
- */
-
-/* This is an opaque type holding a network address. */
-struct PP_Flash_NetAddress {
-  uint32_t size;
-  [fixed=128] uint8_t data;
-};
-
-interface PPB_Flash_NetConnector_0_1 {
-  PP_Resource Create(
-      [in] PP_Instance instance_id);
-  PP_Bool IsFlashNetConnector(
-      [in] PP_Resource resource_id);
-
-  /* Connect to a TCP port given as a host-port pair. The local and remote
-   * addresses of the connection (if successful) are returned in
-   * |local_addr_out| and |remote_addr_out|, respectively, if non-null.
-   */
-  int32_t ConnectTcp(
-      [in] PP_Resource connector_id,
-      [in] str_t host,
-      [in] uint16_t port,
-      [out] PP_FileHandle socket_out,
-      [out] PP_Flash_NetAddress local_addr_out,
-      [out] PP_Flash_NetAddress remote_addr_out,
-      [in] PP_CompletionCallback callback);
-
-  /* Same as |ConnectTcp()|, but connecting to the address given by |addr|. A
-   * typical use-case would be for reconnections.
-   */
-  int32_t ConnectTcpAddress(
-      [in] PP_Resource connector_id,
-      [in] PP_Flash_NetAddress addr,
-      [out] PP_FileHandle socket_out,
-      [out] PP_Flash_NetAddress local_addr_out,
-      [out] PP_Flash_NetAddress remote_addr_out,
-      [in] PP_CompletionCallback callback);
-};
diff --git a/ppapi/api/private/ppb_flash_tcp_socket.idl b/ppapi/api/private/ppb_flash_tcp_socket.idl
index e832809..fae44e1 100644
--- a/ppapi/api/private/ppb_flash_tcp_socket.idl
+++ b/ppapi/api/private/ppb_flash_tcp_socket.idl
@@ -41,7 +41,7 @@ interface PPB_Flash_TCPSocket {
    * use-case would be for reconnections.
    */
   int32_t ConnectWithNetAddress([in] PP_Resource tcp_socket,
-                                [in] PP_Flash_NetAddress addr,
+                                [in] PP_NetAddress_Private addr,
                                 [in] PP_CompletionCallback callback);
 
   /**
@@ -49,14 +49,14 @@ interface PPB_Flash_TCPSocket {
    * Returns PP_TRUE on success.
    */
   PP_Bool GetLocalAddress([in] PP_Resource tcp_socket,
-                          [out] PP_Flash_NetAddress local_addr);
+                          [out] PP_NetAddress_Private local_addr);
 
   /**
    * Gets the remote address of the socket, if it has been connected.
    * Returns PP_TRUE on success.
    */
   PP_Bool GetRemoteAddress([in] PP_Resource tcp_socket,
-                           [out] PP_Flash_NetAddress remote_addr);
+                           [out] PP_NetAddress_Private remote_addr);
 
   /**
    * Does SSL handshake and moves to sending and receiving encrypted data. The
diff --git a/ppapi/api/private/ppb_flash_udp_socket.idl b/ppapi/api/private/ppb_flash_udp_socket.idl
index 7328db8..3fd5523 100644
--- a/ppapi/api/private/ppb_flash_udp_socket.idl
+++ b/ppapi/api/private/ppb_flash_udp_socket.idl
@@ -24,7 +24,7 @@ interface PPB_Flash_UDPSocket {
 
   /* Creates a socket and binds to the address given by |addr|. */
   int32_t Bind([in] PP_Resource udp_socket,
-               [in] PP_Flash_NetAddress addr,
+               [in] PP_NetAddress_Private addr,
                [in] PP_CompletionCallback callback);
 
   /* Performs a non-blocking recvfrom call on socket.
@@ -41,7 +41,7 @@ interface PPB_Flash_UDPSocket {
    * was received from is stored in |addr|.
    */
   PP_Bool GetRecvFromAddress([in] PP_Resource udp_socket,
-                             [out] PP_Flash_NetAddress addr);
+                             [out] PP_NetAddress_Private addr);
 
   /* Performs a non-blocking sendto call on the socket created and
    * bound(has already called Bind).  The callback |callback| is
@@ -50,10 +50,9 @@ interface PPB_Flash_UDPSocket {
   int32_t SendTo([in] PP_Resource udp_socket,
                  [in] str_t buffer,
                  [in] int32_t num_bytes,
-                 [in] PP_Flash_NetAddress addr,
+                 [in] PP_NetAddress_Private addr,
                  [in] PP_CompletionCallback callback);
 
   /* Cancels all pending reads and writes, and closes the socket. */
   void Close([in] PP_Resource udp_socket);
 };
-
diff --git a/ppapi/api/private/ppb_flash_net_address.idl b/ppapi/api/private/ppb_net_address_private.idl
index 012c024..a086d7f 100644
--- a/ppapi/api/private/ppb_flash_net_address.idl
+++ b/ppapi/api/private/ppb_net_address_private.idl
@@ -4,7 +4,7 @@
  */
 
 /**
- * This file defines the <code>PPB_Flash_NetAddress</code> interface.
+ * This file defines the <code>PPB_NetAddress_Private</code> interface.
  */
 
 label Chrome {
@@ -15,27 +15,27 @@ label Chrome {
  * This is an opaque type holding a network address.
  */
 [assert_size(132)]
-struct PP_Flash_NetAddress {
+struct PP_NetAddress_Private {
   uint32_t size;
   char[128] data;
 };
 
 /**
- * The <code>PPB_Flash_NetAddress</code> interface provides operations on
+ * The <code>PPB_NetAddress_Private</code> interface provides operations on
  * network addresses.
  */
-interface PPB_Flash_NetAddress {
+interface PPB_NetAddress_Private {
   /**
     * Returns PP_TRUE if the two addresses are equal (host and port).
     */
-  PP_Bool AreEqual([in] PP_Flash_NetAddress addr1,
-                   [in] PP_Flash_NetAddress addr2);
+  PP_Bool AreEqual([in] PP_NetAddress_Private addr1,
+                   [in] PP_NetAddress_Private addr2);
 
   /**
     * Returns PP_TRUE if the two addresses refer to the same host.
     */
-  PP_Bool AreHostsEqual([in] PP_Flash_NetAddress addr1,
-                        [in] PP_Flash_NetAddress addr2);
+  PP_Bool AreHostsEqual([in] PP_NetAddress_Private addr1,
+                        [in] PP_NetAddress_Private addr2);
 
   /**
     * Returns a human-readable description of the network address, optionally
@@ -43,19 +43,19 @@ interface PPB_Flash_NetAddress {
     * or an undefined var on failure.
     */
   PP_Var Describe([in] PP_Module module,
-                  [in] PP_Flash_NetAddress addr,
+                  [in] PP_NetAddress_Private addr,
                   [in] PP_Bool include_port);
 
   /**
     * Replaces the port in the given source address. Returns PP_TRUE on success.
     */
-  PP_Bool ReplacePort([in] PP_Flash_NetAddress src_addr,
+  PP_Bool ReplacePort([in] PP_NetAddress_Private src_addr,
                       [in] uint16_t port,
-                      [out] PP_Flash_NetAddress dest_addr);
+                      [out] PP_NetAddress_Private dest_addr);
 
   /**
     * Gets the "any" address (for IPv4 or IPv6); for use with UDP Bind.
     */
   void GetAnyAddress([in] PP_Bool is_ipv6,
-                     [out] PP_Flash_NetAddress addr);
+                     [out] PP_NetAddress_Private addr);
 };