| Index: chrome/browser/extensions/api/messaging/extension_message_port.h
|
| diff --git a/chrome/browser/extensions/api/messaging/extension_message_port.h b/chrome/browser/extensions/api/messaging/extension_message_port.h
|
| index ac98851c85751be3a6f429715807b6616dc72f05..dd6e584fc5ef842cd18a8e4161cb1b2950516c6e 100644
|
| --- a/chrome/browser/extensions/api/messaging/extension_message_port.h
|
| +++ b/chrome/browser/extensions/api/messaging/extension_message_port.h
|
| @@ -46,7 +46,7 @@ class ExtensionMessagePort : public MessageService::MessagePort {
|
| bool HasFrame(content::RenderFrameHost* rfh) const override;
|
| bool IsValidPort() override;
|
| void DispatchOnConnect(const std::string& channel_name,
|
| - scoped_ptr<base::DictionaryValue> source_tab,
|
| + std::unique_ptr<base::DictionaryValue> source_tab,
|
| int source_frame_id,
|
| int guest_process_id,
|
| int guest_render_frame_routing_id,
|
| @@ -75,7 +75,7 @@ class ExtensionMessagePort : public MessageService::MessagePort {
|
| void CloseChannel();
|
|
|
| // Send a IPC message to the renderer for all registered frames.
|
| - void SendToPort(scoped_ptr<IPC::Message> msg);
|
| + void SendToPort(std::unique_ptr<IPC::Message> msg);
|
|
|
| base::WeakPtr<MessageService> weak_message_service_;
|
|
|
| @@ -98,7 +98,7 @@ class ExtensionMessagePort : public MessageService::MessagePort {
|
| bool did_create_port_;
|
|
|
| ExtensionHost* background_host_ptr_; // used in IncrementLazyKeepaliveCount
|
| - scoped_ptr<FrameTracker> frame_tracker_;
|
| + std::unique_ptr<FrameTracker> frame_tracker_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ExtensionMessagePort);
|
| };
|
|
|