Remove 'Flash' from TCP/UDP Pepper interfaces.

webkit/plugins/ppapi/plugin_module.cc

Index: webkit/plugins/ppapi/plugin_module.cc
diff --git a/webkit/plugins/ppapi/plugin_module.cc b/webkit/plugins/ppapi/plugin_module.cc
index 4587dfe56e5eaf97dab645d047bc0ee02f3a2927..3d3e8e7c6546805c18febacc0b3f7c48a59bf6e8 100644
--- a/webkit/plugins/ppapi/plugin_module.cc
+++ b/webkit/plugins/ppapi/plugin_module.cc
@@ -68,11 +68,12 @@
 #include "ppapi/c/private/ppb_flash_file.h"
 #include "ppapi/c/private/ppb_flash_fullscreen.h"
 #include "ppapi/c/private/ppb_flash_tcp_socket.h"
-#include "ppapi/c/private/ppb_flash_udp_socket.h"
 #include "ppapi/c/private/ppb_gpu_blacklist_private.h"
 #include "ppapi/c/private/ppb_instance_private.h"
 #include "ppapi/c/private/ppb_pdf.h"
 #include "ppapi/c/private/ppb_proxy_private.h"
+#include "ppapi/c/private/ppb_tcp_socket_private.h"
+#include "ppapi/c/private/ppb_udp_socket_private.h"
 #include "ppapi/c/private/ppb_uma_private.h"
 #include "ppapi/c/trusted/ppb_audio_trusted.h"
 #include "ppapi/c/trusted/ppb_broker_trusted.h"
@@ -281,9 +282,7 @@ const void* GetInterface(const char* name) {
   if (strcmp(name, PPB_FLASH_MENU_INTERFACE) == 0)
     return ::ppapi::thunk::GetPPB_Flash_Menu_Thunk();
   if (strcmp(name, PPB_FLASH_TCPSOCKET_INTERFACE) == 0)
-    return ::ppapi::thunk::GetPPB_Flash_TCPSocket_Thunk();
-  if (strcmp(name, PPB_FLASH_UDPSOCKET_INTERFACE) == 0)
-    return ::ppapi::thunk::GetPPB_Flash_UDPSocket_Thunk();
+    return ::ppapi::thunk::GetPPB_TCPSocket_Thunk();
   if (strcmp(name, PPB_FULLSCREEN_DEV_INTERFACE_0_4) == 0)
     return ::ppapi::thunk::GetPPB_FlashFullscreen_Thunk();
   if (strcmp(name, PPB_FULLSCREEN_DEV_INTERFACE) == 0)
@@ -302,6 +301,10 @@ const void* GetInterface(const char* name) {
     return PPB_OpenGLES_Impl::GetInterface();
   if (strcmp(name, PPB_PROXY_PRIVATE_INTERFACE) == 0)
     return PPB_Proxy_Impl::GetInterface();
+  if (strcmp(name, PPB_TCPSOCKET_PRIVATE_INTERFACE) == 0)

[yzshen1, 2011/11/11 21:04:28]

FYI, if you use 'normal' way (see my comments in interface_list), you don't need
these two if's.

+    return ::ppapi::thunk::GetPPB_TCPSocket_Thunk();
+  if (strcmp(name, PPB_UDPSOCKET_PRIVATE_INTERFACE) == 0)
+    return ::ppapi::thunk::GetPPB_UDPSocket_Thunk();
   if (strcmp(name, PPB_UMA_PRIVATE_INTERFACE) == 0)
     return PPB_UMA_Private_Impl::GetInterface();
   if (strcmp(name, PPB_URLLOADERTRUSTED_INTERFACE) == 0)