Revert 112693 - committed before review was done - Landing 8688002: PPB_TCPSocket_Private/PPB_UDP...

content/renderer/render_view_impl.h

Index: content/renderer/render_view_impl.h
===================================================================
--- content/renderer/render_view_impl.h	(revision 112751)
+++ content/renderer/render_view_impl.h	(working copy)
@@ -293,14 +293,6 @@
                                     webkit::WebPluginInfo* plugin_info,
                                     std::string* actual_mime_type);
 
-  // Helper function to check that TCP/UDP private APIs are allowed for current
-  // page. This check actually allows socket usage for NativeClient code only.
-  // It is better to move this check to browser process but Pepper message
-  // filters in browser process have no context about page that sent
-  // the request. Doing this check in render process is safe because NaCl code
-  // is executed in separate NaCl process.
-  bool CanUseSocketAPIs();
-
   // IPC::Channel::Listener implementation -------------------------------------
 
   virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
@@ -759,35 +751,6 @@
                        const PP_NetAddress_Private& local_addr,
                        const PP_NetAddress_Private& remote_addr);
 #endif
-  void OnTCPSocketConnectACK(uint32 plugin_dispatcher_id,
-                             uint32 socket_id,
-                             bool succeeded,
-                             const PP_NetAddress_Private& local_addr,
-                             const PP_NetAddress_Private& remote_addr);
-  void OnTCPSocketSSLHandshakeACK(uint32 plugin_dispatcher_id,
-                                  uint32 socket_id,
-                                  bool succeeded);
-  void OnTCPSocketReadACK(uint32 plugin_dispatcher_id,
-                          uint32 socket_id,
-                          bool succeeded,
-                          const std::string& data);
-  void OnTCPSocketWriteACK(uint32 plugin_dispatcher_id,
-                           uint32 socket_id,
-                           bool succeeded,
-                           int32_t bytes_written);
-  void OnUDPSocketBindACK(uint32 plugin_dispatcher_id,
-                          uint32 socket_id,
-                          bool succeeded);
-  void OnUDPSocketSendToACK(uint32 plugin_dispatcher_id,
-                            uint32 socket_id,
-                            bool succeeded,
-                            int32_t bytes_written);
-  void OnUDPSocketRecvFromACK(uint32 plugin_dispatcher_id,
-                              uint32 socket_id,
-                              bool succeeded,
-                              const std::string& data,
-                              const PP_NetAddress_Private& addr);
-
   void OnContextMenuClosed(
       const webkit_glue::CustomContextMenuContext& custom_context);
   void OnCopy();
@@ -1257,9 +1220,6 @@
   // of handling a ViewMsg_SelectRange IPC.
   bool handling_select_range_;
 
-  // Set of origins that can use TCP/UDP private APIs from NaCl.
-  std::set<std::string> allowed_socket_origins_;
-
   // ---------------------------------------------------------------------------
   // ADDING NEW DATA? Please see if it fits appropriately in one of the above
   // sections rather than throwing it randomly at the end. If you're adding a