Remove 'Flash' from TCP/UDP Pepper interfaces.

ppapi/proxy/interface_list.cc

Index: ppapi/proxy/interface_list.cc
diff --git a/ppapi/proxy/interface_list.cc b/ppapi/proxy/interface_list.cc
index c1f1b9f1a6a5a0a34400d496b2ff358cfa6718c4..0aeab22ff03623a991bebbc34df8c18da15f9926 100644
--- a/ppapi/proxy/interface_list.cc
+++ b/ppapi/proxy/interface_list.cc
@@ -48,9 +48,10 @@
 #include "ppapi/c/private/ppb_flash_menu.h"
 #include "ppapi/c/private/ppb_flash_net_connector.h"
 #include "ppapi/c/private/ppb_flash_tcp_socket.h"
-#include "ppapi/c/private/ppb_flash_udp_socket.h"
 #include "ppapi/c/private/ppb_net_address_private.h"
 #include "ppapi/c/private/ppb_pdf.h"
+#include "ppapi/c/private/ppb_tcp_socket_private.h"
+#include "ppapi/c/private/ppb_udp_socket_private.h"
 #include "ppapi/c/trusted/ppb_broker_trusted.h"
 #include "ppapi/c/trusted/ppb_url_loader_trusted.h"
 #include "ppapi/proxy/interface_proxy.h"
@@ -68,8 +69,6 @@
 #include "ppapi/proxy/ppb_flash_menu_proxy.h"
 #include "ppapi/proxy/ppb_flash_net_connector_proxy.h"
 #include "ppapi/proxy/ppb_flash_proxy.h"
-#include "ppapi/proxy/ppb_flash_tcp_socket_proxy.h"
-#include "ppapi/proxy/ppb_flash_udp_socket_proxy.h"
 #include "ppapi/proxy/ppb_font_proxy.h"
 #include "ppapi/proxy/ppb_graphics_2d_proxy.h"
 #include "ppapi/proxy/ppb_graphics_3d_proxy.h"
@@ -79,6 +78,8 @@
 #include "ppapi/proxy/ppb_surface_3d_proxy.h"
 #include "ppapi/proxy/ppb_testing_proxy.h"
 #include "ppapi/proxy/ppb_text_input_proxy.h"
+#include "ppapi/proxy/ppb_tcp_socket_proxy.h"
+#include "ppapi/proxy/ppb_udp_socket_proxy.h"
 #include "ppapi/proxy/ppb_url_loader_proxy.h"
 #include "ppapi/proxy/ppb_url_response_info_proxy.h"
 #include "ppapi/proxy/ppb_var_deprecated_proxy.h"
@@ -161,13 +162,18 @@ InterfaceList::InterfaceList() {
   // proxy and the impl and there's no obvious message routing.
   AddProxy(API_ID_RESOURCE_CREATION, &ResourceCreationProxy::Create);
   AddProxy(API_ID_PPP_CLASS, &PPP_Class_Proxy::Create);
+  AddProxy(API_ID_PPB_TCPSOCKET, &ProxyFactory<PPB_TCPSocket_Proxy>);

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

If the only concern is the _PRIVATE suffix being too long, I still think that we
should add it and use the 'normal' way. This ID is not used everywhere, and it
seems not too long to me.

Please note that this list is used for really special interfaces (see the
comment above).

[Dmitry Polukhin, 2011/11/14 13:03:02]

Done.

+  AddProxy(API_ID_PPB_UDPSOCKET, &ProxyFactory<PPB_UDPSocket_Proxy>);
   AddPPB(PPB_CORE_INTERFACE, API_ID_PPB_CORE,
          PPB_Core_Proxy::GetPPB_Core_Interface());
   AddPPB(PPB_OPENGLES2_INTERFACE, API_ID_NONE,
          OpenGLES2Impl::GetInterface());
   AddPPB(PPB_VAR_INTERFACE, API_ID_NONE,
          GetPPB_Var_Interface());
-
+  AddPPB(PPB_TCPSOCKET_PRIVATE_INTERFACE, API_ID_PPB_TCPSOCKET,
+         thunk::GetPPB_TCPSocket_Thunk());
+  AddPPB(PPB_UDPSOCKET_PRIVATE_INTERFACE, API_ID_PPB_UDPSOCKET,
+         thunk::GetPPB_UDPSocket_Thunk());
   AddFlashInterfaces();
 
   // PPB (browser) interfaces.
@@ -262,15 +268,9 @@ void InterfaceList::AddFlashInterfaces() {
   AddPPB(PPB_FLASH_INTERFACE, API_ID_PPB_FLASH,
          PPB_Flash_Proxy::GetInterface());
 
-  AddProxy(API_ID_PPB_FLASH_TCPSOCKET,
-           &ProxyFactory<PPB_Flash_TCPSocket_Proxy>);
-  AddPPB(PPB_FLASH_TCPSOCKET_INTERFACE, API_ID_PPB_FLASH_TCPSOCKET,
-         thunk::GetPPB_Flash_TCPSocket_Thunk());
-
-  AddProxy(API_ID_PPB_FLASH_UDPSOCKET,
-           &ProxyFactory<PPB_Flash_UDPSocket_Proxy>);
-  AddPPB(PPB_FLASH_UDPSOCKET_INTERFACE, API_ID_PPB_FLASH_UDPSOCKET,
-         thunk::GetPPB_Flash_UDPSocket_Thunk());
+  // Only add PPB because proxy for the this API ID was already added.
+  AddPPB(PPB_FLASH_TCPSOCKET_INTERFACE, API_ID_PPB_TCPSOCKET,
+         thunk::GetPPB_TCPSocket_Thunk());
 
 #ifdef ENABLE_FLAPPER_HACKS
   AddProxy(API_ID_PPB_FLASH_NETCONNECTOR,