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

content/renderer/pepper/pepper_broker.cc

 // 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.
 
 #include "content/renderer/pepper/pepper_broker.h"
 
 #include "build/build_config.h"
-#include "content/renderer/pepper/pepper_helper_impl.h"
 #include "content/renderer/pepper/pepper_proxy_channel_delegate_impl.h"
 #include "content/renderer/pepper/plugin_module.h"
 #include "content/renderer/pepper/ppb_broker_impl.h"
 #include "content/renderer/pepper/renderer_restrict_dispatch_group.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ppapi/proxy/broker_dispatcher.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/shared_impl/platform_file.h"
 
 #if defined(OS_WIN)
@@ skipping 81 matching lines @@
     // and then close it. This failure case is not performance critical.
     // The handle could still leak if Send succeeded but the IPC later failed.
     base::SyncSocket temp_socket(
         IPC::PlatformFileForTransitToPlatformFile(foreign_socket_handle));
     return PP_ERROR_FAILED;
   }
 
   return result;
 }
 
-PepperBroker::PepperBroker(PluginModule* plugin_module,
-                           PepperHelperImpl* helper)
-    : plugin_module_(plugin_module),
-      helper_(helper->AsWeakPtr()) {
+PepperBroker::PepperBroker(PluginModule* plugin_module)
+    : plugin_module_(plugin_module) {
   DCHECK(plugin_module_);
-  DCHECK(helper_.get());
 
   plugin_module_->SetBroker(this);
 }
 
 PepperBroker::~PepperBroker() {
   ReportFailureToClients(PP_ERROR_ABORTED);
   plugin_module_->SetBroker(NULL);
   plugin_module_ = NULL;
 }
 
@@ skipping 14 matching lines @@
   pending_connects_[client].client = client->AsWeakPtr();
 }
 
 void PepperBroker::Disconnect(PPB_Broker_Impl* client) {
   // Remove the pending connect if one exists. This class will not call client's
   // callback.
   pending_connects_.erase(client);
 
   // TODO(ddorwin): Send message disconnect message using dispatcher_.
 
-  if (pending_connects_.empty()) {
-    // There are no more clients of this broker. Ensure it will be deleted even
-    // if the IPC response never comes and OnPepperBrokerChannelCreated is not
-    // called to remove this object from pending_connect_broker_.
-    // Before the broker is connected, clients must either be in
-    // pending_connects_ or not yet associated with this object. Thus, if this
-    // object is in pending_connect_broker_, there can be no associated clients
-    // once pending_connects_ is empty and it is thus safe to remove this from
-    // pending_connect_broker_. Doing so will cause this object to be deleted,
-    // removing it from the PluginModule. Any new clients will create a new
-    // instance of this object.
-    // This doesn't solve all potential problems, but it helps with the ones
-    // we can influence.
-    if (helper_.get()) {
-      bool stopped = helper_->StopWaitingForBrokerConnection(this);
-
-      // Verify the assumption that there are no references other than the one
-      // |client| holds, which will be released below.
-      DCHECK(!stopped || HasOneRef());
-    }
-  }
-
   // Release the reference added in Connect().
   // This must be the last statement because it may delete this object.
   Release();
 }
 
 void PepperBroker::OnBrokerChannelConnected(
     base::ProcessId broker_pid,
     const IPC::ChannelHandle& channel_handle) {
   scoped_ptr<PepperBrokerDispatcherWrapper> dispatcher(
       new PepperBrokerDispatcherWrapper);
@@ skipping 95 matching lines @@
 
   // TOOD(ddorwin): Change the IPC to asynchronous: Queue an object containing
   // client and plugin_socket.release(), then return.
   // That message handler will then call client->BrokerConnected() with the
   // saved pipe handle.
   // Temporarily, just call back.
   client->BrokerConnected(ppapi::PlatformFileToInt(plugin_handle), result);
 }
 
 }  // namespace content