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

content/renderer/pepper/pepper_helper_impl.h

Index: content/renderer/pepper/pepper_helper_impl.h
===================================================================
--- content/renderer/pepper/pepper_helper_impl.h	(revision 215720)
+++ content/renderer/pepper/pepper_helper_impl.h	(working copy)
@@ -40,9 +40,7 @@
 namespace content {
 class ContextProviderCommandBuffer;
 class GamepadSharedMemoryReader;
-class PepperBroker;
 class PluginModule;
-class PPB_Broker_Impl;
 class RenderViewImpl;
 struct WebPluginInfo;
 
@@ -55,15 +53,6 @@
 
   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.
@@ -141,14 +130,8 @@
   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.
   //
@@ -162,9 +145,6 @@
       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(
@@ -181,12 +161,6 @@
 
   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_;