Remove 'Flash' from TCP/UDP Pepper interfaces.

ppapi/thunk/ppb_udp_socket_thunk.cc

Index: ppapi/thunk/ppb_udp_socket_thunk.cc
diff --git a/ppapi/thunk/ppb_flash_udp_socket_thunk.cc b/ppapi/thunk/ppb_udp_socket_thunk.cc
similarity index 69%
rename from ppapi/thunk/ppb_flash_udp_socket_thunk.cc
rename to ppapi/thunk/ppb_udp_socket_thunk.cc
index ee2e13c35e8c9ec52de5c3af134cb2a85ad67d27..79564da3f0351fb5c3364e7234e799c8bb99aed9 100644
--- a/ppapi/thunk/ppb_flash_udp_socket_thunk.cc
+++ b/ppapi/thunk/ppb_udp_socket_thunk.cc
@@ -4,10 +4,10 @@
 
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
-#include "ppapi/c/private/ppb_flash_udp_socket.h"
+#include "ppapi/c/private/ppb_udp_socket.h"
 #include "ppapi/thunk/common.h"
 #include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/ppb_flash_udp_socket_api.h"
+#include "ppapi/thunk/ppb_udp_socket_api.h"
 #include "ppapi/thunk/resource_creation_api.h"
 #include "ppapi/thunk/thunk.h"
 
@@ -20,18 +20,18 @@ PP_Resource Create(PP_Instance instance) {
   EnterFunction<ResourceCreationAPI> enter(instance, true);
   if (enter.failed())
     return 0;
-  return enter.functions()->CreateFlashUDPSocket(instance);
+  return enter.functions()->CreateUDPSocket(instance);
 }
 
-PP_Bool IsFlashUDPSocket(PP_Resource resource) {
-  EnterResource<PPB_Flash_UDPSocket_API> enter(resource, false);
+PP_Bool IsUDPSocket(PP_Resource resource) {
+  EnterResource<PPB_UDPSocket_API> enter(resource, false);
   return PP_FromBool(enter.succeeded());
 }
 
 int32_t Bind(PP_Resource udp_socket,
-             const PP_Flash_NetAddress *addr,
+             const PP_NetAddress *addr,
              PP_CompletionCallback callback) {
-  EnterResource<PPB_Flash_UDPSocket_API> enter(udp_socket, true);
+  EnterResource<PPB_UDPSocket_API> enter(udp_socket, true);
   if (enter.failed())
     return MayForceCallback(callback, PP_ERROR_BADRESOURCE);
   int32_t result = enter.object()->Bind(addr, callback);
@@ -42,7 +42,7 @@ int32_t RecvFrom(PP_Resource udp_socket,
                  char* buffer,
                  int32_t num_bytes,
                  PP_CompletionCallback callback) {
-  EnterResource<PPB_Flash_UDPSocket_API> enter(udp_socket, true);
+  EnterResource<PPB_UDPSocket_API> enter(udp_socket, true);
   if (enter.failed())
     return MayForceCallback(callback, PP_ERROR_BADRESOURCE);
   int32_t result = enter.object()->RecvFrom(buffer,
@@ -52,8 +52,8 @@ int32_t RecvFrom(PP_Resource udp_socket,
 }
 
 PP_Bool GetRecvFromAddress(PP_Resource udp_socket,
-                           PP_Flash_NetAddress* addr) {
-  EnterResource<PPB_Flash_UDPSocket_API> enter(udp_socket, true);
+                           PP_NetAddress* addr) {
+  EnterResource<PPB_UDPSocket_API> enter(udp_socket, true);
   if (enter.failed())
     return PP_FALSE;
   return enter.object()->GetRecvFromAddress(addr);
@@ -62,9 +62,9 @@ PP_Bool GetRecvFromAddress(PP_Resource udp_socket,
 int32_t SendTo(PP_Resource udp_socket,
                const char* buffer,
                int32_t num_bytes,
-               const PP_Flash_NetAddress* addr,
+               const PP_NetAddress* addr,
                PP_CompletionCallback callback) {
-  EnterResource<PPB_Flash_UDPSocket_API> enter(udp_socket, true);
+  EnterResource<PPB_UDPSocket_API> enter(udp_socket, true);
   if (enter.failed())
     return MayForceCallback(callback, PP_ERROR_BADRESOURCE);
   int32_t result = enter.object()->SendTo(buffer, num_bytes, addr, callback);
@@ -72,14 +72,14 @@ int32_t SendTo(PP_Resource udp_socket,
 }
 
 void Close(PP_Resource udp_socket) {
-  EnterResource<PPB_Flash_UDPSocket_API> enter(udp_socket, true);
+  EnterResource<PPB_UDPSocket_API> enter(udp_socket, true);
   if (enter.succeeded())
     enter.object()->Close();
 }
 
-const PPB_Flash_UDPSocket g_ppb_flash_udp_socket_thunk = {
+const PPB_UDPSocket g_ppb_udp_socket_thunk = {
   &Create,
-  &IsFlashUDPSocket,
+  &IsUDPSocket,
   &Bind,
   &RecvFrom,
   &GetRecvFromAddress,
@@ -89,8 +89,8 @@ const PPB_Flash_UDPSocket g_ppb_flash_udp_socket_thunk = {
 
 }  // namespace
 
-const PPB_Flash_UDPSocket* GetPPB_Flash_UDPSocket_Thunk() {
-  return &g_ppb_flash_udp_socket_thunk;
+const PPB_UDPSocket* GetPPB_UDPSocket_Thunk() {
+  return &g_ppb_udp_socket_thunk;
 }
 
 }  // namespace thunk