| Index: cc/trees/remote_channel_main.h
|
| diff --git a/cc/trees/remote_channel_main.h b/cc/trees/remote_channel_main.h
|
| index 7b2b9c7485dff8ce9a89f682dfceff374d936faf..1848f5c589cbffa05772be0bd85b8b90b24db685 100644
|
| --- a/cc/trees/remote_channel_main.h
|
| +++ b/cc/trees/remote_channel_main.h
|
| @@ -22,7 +22,7 @@ class CompositorMessageToMain;
|
| class CC_EXPORT RemoteChannelMain : public ChannelMain,
|
| public RemoteProtoChannel::ProtoReceiver {
|
| public:
|
| - static scoped_ptr<RemoteChannelMain> Create(
|
| + static std::unique_ptr<RemoteChannelMain> Create(
|
| RemoteProtoChannel* remote_proto_channel,
|
| ProxyMain* proxy_main,
|
| TaskRunnerProvider* task_runner_provider);
|
| @@ -54,11 +54,12 @@ class CC_EXPORT RemoteChannelMain : public ChannelMain,
|
| bool hold_commit_for_activation) override;
|
| void SynchronouslyInitializeImpl(
|
| LayerTreeHost* layer_tree_host,
|
| - scoped_ptr<BeginFrameSource> external_begin_frame_source) override;
|
| + std::unique_ptr<BeginFrameSource> external_begin_frame_source) override;
|
| void SynchronouslyCloseImpl() override;
|
|
|
| // RemoteProtoChannel::ProtoReceiver implementation
|
| - void OnProtoReceived(scoped_ptr<proto::CompositorMessage> proto) override;
|
| + void OnProtoReceived(
|
| + std::unique_ptr<proto::CompositorMessage> proto) override;
|
|
|
| protected:
|
| RemoteChannelMain(RemoteProtoChannel* remote_proto_channel,
|
|
|