| Index: content/renderer/pepper/pepper_broker.cc
|
| ===================================================================
|
| --- content/renderer/pepper/pepper_broker.cc (revision 214411)
|
| +++ content/renderer/pepper/pepper_broker.cc (working copy)
|
| @@ -5,7 +5,7 @@
|
| #include "content/renderer/pepper/pepper_broker.h"
|
|
|
| #include "build/build_config.h"
|
| -#include "content/renderer/pepper/pepper_plugin_delegate_impl.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"
|
| @@ -108,11 +108,11 @@
|
| }
|
|
|
| PepperBroker::PepperBroker(PluginModule* plugin_module,
|
| - PepperPluginDelegateImpl* delegate)
|
| + PepperHelperImpl* helper)
|
| : plugin_module_(plugin_module),
|
| - delegate_(delegate->AsWeakPtr()) {
|
| + helper_(helper->AsWeakPtr()) {
|
| DCHECK(plugin_module_);
|
| - DCHECK(delegate_.get());
|
| + DCHECK(helper_.get());
|
|
|
| plugin_module_->SetBroker(this);
|
| }
|
| @@ -160,8 +160,8 @@
|
| // instance of this object.
|
| // This doesn't solve all potential problems, but it helps with the ones
|
| // we can influence.
|
| - if (delegate_.get()) {
|
| - bool stopped = delegate_->StopWaitingForBrokerConnection(this);
|
| + 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.
|
|
|