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

Side by Side Diff: webrtc/base/asynctcpsocket.cc

Issue 1920043002: Replace scoped_ptr with unique_ptr in webrtc/base/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased Created 4 years, 7 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 | « webrtc/base/asynctcpsocket.h ('k') | webrtc/base/asynctcpsocket_unittest.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 /* 1 /*
2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include "webrtc/base/asynctcpsocket.h" 11 #include "webrtc/base/asynctcpsocket.h"
12 12
13 #include <string.h> 13 #include <string.h>
14 14
15 #include <algorithm> 15 #include <algorithm>
16 #include <memory>
16 17
17 #include "webrtc/base/byteorder.h" 18 #include "webrtc/base/byteorder.h"
18 #include "webrtc/base/checks.h" 19 #include "webrtc/base/checks.h"
19 #include "webrtc/base/common.h" 20 #include "webrtc/base/common.h"
20 #include "webrtc/base/logging.h" 21 #include "webrtc/base/logging.h"
21 22
22 #if defined(WEBRTC_POSIX) 23 #if defined(WEBRTC_POSIX)
23 #include <errno.h> 24 #include <errno.h>
24 #endif // WEBRTC_POSIX 25 #endif // WEBRTC_POSIX
25 26
(...skipping 11 matching lines...) Expand all
37 // constructor). 38 // constructor).
38 static const size_t kMinimumRecvSize = 128; 39 static const size_t kMinimumRecvSize = 128;
39 40
40 static const int kListenBacklog = 5; 41 static const int kListenBacklog = 5;
41 42
42 // Binds and connects |socket| 43 // Binds and connects |socket|
43 AsyncSocket* AsyncTCPSocketBase::ConnectSocket( 44 AsyncSocket* AsyncTCPSocketBase::ConnectSocket(
44 rtc::AsyncSocket* socket, 45 rtc::AsyncSocket* socket,
45 const rtc::SocketAddress& bind_address, 46 const rtc::SocketAddress& bind_address,
46 const rtc::SocketAddress& remote_address) { 47 const rtc::SocketAddress& remote_address) {
47 rtc::scoped_ptr<rtc::AsyncSocket> owned_socket(socket); 48 std::unique_ptr<rtc::AsyncSocket> owned_socket(socket);
48 if (socket->Bind(bind_address) < 0) { 49 if (socket->Bind(bind_address) < 0) {
49 LOG(LS_ERROR) << "Bind() failed with error " << socket->GetError(); 50 LOG(LS_ERROR) << "Bind() failed with error " << socket->GetError();
50 return NULL; 51 return NULL;
51 } 52 }
52 if (socket->Connect(remote_address) < 0) { 53 if (socket->Connect(remote_address) < 0) {
53 LOG(LS_ERROR) << "Connect() failed with error " << socket->GetError(); 54 LOG(LS_ERROR) << "Connect() failed with error " << socket->GetError();
54 return NULL; 55 return NULL;
55 } 56 }
56 return owned_socket.release(); 57 return owned_socket.release();
57 } 58 }
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 memmove(data, data + kPacketLenSize + pkt_len, *len); 322 memmove(data, data + kPacketLenSize + pkt_len, *len);
322 } 323 }
323 } 324 }
324 } 325 }
325 326
326 void AsyncTCPSocket::HandleIncomingConnection(AsyncSocket* socket) { 327 void AsyncTCPSocket::HandleIncomingConnection(AsyncSocket* socket) {
327 SignalNewConnection(this, new AsyncTCPSocket(socket, false)); 328 SignalNewConnection(this, new AsyncTCPSocket(socket, false));
328 } 329 }
329 330
330 } // namespace rtc 331 } // namespace rtc
OLDNEW
« no previous file with comments | « webrtc/base/asynctcpsocket.h ('k') | webrtc/base/asynctcpsocket_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698