A few more cleanups to the pepper code. Dispatch IPCs in the sockets implementations directly by ha…

content/renderer/pepper/pepper_helper_impl.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_RENDERER_PEPPER_PEPPER_PLUGIN_DELEGATE_H_
 #define CONTENT_RENDERER_PEPPER_PEPPER_PLUGIN_DELEGATE_H_
 
-#include <map>
 #include <set>
 #include <string>
-#include <vector>
 
 #include "base/basictypes.h"
 #include "base/id_map.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "base/observer_list.h"
 #include "content/public/renderer/render_view_observer.h"
-#include "content/renderer/pepper/pepper_browser_connection.h"
 #include "content/renderer/pepper_helper.h"
-#include "ipc/ipc_platform_file.h"
 #include "ppapi/c/pp_file_info.h"
-#include "ppapi/c/ppb_tcp_socket.h"
-#include "ppapi/c/private/ppb_tcp_socket_private.h"
-#include "ppapi/shared_impl/private/ppb_tcp_server_socket_shared.h"
-#include "ppapi/shared_impl/private/tcp_socket_private_impl.h"
 #include "ui/base/ime/text_input_type.h"
 
 namespace base {
 class FilePath;
 }
 
 namespace ppapi {
-class PepperFilePath;
 class PpapiPermissions;
-class PPB_X509Certificate_Fields;
-namespace host {
-class ResourceHost;
-}
 }
 
 namespace WebKit {
 class WebGamepads;
 class WebURLResponse;
 struct WebCompositionUnderline;
 struct WebCursorInfo;
 }
 
 namespace content {
 class ContextProviderCommandBuffer;
 class GamepadSharedMemoryReader;
 class PepperBroker;
 class PluginModule;
 class PPB_Broker_Impl;
-class PPB_TCPSocket_Private_Impl;
 class RenderViewImpl;
 struct WebPluginInfo;
 
 class PepperHelperImpl : public PepperHelper,
                          public base::SupportsWeakPtr<PepperHelperImpl>,
                          public RenderViewObserver {
  public:
   explicit PepperHelperImpl(RenderViewImpl* render_view);
   virtual ~PepperHelperImpl();
 
   RenderViewImpl* render_view() { return render_view_; }
 
-  PepperBrowserConnection* pepper_browser_connection() {
-    return &pepper_browser_connection_;
-  }
-
   // A pointer is returned immediately, but it is not ready to be used until
   // BrokerConnected has been called.
   // The caller is responsible for calling Disconnect() on the returned pointer
   // to clean up the corresponding resources allocated during this call.
   PepperBroker* ConnectToBroker(PPB_Broker_Impl* client);
 
   // Removes broker from pending_connect_broker_ if present. Returns true if so.
   bool StopWaitingForBrokerConnection(PepperBroker* broker);
 
-  void RegisterTCPSocket(PPB_TCPSocket_Private_Impl* socket, uint32 socket_id);
-  void UnregisterTCPSocket(uint32 socket_id);
-  void TCPServerSocketStopListening(uint32 socket_id);
-
   // Notifies that |instance| has changed the cursor.
   // This will update the cursor appearance if it is currently over the plugin
   // instance.
   void DidChangeCursor(PepperPluginInstanceImpl* instance,
                        const WebKit::WebCursorInfo& cursor);
 
   // Notifies that |instance| has received a mouse event.
   void DidReceiveMouseEvent(PepperPluginInstanceImpl* instance);
 
   // Notification that the given plugin is focused or unfocused.
@@ skipping 12 matching lines @@
   void PluginSelectionChanged(PepperPluginInstanceImpl* instance);
 
   // Indicates that the given instance has been created.
   void InstanceCreated(PepperPluginInstanceImpl* instance);
 
   // Indicates that the given instance is being destroyed. This is called from
   // the destructor, so it's important that the instance is not dereferenced
   // from this call.
   void InstanceDeleted(PepperPluginInstanceImpl* instance);
 
-  // Sends an async IPC to open a local file.
-  typedef base::Callback<void (base::PlatformFileError, base::PassPlatformFile)>
-      AsyncOpenFileCallback;
-  bool AsyncOpenFile(const base::FilePath& path,
-                     int flags,
-                     const AsyncOpenFileCallback& callback);
-
   // Retrieve current gamepad data.
   void SampleGamepads(WebKit::WebGamepads* data);
 
   // Notifies the plugin of the document load. This should initiate the call to
   // PPP_Instance.HandleDocumentLoad.
   //
   // The loader object should set itself on the PluginInstance as the document
   // loader using set_document_loader.
   void HandleDocumentLoad(PepperPluginInstanceImpl* instance,
                           const WebKit::WebURLResponse& response);
@@ skipping 36 matching lines @@
       const std::vector<WebKit::WebCompositionUnderline>& underlines,
       int selection_start,
       int selection_end) OVERRIDE;
   virtual void OnImeConfirmComposition(const string16& text) OVERRIDE;
   virtual void WillHandleMouseEvent() OVERRIDE;
 
   // RenderViewObserver implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void OnDestruct() OVERRIDE;
 
-  void OnTCPSocketConnectACK(uint32 plugin_dispatcher_id,
-                             uint32 socket_id,
-                             int32_t result,
-                             const PP_NetAddress_Private& local_addr,
-                             const PP_NetAddress_Private& remote_addr);
-  void OnTCPSocketSSLHandshakeACK(
-      uint32 plugin_dispatcher_id,
-      uint32 socket_id,
-      bool succeeded,
-      const ppapi::PPB_X509Certificate_Fields& certificate_fields);
-  void OnTCPSocketReadACK(uint32 plugin_dispatcher_id,
-                          uint32 socket_id,
-                          int32_t result,
-                          const std::string& data);
-  void OnTCPSocketWriteACK(uint32 plugin_dispatcher_id,
-                           uint32 socket_id,
-                           int32_t result);
-  void OnTCPSocketSetOptionACK(uint32 plugin_dispatcher_id,
-                               uint32 socket_id,
-                               int32_t result);
-  void OnTCPServerSocketListenACK(uint32 plugin_dispatcher_id,
-                                  PP_Resource socket_resource,
-                                  uint32 socket_id,
-                                  const PP_NetAddress_Private& local_addr,
-                                  int32_t status);
-  void OnTCPServerSocketAcceptACK(uint32 plugin_dispatcher_id,
-                                  uint32 socket_id,
-                                  uint32 accepted_socket_id,
-                                  const PP_NetAddress_Private& local_addr,
-                                  const PP_NetAddress_Private& remote_addr);
   void OnPpapiBrokerChannelCreated(int request_id,
                                    base::ProcessId broker_pid,
                                    const IPC::ChannelHandle& handle);
-  void OnAsyncFileOpened(base::PlatformFileError error_code,
-                         IPC::PlatformFileForTransit file_for_transit,
-                         int message_id);
   void OnPpapiBrokerPermissionResult(int request_id, bool result);
 
   // Attempts to create a PPAPI plugin for the given filepath. On success, it
   // will return the newly-created module.
   //
   // There are two reasons for failure. The first is that the plugin isn't
   // a PPAPI plugin. In this case, |*pepper_plugin_was_registered| will be set
   // to false and the caller may want to fall back on creating an NPAPI plugin.
   // the second is that the plugin failed to initialize. In this case,
   // |*pepper_plugin_was_registered| will be set to true and the caller should
@@ skipping 12 matching lines @@
       const base::FilePath& path,
       ppapi::PpapiPermissions permissions,
       const IPC::ChannelHandle& channel_handle,
       base::ProcessId plugin_pid,
       int plugin_child_id,
       bool is_external);
 
   // Pointer to the RenderView that owns us.
   RenderViewImpl* render_view_;
 
-  // Connection for sending and receiving pepper host-related messages to/from
-  // the browser.
-  PepperBrowserConnection pepper_browser_connection_;
-
   std::set<PepperPluginInstanceImpl*> active_instances_;
 
-  IDMap<AsyncOpenFileCallback> pending_async_open_files_;
-
-  IDMap<PPB_TCPSocket_Private_Impl> tcp_sockets_;
-
-  IDMap<ppapi::PPB_TCPServerSocket_Shared> tcp_server_sockets_;
-
   typedef IDMap<scoped_refptr<PepperBroker>, IDMapOwnPointer> BrokerMap;
   BrokerMap pending_connect_broker_;
 
   typedef IDMap<base::WeakPtr<PPB_Broker_Impl> > PermissionRequestMap;
   PermissionRequestMap pending_permission_requests_;
 
   // Whether or not the focus is on a PPAPI plugin
   PepperPluginInstanceImpl* focused_plugin_;
 
   // Current text input composition text. Empty if no composition is in
   // progress.
   string16 composition_text_;
 
   // The plugin instance that received the last mouse event. It is set to NULL
   // if the last mouse event went to elements other than Pepper plugins.
   // |last_mouse_event_target_| is not owned by this class. We can know about
   // when it is destroyed via InstanceDeleted().
   PepperPluginInstanceImpl* last_mouse_event_target_;
 
   scoped_ptr<GamepadSharedMemoryReader> gamepad_shared_memory_reader_;
 
   scoped_refptr<ContextProviderCommandBuffer> offscreen_context3d_;
 
   DISALLOW_COPY_AND_ASSIGN(PepperHelperImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_PEPPER_PEPPER_PLUGIN_DELEGATE_H_