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 269aa6ee4a1fb66c7dd43c5b11b1394a99b8a3c1..9a1c59bab8d4b485f8b05d3c12323785531a3d89 100644
--- a/ppapi/proxy/interface_list.cc
+++ b/ppapi/proxy/interface_list.cc
@@ -46,12 +46,12 @@
 #include "ppapi/c/private/ppb_flash_file.h"
 #include "ppapi/c/private/ppb_flash_fullscreen.h"
 #include "ppapi/c/private/ppb_flash_menu.h"
-#include "ppapi/c/private/ppb_flash_net_address.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_pdf.h"
+#include "ppapi/c/private/ppb_net_address.h"
 #include "ppapi/c/trusted/ppb_broker_trusted.h"

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

Sort the list, please.

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

Done.

+#include "ppapi/c/private/ppb_pdf.h"
+#include "ppapi/c/private/ppb_tcp_socket.h"
+#include "ppapi/c/private/ppb_udp_socket.h"
 #include "ppapi/c/trusted/ppb_url_loader_trusted.h"
 #include "ppapi/proxy/interface_proxy.h"
 #include "ppapi/proxy/ppb_audio_proxy.h"
@@ -68,8 +68,8 @@
 #include "ppapi/proxy/ppb_flash_proxy.h"
 #include "ppapi/proxy/ppb_flash_menu_proxy.h"
 #include "ppapi/proxy/ppb_flash_net_connector_proxy.h"
-#include "ppapi/proxy/ppb_flash_tcp_socket_proxy.h"
-#include "ppapi/proxy/ppb_flash_udp_socket_proxy.h"
+#include "ppapi/proxy/ppb_tcp_socket_proxy.h"

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

Sort the list, please.

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

Done.

+#include "ppapi/proxy/ppb_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"
@@ -161,12 +161,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/09 23:53:55]

I think they are not "special". Please use the normal way above.

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

They are special in name, they doesn't have _Private suffix. I think there is no
sens to add private everywhere it will just make names longer without real
benefits.

+  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_INTERFACE, API_ID_PPB_TCPSOCKET,
+         thunk::GetPPB_TCPSocket_Thunk());
+  AddPPB(PPB_UDPSOCKET_INTERFACE, API_ID_PPB_UDPSOCKET,
+         thunk::GetPPB_UDPSocket_Thunk());
 
   AddFlashInterfaces();
 
@@ -262,16 +268,6 @@ 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());
-
 #ifdef ENABLE_FLAPPER_HACKS
   AddProxy(API_ID_PPB_FLASH_NETCONNECTOR,
            &ProxyFactory<PPB_Flash_NetConnector_Proxy>);