| Index: remoting/protocol/secure_channel_factory.cc
|
| diff --git a/remoting/protocol/secure_channel_factory.cc b/remoting/protocol/secure_channel_factory.cc
|
| index 9739bbd183823c9ff669ec722053cc7da1063c79..40b02a0e364052c204b32c674274ad59e853fb73 100644
|
| --- a/remoting/protocol/secure_channel_factory.cc
|
| +++ b/remoting/protocol/secure_channel_factory.cc
|
| @@ -51,7 +51,7 @@ void SecureChannelFactory::CancelChannelCreation(
|
| void SecureChannelFactory::OnBaseChannelCreated(
|
| const std::string& name,
|
| const ChannelCreatedCallback& callback,
|
| - scoped_ptr<P2PStreamSocket> socket) {
|
| + std::unique_ptr<P2PStreamSocket> socket) {
|
| if (!socket) {
|
| callback.Run(nullptr);
|
| return;
|
| @@ -70,7 +70,7 @@ void SecureChannelFactory::OnSecureChannelCreated(
|
| const std::string& name,
|
| const ChannelCreatedCallback& callback,
|
| int error,
|
| - scoped_ptr<P2PStreamSocket> socket) {
|
| + std::unique_ptr<P2PStreamSocket> socket) {
|
| DCHECK((socket && error == net::OK) || (!socket && error != net::OK));
|
|
|
| AuthenticatorMap::iterator it = channel_authenticators_.find(name);
|
|
|