Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1133)

Unified Diff: remoting/protocol/pseudotcp_channel_factory.cc

Issue 1864213002: Convert //remoting to use std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Mac IWYU Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/protocol/pseudotcp_channel_factory.h ('k') | remoting/protocol/rejecting_authenticator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/pseudotcp_channel_factory.cc
diff --git a/remoting/protocol/pseudotcp_channel_factory.cc b/remoting/protocol/pseudotcp_channel_factory.cc
index e9fd30194cd39fffd90bcf5ba90a99128d73e662..9adf225da662dd954da1b50cbc5bf5baa755e407 100644
--- a/remoting/protocol/pseudotcp_channel_factory.cc
+++ b/remoting/protocol/pseudotcp_channel_factory.cc
@@ -61,7 +61,7 @@ void PseudoTcpChannelFactory::CancelChannelCreation(const std::string& name) {
void PseudoTcpChannelFactory::OnDatagramChannelCreated(
const std::string& name,
const ChannelCreatedCallback& callback,
- scoped_ptr<P2PDatagramSocket> datagram_socket) {
+ std::unique_ptr<P2PDatagramSocket> datagram_socket) {
PseudoTcpAdapter* adapter = new PseudoTcpAdapter(std::move(datagram_socket));
pending_sockets_[name] = adapter;
@@ -88,7 +88,7 @@ void PseudoTcpChannelFactory::OnPseudoTcpConnected(
int result) {
PendingSocketsMap::iterator it = pending_sockets_.find(name);
DCHECK(it != pending_sockets_.end());
- scoped_ptr<P2PStreamSocket> socket(it->second);
+ std::unique_ptr<P2PStreamSocket> socket(it->second);
pending_sockets_.erase(it);
if (result != net::OK)
« no previous file with comments | « remoting/protocol/pseudotcp_channel_factory.h ('k') | remoting/protocol/rejecting_authenticator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698