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

Unified Diff: net/ftp/ftp_network_layer.cc

Issue 1893083002: Change scoped_ptr to std::unique_ptr in //net. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptr-net-all: 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 | « net/ftp/ftp_network_layer.h ('k') | net/ftp/ftp_network_transaction.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/ftp/ftp_network_layer.cc
diff --git a/net/ftp/ftp_network_layer.cc b/net/ftp/ftp_network_layer.cc
index c8658d0a5b0d88d83130413e3cc3381584e44f44..bc9c25a0b7fb430ca2dbb676bc33ac094577a84a 100644
--- a/net/ftp/ftp_network_layer.cc
+++ b/net/ftp/ftp_network_layer.cc
@@ -4,6 +4,7 @@
#include "net/ftp/ftp_network_layer.h"
+#include "base/memory/ptr_util.h"
#include "net/ftp/ftp_network_session.h"
#include "net/ftp/ftp_network_transaction.h"
#include "net/socket/client_socket_factory.h"
@@ -18,11 +19,11 @@ FtpNetworkLayer::FtpNetworkLayer(HostResolver* host_resolver)
FtpNetworkLayer::~FtpNetworkLayer() {
}
-scoped_ptr<FtpTransaction> FtpNetworkLayer::CreateTransaction() {
+std::unique_ptr<FtpTransaction> FtpNetworkLayer::CreateTransaction() {
if (suspended_)
- return scoped_ptr<FtpTransaction>();
+ return std::unique_ptr<FtpTransaction>();
- return make_scoped_ptr(new FtpNetworkTransaction(
+ return base::WrapUnique(new FtpNetworkTransaction(
session_->host_resolver(), ClientSocketFactory::GetDefaultFactory()));
}
« no previous file with comments | « net/ftp/ftp_network_layer.h ('k') | net/ftp/ftp_network_transaction.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698