Remove 'Flash' from TCP/UDP Pepper interfaces.

ppapi/cpp/private/tcp_socket.h

Index: ppapi/cpp/private/tcp_socket.h
diff --git a/ppapi/cpp/private/flash_tcp_socket.h b/ppapi/cpp/private/tcp_socket.h
similarity index 69%
rename from ppapi/cpp/private/flash_tcp_socket.h
rename to ppapi/cpp/private/tcp_socket.h
index b7ead00bb3126b878641a7a3ff5608b9b0953df9..67205b200926594539d5a64d1a49842bcac6a322 100644
--- a/ppapi/cpp/private/flash_tcp_socket.h
+++ b/ppapi/cpp/private/tcp_socket.h
@@ -3,14 +3,14 @@
 // found in the LICENSE file.
 
 // TODO(yzshen): This (and the .cc file) contain C++ wrappers for things
-// in ppapi/c/private/ppb_flash_tcp_socket.h. This is currently not used in
+// in ppapi/c/private/ppb_tcp_socket.h. This is currently not used in
 // (or even compiled with) Chromium.

[yzshen1, 2011/11/09 23:53:55]

Now we can compile it (as well as udp_socket) with Chromium, I think.

[Dmitry Polukhin, 2011/11/10 15:10:11]

Done.

 
-#ifndef PPAPI_CPP_PRIVATE_FLASH_TCP_SOCKET_H_
-#define PPAPI_CPP_PRIVATE_FLASH_TCP_SOCKET_H_
+#ifndef PPAPI_CPP_PRIVATE_TCP_SOCKET_H_
+#define PPAPI_CPP_PRIVATE_TCP_SOCKET_H_
 
 #include "ppapi/c/pp_stdint.h"
-#include "ppapi/c/private/ppb_flash_tcp_socket.h"
+#include "ppapi/c/private/ppb_tcp_socket.h"
 #include "ppapi/cpp/resource.h"
 
 namespace pp {
@@ -18,8 +18,6 @@ namespace pp {
 class CompletionCallback;
 class Instance;
 
-namespace flash {
-
 class TCPSocket : public Resource {
  public:
   explicit TCPSocket(Instance* instance);
@@ -27,10 +25,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* addr,
                                 const CompletionCallback& callback);
-  bool GetLocalAddress(PP_Flash_NetAddress* local_addr);
-  bool GetRemoteAddress(PP_Flash_NetAddress* remote_addr);
+  bool GetLocalAddress(PP_NetAddress* local_addr);
+  bool GetRemoteAddress(PP_NetAddress* remote_addr);
   int32_t SSLHandshake(const char* server_name,
                        uint16_t server_port,
                        const CompletionCallback& callback);
@@ -43,7 +41,6 @@ class TCPSocket : public Resource {
   void Disconnect();
 };
 
-}  // namespace flash
 }  // namespace pp
 
-#endif  // PPAPI_CPP_PRIVATE_FLASH_TCP_SOCKET_H_
+#endif  // PPAPI_CPP_PRIVATE_TCP_SOCKET_H_