| Index: content/renderer/pepper/pepper_broker.h
|
| diff --git a/content/renderer/pepper/pepper_broker.h b/content/renderer/pepper/pepper_broker.h
|
| index fda0045facb927371b8564ca9a472fefcd0a2345..0a4ef95b198033d1212e1e3a97c2af6b7f5e3bc1 100644
|
| --- a/content/renderer/pepper/pepper_broker.h
|
| +++ b/content/renderer/pepper/pepper_broker.h
|
| @@ -42,8 +42,8 @@ class CONTENT_EXPORT PepperBrokerDispatcherWrapper {
|
| base::SyncSocket::Handle handle);
|
|
|
| private:
|
| - scoped_ptr<ppapi::proxy::BrokerDispatcher> dispatcher_;
|
| - scoped_ptr<ppapi::proxy::ProxyChannel::Delegate> dispatcher_delegate_;
|
| + std::unique_ptr<ppapi::proxy::BrokerDispatcher> dispatcher_;
|
| + std::unique_ptr<ppapi::proxy::ProxyChannel::Delegate> dispatcher_delegate_;
|
| };
|
|
|
| class PepperBroker : public base::RefCountedThreadSafe<PepperBroker> {
|
| @@ -87,7 +87,7 @@ class PepperBroker : public base::RefCountedThreadSafe<PepperBroker> {
|
| // Connects the plugin to the broker via a pipe.
|
| void ConnectPluginToBroker(PPB_Broker_Impl* client);
|
|
|
| - scoped_ptr<PepperBrokerDispatcherWrapper> dispatcher_;
|
| + std::unique_ptr<PepperBrokerDispatcherWrapper> dispatcher_;
|
|
|
| // 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
|
|
|