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

content/renderer/pepper/pepper_broker.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_BROKER_H_
 #define CONTENT_RENDERER_PEPPER_PEPPER_BROKER_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/process/process.h"
 #include "base/sync_socket.h"
 #include "content/common/content_export.h"
 #include "content/renderer/pepper/ppb_broker_impl.h"
 #include "ppapi/proxy/proxy_channel.h"
 
 namespace IPC {
 struct ChannelHandle;
 }
 
 namespace ppapi {
 namespace proxy {
 class BrokerDispatcher;
 }
 }
 
 namespace content {
 
-class PepperHelperImpl;
 class PluginModule;
 
 // This object is NOT thread-safe.
 class CONTENT_EXPORT PepperBrokerDispatcherWrapper {
  public:
   PepperBrokerDispatcherWrapper();
   ~PepperBrokerDispatcherWrapper();
 
   bool Init(base::ProcessId broker_pid,
             const IPC::ChannelHandle& channel_handle);
 
   int32_t SendHandleToBroker(PP_Instance instance,
                              base::SyncSocket::Handle handle);
 
  private:
   scoped_ptr<ppapi::proxy::BrokerDispatcher> dispatcher_;
   scoped_ptr<ppapi::proxy::ProxyChannel::Delegate> dispatcher_delegate_;
 };
 
 class PepperBroker : public base::RefCountedThreadSafe<PepperBroker>{
  public:
-  PepperBroker(PluginModule* plugin_module, PepperHelperImpl* helper);
+  explicit PepperBroker(PluginModule* plugin_module);
 
   // Decrements the references to the broker.
   // When there are no more references, this renderer's dispatcher is
   // destroyed, allowing the broker to shutdown if appropriate.
   // Callers should not reference this object after calling Disconnect().
   void Disconnect(PPB_Broker_Impl* client);
 
   // Adds a pending connection to the broker. Balances out Disconnect() calls.
   void AddPendingConnect(PPB_Broker_Impl* client);
 
@@ skipping 30 matching lines @@
   // A map of pointers to objects that have requested a connection to the weak
   // pointer we can use to reference them. The mapping is needed so we can clean
   // up entries for objects that may have been deleted.
   typedef std::map<PPB_Broker_Impl*, PendingConnection> ClientMap;
   ClientMap pending_connects_;
 
   // Pointer to the associated plugin module.
   // Always set and cleared at the same time as the module's pointer to this.
   PluginModule* plugin_module_;
 
-  base::WeakPtr<PepperHelperImpl> helper_;
-
   DISALLOW_COPY_AND_ASSIGN(PepperBroker);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_PEPPER_PEPPER_BROKER_H_