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

Side by Side Diff: webrtc/base/testechoserver.h

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/taskrunner.cc ('k') | webrtc/base/testutils.h » ('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 #ifndef WEBRTC_BASE_TESTECHOSERVER_H_ 11 #ifndef WEBRTC_BASE_TESTECHOSERVER_H_
12 #define WEBRTC_BASE_TESTECHOSERVER_H_ 12 #define WEBRTC_BASE_TESTECHOSERVER_H_
13 13
14 #include <list> 14 #include <list>
15 #include <memory>
15 #include "webrtc/base/asynctcpsocket.h" 16 #include "webrtc/base/asynctcpsocket.h"
16 #include "webrtc/base/socketaddress.h" 17 #include "webrtc/base/socketaddress.h"
17 #include "webrtc/base/sigslot.h" 18 #include "webrtc/base/sigslot.h"
18 #include "webrtc/base/thread.h" 19 #include "webrtc/base/thread.h"
19 20
20 namespace rtc { 21 namespace rtc {
21 22
22 // A test echo server, echoes back any packets sent to it. 23 // A test echo server, echoes back any packets sent to it.
23 // Useful for unit tests. 24 // Useful for unit tests.
24 class TestEchoServer : public sigslot::has_slots<> { 25 class TestEchoServer : public sigslot::has_slots<> {
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 socket->Send(buf, size, options); 57 socket->Send(buf, size, options);
57 } 58 }
58 void OnClose(AsyncPacketSocket* socket, int err) { 59 void OnClose(AsyncPacketSocket* socket, int err) {
59 ClientList::iterator it = 60 ClientList::iterator it =
60 std::find(client_sockets_.begin(), client_sockets_.end(), socket); 61 std::find(client_sockets_.begin(), client_sockets_.end(), socket);
61 client_sockets_.erase(it); 62 client_sockets_.erase(it);
62 Thread::Current()->Dispose(socket); 63 Thread::Current()->Dispose(socket);
63 } 64 }
64 65
65 typedef std::list<AsyncTCPSocket*> ClientList; 66 typedef std::list<AsyncTCPSocket*> ClientList;
66 scoped_ptr<AsyncSocket> server_socket_; 67 std::unique_ptr<AsyncSocket> server_socket_;
67 ClientList client_sockets_; 68 ClientList client_sockets_;
68 RTC_DISALLOW_COPY_AND_ASSIGN(TestEchoServer); 69 RTC_DISALLOW_COPY_AND_ASSIGN(TestEchoServer);
69 }; 70 };
70 71
71 } // namespace rtc 72 } // namespace rtc
72 73
73 #endif // WEBRTC_BASE_TESTECHOSERVER_H_ 74 #endif // WEBRTC_BASE_TESTECHOSERVER_H_
OLDNEW
« no previous file with comments | « webrtc/base/taskrunner.cc ('k') | webrtc/base/testutils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698