| Index: ppapi/proxy/plugin_dispatcher.h
|
| diff --git a/ppapi/proxy/plugin_dispatcher.h b/ppapi/proxy/plugin_dispatcher.h
|
| index 5dc22731552892e521bbf6e9d759fb7e308f24de..b37fa9eb63c5851a50be40226204a20e006f929f 100644
|
| --- a/ppapi/proxy/plugin_dispatcher.h
|
| +++ b/ppapi/proxy/plugin_dispatcher.h
|
| @@ -68,7 +68,7 @@ struct InstanceData {
|
|
|
| // The message handler which should handle JavaScript->Plugin messages, if
|
| // one has been registered, otherwise NULL.
|
| - scoped_ptr<MessageHandler> message_handler;
|
| + std::unique_ptr<MessageHandler> message_handler;
|
|
|
| // Flush info for PpapiCommandBufferProxy::OrderingBarrier().
|
| struct FlushInfo {
|
| @@ -208,7 +208,7 @@ class PPAPI_PROXY_EXPORT PluginDispatcher
|
| typedef base::hash_map<std::string, const void*> InterfaceMap;
|
| InterfaceMap plugin_interfaces_;
|
|
|
| - typedef base::ScopedPtrHashMap<PP_Instance, scoped_ptr<InstanceData>>
|
| + typedef base::ScopedPtrHashMap<PP_Instance, std::unique_ptr<InstanceData>>
|
| InstanceDataMap;
|
| InstanceDataMap instance_map_;
|
|
|
|
|