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

5 files changed, 23 insertions, 23 deletions

diff --git a/webkit/plugins/ppapi/mock_plugin_delegate.cc b/webkit/plugins/ppapi/mock_plugin_delegate.cc
index bc12ee4..4a914bd 100644
--- a/webkit/plugins/ppapi/mock_plugin_delegate.cc
+++ b/webkit/plugins/ppapi/mock_plugin_delegate.cc
@@ -221,7 +221,7 @@ int32_t MockPluginDelegate::ConnectTcp(
 
 int32_t MockPluginDelegate::ConnectTcpAddress(
     webkit::ppapi::PPB_Flash_NetConnector_Impl* connector,
-    const struct PP_Flash_NetAddress* addr) {
+    const PP_NetAddress_Private* addr) {
   return PP_ERROR_FAILED;
 }
 
diff --git a/webkit/plugins/ppapi/mock_plugin_delegate.h b/webkit/plugins/ppapi/mock_plugin_delegate.h
index 291cf78..0988ebe 100644
--- a/webkit/plugins/ppapi/mock_plugin_delegate.h
+++ b/webkit/plugins/ppapi/mock_plugin_delegate.h
@@ -7,6 +7,8 @@
 
 #include "webkit/plugins/ppapi/plugin_delegate.h"
 
+struct PP_NetAddress_Private;
+
 namespace webkit {
 namespace ppapi {
 
@@ -97,7 +99,7 @@ class MockPluginDelegate : public PluginDelegate {
       uint16_t port);
   virtual int32_t ConnectTcpAddress(
       webkit::ppapi::PPB_Flash_NetConnector_Impl* connector,
-      const struct PP_Flash_NetAddress* addr);
+      const PP_NetAddress_Private* addr);
   virtual int32_t ShowContextMenu(
       PluginInstance* instance,
       webkit::ppapi::PPB_Flash_Menu_Impl* menu,
diff --git a/webkit/plugins/ppapi/plugin_delegate.h b/webkit/plugins/ppapi/plugin_delegate.h
index 394bcab..a5323d0 100644
--- a/webkit/plugins/ppapi/plugin_delegate.h
+++ b/webkit/plugins/ppapi/plugin_delegate.h
@@ -29,8 +29,10 @@
 
 class AudioMessageFilter;
 class GURL;
+struct PP_NetAddress_Private;
 class SkBitmap;
 class Task;
+class TransportDIB;
 
 namespace base {
 class MessageLoopProxy;
@@ -72,10 +74,6 @@ namespace webkit_glue {
 class P2PTransport;
 }  // namespace webkit_glue
 
-struct PP_Flash_NetAddress;
-
-class TransportDIB;
-
 namespace webkit {
 namespace ppapi {
 
@@ -387,7 +385,7 @@ class PluginDelegate {
       uint16_t port) = 0;
   virtual int32_t ConnectTcpAddress(
       webkit::ppapi::PPB_Flash_NetConnector_Impl* connector,
-      const struct PP_Flash_NetAddress* addr) = 0;
+      const PP_NetAddress_Private* addr) = 0;
 
   // Show the given context menu at the given position (in the plugin's
   // coordinates).
diff --git a/webkit/plugins/ppapi/ppb_flash_net_connector_impl.cc b/webkit/plugins/ppapi/ppb_flash_net_connector_impl.cc
index 1adbf48..13999592 100644
--- a/webkit/plugins/ppapi/ppb_flash_net_connector_impl.cc
+++ b/webkit/plugins/ppapi/ppb_flash_net_connector_impl.cc
@@ -36,8 +36,8 @@ int32_t PPB_Flash_NetConnector_Impl::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,
     PP_CompletionCallback callback) {
   // |socket_out| is not optional.
   if (!socket_out)
@@ -69,10 +69,10 @@ int32_t PPB_Flash_NetConnector_Impl::ConnectTcp(
 }
 
 int32_t PPB_Flash_NetConnector_Impl::ConnectTcpAddress(
-    const PP_Flash_NetAddress* addr,
+    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,
     PP_CompletionCallback callback) {
   // |socket_out| is not optional.
   if (!socket_out)
@@ -105,8 +105,8 @@ int32_t PPB_Flash_NetConnector_Impl::ConnectTcpAddress(
 
 void PPB_Flash_NetConnector_Impl::CompleteConnectTcp(
     PP_FileHandle socket,
-    const PP_Flash_NetAddress& local_addr,
-    const PP_Flash_NetAddress& remote_addr) {
+    const PP_NetAddress_Private& local_addr,
+    const PP_NetAddress_Private& remote_addr) {
   int32_t rv = PP_ERROR_ABORTED;
   if (!callback_->aborted()) {
     CHECK(!callback_->completed());
diff --git a/webkit/plugins/ppapi/ppb_flash_net_connector_impl.h b/webkit/plugins/ppapi/ppb_flash_net_connector_impl.h
index b1e04df..bd2e97a 100644
--- a/webkit/plugins/ppapi/ppb_flash_net_connector_impl.h
+++ b/webkit/plugins/ppapi/ppb_flash_net_connector_impl.h
@@ -31,19 +31,19 @@ class PPB_Flash_NetConnector_Impl
   virtual 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,
                              PP_CompletionCallback callback) OVERRIDE;
-  virtual int32_t ConnectTcpAddress(const PP_Flash_NetAddress* addr,
+  virtual 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,
                                     PP_CompletionCallback callback) OVERRIDE;
 
   // Called to complete |ConnectTcp()| and |ConnectTcpAddress()|.
   void CompleteConnectTcp(PP_FileHandle socket,
-                          const PP_Flash_NetAddress& local_addr,
-                          const PP_Flash_NetAddress& remote_addr);
+                          const PP_NetAddress_Private& local_addr,
+                          const PP_NetAddress_Private& remote_addr);
 
  private:
   // Any pending callback (for |ConnectTcp()| or |ConnectTcpAddress()|).
@@ -52,8 +52,8 @@ class PPB_Flash_NetConnector_Impl
   // Output buffers to be filled in when the callback is completed successfully
   // (|{local,remote}_addr_out| are optional and may be null).
   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_;
 
   DISALLOW_COPY_AND_ASSIGN(PPB_Flash_NetConnector_Impl);
 };