Move broker creation out of PepperHelperImpl to PPB_Broker_Impl in the effort to eliminate PepperHe…

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 <set>
 #include <string>
 
@@ skipping 22 matching lines @@
 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 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_; }
 
-  // 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);
-
   // 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 57 matching lines @@
                                   ui::Range* range) const OVERRIDE;
   virtual void OnImeSetComposition(
       const string16& text,
       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 OnPpapiBrokerChannelCreated(int request_id,
-                                   base::ProcessId broker_pid,
-                                   const IPC::ChannelHandle& handle);
-  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
   // not fall back on any other plugin types.
   scoped_refptr<PluginModule> CreatePepperPluginModule(
       const WebPluginInfo& webplugin_info,
       bool* pepper_plugin_was_registered);
 
-  // Asynchronously attempts to create a PPAPI broker for the given plugin.
-  scoped_refptr<PepperBroker> CreateBroker(PluginModule* plugin_module);
-
   // Create a new HostDispatcher for proxying, hook it to the PluginModule,
   // and perform other common initialization.
   RendererPpapiHost* CreateOutOfProcessModule(
       PluginModule* module,
       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_;
 
   std::set<PepperPluginInstanceImpl*> active_instances_;
 
-  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_