Remove 'Flash' from TCP/UDP Pepper interfaces.

content/browser/renderer_host/pepper_message_filter.h

Index: content/browser/renderer_host/pepper_message_filter.h
diff --git a/content/browser/renderer_host/pepper_message_filter.h b/content/browser/renderer_host/pepper_message_filter.h
index 6b15733e7211404c1b9a69ba8163901e702c69f8..cbe9b0fc123f9e6f46e4324d2a01fe7a94f1c9b3 100644
--- a/content/browser/renderer_host/pepper_message_filter.h
+++ b/content/browser/renderer_host/pepper_message_filter.h
@@ -13,7 +13,6 @@
 #include "base/time.h"
 #include "content/browser/browser_message_filter.h"
 #include "content/browser/font_list_async.h"
-#include "ppapi/c/private/ppb_flash_net_connector.h"
 
 namespace content {
 class ResourceContext;
@@ -41,11 +40,11 @@ class PepperMessageFilter : public BrowserMessageFilter {
                                  bool* message_was_ok);
 
  private:
-  template<class SocketType> class FlashSocketManager;
-  class FlashTCPSocket;
-  class FlashTCPSocketManager;
-  class FlashUDPSocket;
-  class FlashUDPSocketManager;
+  template<class SocketType> class SocketManager;
+  class TCPSocket;
+  class TCPSocketManager;
+  class UDPSocket;
+  class UDPSocketManager;
 
 #if defined(ENABLE_FLAPPER_HACKS)
   // Message handlers.
@@ -55,7 +54,7 @@ class PepperMessageFilter : public BrowserMessageFilter {
                     uint16 port);
   void OnConnectTcpAddress(int routing_id,
                            int request_id,
-                           const PP_Flash_NetAddress& address);
+                           const PP_NetAddress& address);
 
   // |Send()| a |PepperMsg_ConnectTcpACK|, which reports an error.
   bool SendConnectTcpACKError(int routing_id,
@@ -76,7 +75,7 @@ class PepperMessageFilter : public BrowserMessageFilter {
   // Continuation of |OnConnectTcpAddress()|.
   void ConnectTcpAddressOnWorkerThread(int routing_id,
                                        int request_id,
-                                       PP_Flash_NetAddress addr);
+                                       PP_NetAddress addr);
 #endif  // ENABLE_FLAPPER_HACKS
 
   void OnGetLocalTimeZoneOffset(base::Time t, double* result);
@@ -97,8 +96,8 @@ class PepperMessageFilter : public BrowserMessageFilter {
   // GetHostResolver instead of accessing directly.
   net::HostResolver* host_resolver_;
 
-  scoped_ptr<FlashTCPSocketManager> socket_manager_tcp_;
-  scoped_ptr<FlashUDPSocketManager> socket_manager_udp_;
+  scoped_ptr<TCPSocketManager> socket_manager_tcp_;
+  scoped_ptr<UDPSocketManager> socket_manager_udp_;
 
   DISALLOW_COPY_AND_ASSIGN(PepperMessageFilter);
 };