Remove 'Flash' from TCP/UDP Pepper interfaces.

ppapi/thunk/ppb_tcp_socket_thunk.cc

Index: ppapi/thunk/ppb_tcp_socket_thunk.cc
diff --git a/ppapi/thunk/ppb_flash_tcp_socket_thunk.cc b/ppapi/thunk/ppb_tcp_socket_thunk.cc
similarity index 72%
rename from ppapi/thunk/ppb_flash_tcp_socket_thunk.cc
rename to ppapi/thunk/ppb_tcp_socket_thunk.cc
index a1ce67ea31ee7640d1761a1c84ae44dd8b7f7cba..0d165f8620a6763583ae365594d3f7cd09ebc076 100644
--- a/ppapi/thunk/ppb_flash_tcp_socket_thunk.cc
+++ b/ppapi/thunk/ppb_tcp_socket_thunk.cc
@@ -4,11 +4,11 @@
 
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
-#include "ppapi/c/private/ppb_flash_tcp_socket.h"
+#include "ppapi/c/private/ppb_tcp_socket.h"
 #include "ppapi/thunk/common.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/thunk.h"
-#include "ppapi/thunk/ppb_flash_tcp_socket_api.h"
+#include "ppapi/thunk/ppb_tcp_socket_api.h"
 #include "ppapi/thunk/resource_creation_api.h"
 
 namespace ppapi {
@@ -20,11 +20,11 @@ PP_Resource Create(PP_Instance instance) {
   EnterFunction<ResourceCreationAPI> enter(instance, true);
   if (enter.failed())
     return 0;
-  return enter.functions()->CreateFlashTCPSocket(instance);
+  return enter.functions()->CreateTCPSocket(instance);
 }
 
-PP_Bool IsFlashTCPSocket(PP_Resource resource) {
-  EnterResource<PPB_Flash_TCPSocket_API> enter(resource, false);
+PP_Bool IsTCPSocket(PP_Resource resource) {
+  EnterResource<PPB_TCPSocket_API> enter(resource, false);
   return PP_FromBool(enter.succeeded());
 }
 
@@ -32,7 +32,7 @@ int32_t Connect(PP_Resource tcp_socket,
                 const char* host,
                 uint16_t port,
                 PP_CompletionCallback callback) {
-  EnterResource<PPB_Flash_TCPSocket_API> enter(tcp_socket, true);
+  EnterResource<PPB_TCPSocket_API> enter(tcp_socket, true);
   if (enter.failed())
     return MayForceCallback(callback, PP_ERROR_BADRESOURCE);
   int32_t result = enter.object()->Connect(host, port, callback);
@@ -40,9 +40,9 @@ int32_t Connect(PP_Resource tcp_socket,
 }
 
 int32_t ConnectWithNetAddress(PP_Resource tcp_socket,
-                              const PP_Flash_NetAddress* addr,
+                              const PP_NetAddress* addr,
                               PP_CompletionCallback callback) {
-  EnterResource<PPB_Flash_TCPSocket_API> enter(tcp_socket, true);
+  EnterResource<PPB_TCPSocket_API> enter(tcp_socket, true);
   if (enter.failed())
     return MayForceCallback(callback, PP_ERROR_BADRESOURCE);
   int32_t result = enter.object()->ConnectWithNetAddress(addr, callback);
@@ -50,16 +50,16 @@ int32_t ConnectWithNetAddress(PP_Resource tcp_socket,
 }
 
 PP_Bool GetLocalAddress(PP_Resource tcp_socket,
-                        PP_Flash_NetAddress* local_addr) {
-  EnterResource<PPB_Flash_TCPSocket_API> enter(tcp_socket, true);
+                        PP_NetAddress* local_addr) {
+  EnterResource<PPB_TCPSocket_API> enter(tcp_socket, true);
   if (enter.failed())
     return PP_FALSE;
   return enter.object()->GetLocalAddress(local_addr);
 }
 
 PP_Bool GetRemoteAddress(PP_Resource tcp_socket,
-                         PP_Flash_NetAddress* remote_addr) {
-  EnterResource<PPB_Flash_TCPSocket_API> enter(tcp_socket, true);
+                         PP_NetAddress* remote_addr) {
+  EnterResource<PPB_TCPSocket_API> enter(tcp_socket, true);
   if (enter.failed())
     return PP_FALSE;
   return enter.object()->GetRemoteAddress(remote_addr);
@@ -69,7 +69,7 @@ int32_t SSLHandshake(PP_Resource tcp_socket,
                      const char* server_name,
                      uint16_t server_port,
                      PP_CompletionCallback callback) {
-  EnterResource<PPB_Flash_TCPSocket_API> enter(tcp_socket, true);
+  EnterResource<PPB_TCPSocket_API> enter(tcp_socket, true);
   if (enter.failed())
     return MayForceCallback(callback, PP_ERROR_BADRESOURCE);
   int32_t result = enter.object()->SSLHandshake(server_name, server_port,
@@ -81,7 +81,7 @@ int32_t Read(PP_Resource tcp_socket,
              char* buffer,
              int32_t bytes_to_read,
              PP_CompletionCallback callback) {
-  EnterResource<PPB_Flash_TCPSocket_API> enter(tcp_socket, true);
+  EnterResource<PPB_TCPSocket_API> enter(tcp_socket, true);
   if (enter.failed())
     return MayForceCallback(callback, PP_ERROR_BADRESOURCE);
   int32_t result = enter.object()->Read(buffer, bytes_to_read, callback);
@@ -92,7 +92,7 @@ int32_t Write(PP_Resource tcp_socket,
               const char* buffer,
               int32_t bytes_to_write,
               PP_CompletionCallback callback) {
-  EnterResource<PPB_Flash_TCPSocket_API> enter(tcp_socket, true);
+  EnterResource<PPB_TCPSocket_API> enter(tcp_socket, true);
   if (enter.failed())
     return MayForceCallback(callback, PP_ERROR_BADRESOURCE);
   int32_t result = enter.object()->Write(buffer, bytes_to_write, callback);
@@ -100,14 +100,14 @@ int32_t Write(PP_Resource tcp_socket,
 }
 
 void Disconnect(PP_Resource tcp_socket) {
-  EnterResource<PPB_Flash_TCPSocket_API> enter(tcp_socket, true);
+  EnterResource<PPB_TCPSocket_API> enter(tcp_socket, true);
   if (enter.succeeded())
     enter.object()->Disconnect();
 }
 
-const PPB_Flash_TCPSocket g_ppb_flash_tcp_socket_thunk = {
+const PPB_TCPSocket g_ppb_tcp_socket_thunk = {
   &Create,
-  &IsFlashTCPSocket,
+  &IsTCPSocket,
   &Connect,
   &ConnectWithNetAddress,
   &GetLocalAddress,
@@ -120,8 +120,8 @@ const PPB_Flash_TCPSocket g_ppb_flash_tcp_socket_thunk = {
 
 }  // namespace
 
-const PPB_Flash_TCPSocket* GetPPB_Flash_TCPSocket_Thunk() {
-  return &g_ppb_flash_tcp_socket_thunk;
+const PPB_TCPSocket* GetPPB_TCPSocket_Thunk() {
+  return &g_ppb_tcp_socket_thunk;
 }
 
 }  // namespace thunk