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

Side by Side Diff: net/ftp/ftp_network_layer.cc

Issue 2259823002: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 3 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 unified diff | Download patch
« no previous file with comments | « net/dns/host_resolver_impl_unittest.cc ('k') | net/http/bidirectional_stream.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2008 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/ftp/ftp_network_layer.h" 5 #include "net/ftp/ftp_network_layer.h"
6 6
7 #include "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #include "net/ftp/ftp_network_session.h" 8 #include "net/ftp/ftp_network_session.h"
9 #include "net/ftp/ftp_network_transaction.h" 9 #include "net/ftp/ftp_network_transaction.h"
10 #include "net/socket/client_socket_factory.h" 10 #include "net/socket/client_socket_factory.h"
11 11
12 namespace net { 12 namespace net {
13 13
14 FtpNetworkLayer::FtpNetworkLayer(HostResolver* host_resolver) 14 FtpNetworkLayer::FtpNetworkLayer(HostResolver* host_resolver)
15 : session_(new FtpNetworkSession(host_resolver)), 15 : session_(new FtpNetworkSession(host_resolver)),
16 suspended_(false) { 16 suspended_(false) {
17 } 17 }
18 18
19 FtpNetworkLayer::~FtpNetworkLayer() { 19 FtpNetworkLayer::~FtpNetworkLayer() {
20 } 20 }
21 21
22 std::unique_ptr<FtpTransaction> FtpNetworkLayer::CreateTransaction() { 22 std::unique_ptr<FtpTransaction> FtpNetworkLayer::CreateTransaction() {
23 if (suspended_) 23 if (suspended_)
24 return std::unique_ptr<FtpTransaction>(); 24 return std::unique_ptr<FtpTransaction>();
25 25
26 return base::WrapUnique(new FtpNetworkTransaction( 26 return base::MakeUnique<FtpNetworkTransaction>(
27 session_->host_resolver(), ClientSocketFactory::GetDefaultFactory())); 27 session_->host_resolver(), ClientSocketFactory::GetDefaultFactory());
28 } 28 }
29 29
30 void FtpNetworkLayer::Suspend(bool suspend) { 30 void FtpNetworkLayer::Suspend(bool suspend) {
31 suspended_ = suspend; 31 suspended_ = suspend;
32 } 32 }
33 33
34 } // namespace net 34 } // namespace net
OLDNEW
« no previous file with comments | « net/dns/host_resolver_impl_unittest.cc ('k') | net/http/bidirectional_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698