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

Side by Side Diff: webrtc/p2p/base/basicpacketsocketfactory.cc

Issue 2969623003: Update includes for webrtc/{base => rtc_base} rename (2/3) (Closed)
Patch Set: Rebased onto 224e65939af87443addfc5bb500fbf434728bd1c and restored sorting in clock.cc Created 3 years, 5 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/base/asyncstuntcpsocket_unittest.cc ('k') | webrtc/p2p/base/candidate.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 2011 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2011 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/p2p/base/basicpacketsocketfactory.h" 11 #include "webrtc/p2p/base/basicpacketsocketfactory.h"
12 12
13 #include <string> 13 #include <string>
14 14
15 #include "webrtc/p2p/base/asyncstuntcpsocket.h" 15 #include "webrtc/p2p/base/asyncstuntcpsocket.h"
16 #include "webrtc/p2p/base/stun.h" 16 #include "webrtc/p2p/base/stun.h"
17 #include "webrtc/base/asynctcpsocket.h" 17 #include "webrtc/rtc_base/asynctcpsocket.h"
18 #include "webrtc/base/asyncudpsocket.h" 18 #include "webrtc/rtc_base/asyncudpsocket.h"
19 #include "webrtc/base/checks.h" 19 #include "webrtc/rtc_base/checks.h"
20 #include "webrtc/base/logging.h" 20 #include "webrtc/rtc_base/logging.h"
21 #include "webrtc/base/nethelpers.h" 21 #include "webrtc/rtc_base/nethelpers.h"
22 #include "webrtc/base/physicalsocketserver.h" 22 #include "webrtc/rtc_base/physicalsocketserver.h"
23 #include "webrtc/base/socketadapters.h" 23 #include "webrtc/rtc_base/socketadapters.h"
24 #include "webrtc/base/ssladapter.h" 24 #include "webrtc/rtc_base/ssladapter.h"
25 #include "webrtc/base/thread.h" 25 #include "webrtc/rtc_base/thread.h"
26 26
27 namespace rtc { 27 namespace rtc {
28 28
29 BasicPacketSocketFactory::BasicPacketSocketFactory() 29 BasicPacketSocketFactory::BasicPacketSocketFactory()
30 : thread_(Thread::Current()), 30 : thread_(Thread::Current()),
31 socket_factory_(NULL) { 31 socket_factory_(NULL) {
32 } 32 }
33 33
34 BasicPacketSocketFactory::BasicPacketSocketFactory(Thread* thread) 34 BasicPacketSocketFactory::BasicPacketSocketFactory(Thread* thread)
35 : thread_(thread), 35 : thread_(thread),
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 SocketFactory* BasicPacketSocketFactory::socket_factory() { 213 SocketFactory* BasicPacketSocketFactory::socket_factory() {
214 if (thread_) { 214 if (thread_) {
215 RTC_DCHECK(thread_ == Thread::Current()); 215 RTC_DCHECK(thread_ == Thread::Current());
216 return thread_->socketserver(); 216 return thread_->socketserver();
217 } else { 217 } else {
218 return socket_factory_; 218 return socket_factory_;
219 } 219 }
220 } 220 }
221 221
222 } // namespace rtc 222 } // namespace rtc
OLDNEW
« no previous file with comments | « webrtc/p2p/base/asyncstuntcpsocket_unittest.cc ('k') | webrtc/p2p/base/candidate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698