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

Side by Side Diff: webrtc/p2p/client/fakeportallocator.h

Issue 1965063003: Revert of Remove webrtc/base/scoped_ptr.h (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: 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/p2p/client/basicportallocator.h ('k') | webrtc/p2p/quic/quictransportchannel.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 2010 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2010 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_P2P_CLIENT_FAKEPORTALLOCATOR_H_ 11 #ifndef WEBRTC_P2P_CLIENT_FAKEPORTALLOCATOR_H_
12 #define WEBRTC_P2P_CLIENT_FAKEPORTALLOCATOR_H_ 12 #define WEBRTC_P2P_CLIENT_FAKEPORTALLOCATOR_H_
13 13
14 #include <memory> 14 #include <memory>
15 #include <string> 15 #include <string>
16 16
17 #include "webrtc/p2p/base/basicpacketsocketfactory.h" 17 #include "webrtc/p2p/base/basicpacketsocketfactory.h"
18 #include "webrtc/p2p/base/portallocator.h" 18 #include "webrtc/p2p/base/portallocator.h"
19 #include "webrtc/p2p/base/udpport.h" 19 #include "webrtc/p2p/base/udpport.h"
20 #include "webrtc/base/scoped_ptr.h"
20 21
21 namespace rtc { 22 namespace rtc {
22 class SocketFactory; 23 class SocketFactory;
23 class Thread; 24 class Thread;
24 } 25 }
25 26
26 namespace cricket { 27 namespace cricket {
27 28
28 class TestUDPPort : public UDPPort { 29 class TestUDPPort : public UDPPort {
29 public: 30 public:
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 rtc::Thread* worker_thread_; 180 rtc::Thread* worker_thread_;
180 rtc::PacketSocketFactory* factory_; 181 rtc::PacketSocketFactory* factory_;
181 std::unique_ptr<rtc::BasicPacketSocketFactory> owned_factory_; 182 std::unique_ptr<rtc::BasicPacketSocketFactory> owned_factory_;
182 ServerAddresses stun_servers_; 183 ServerAddresses stun_servers_;
183 std::vector<RelayServerConfig> turn_servers_; 184 std::vector<RelayServerConfig> turn_servers_;
184 }; 185 };
185 186
186 } // namespace cricket 187 } // namespace cricket
187 188
188 #endif // WEBRTC_P2P_CLIENT_FAKEPORTALLOCATOR_H_ 189 #endif // WEBRTC_P2P_CLIENT_FAKEPORTALLOCATOR_H_
OLDNEW
« no previous file with comments | « webrtc/p2p/client/basicportallocator.h ('k') | webrtc/p2p/quic/quictransportchannel.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698