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

Side by Side Diff: webrtc/pc/peerconnection_integrationtest.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/pc/peerconnection.cc ('k') | webrtc/pc/peerconnectionendtoend_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 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2012 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 // Disable for TSan v2, see 11 // Disable for TSan v2, see
12 // https://code.google.com/p/webrtc/issues/detail?id=1205 for details. 12 // https://code.google.com/p/webrtc/issues/detail?id=1205 for details.
13 #if !defined(THREAD_SANITIZER) 13 #if !defined(THREAD_SANITIZER)
14 14
15 #include <stdio.h> 15 #include <stdio.h>
16 16
17 #include <algorithm> 17 #include <algorithm>
18 #include <functional> 18 #include <functional>
19 #include <list> 19 #include <list>
20 #include <map> 20 #include <map>
21 #include <memory> 21 #include <memory>
22 #include <utility> 22 #include <utility>
23 #include <vector> 23 #include <vector>
24 24
25 #include "webrtc/api/fakemetricsobserver.h" 25 #include "webrtc/api/fakemetricsobserver.h"
26 #include "webrtc/api/mediastreaminterface.h" 26 #include "webrtc/api/mediastreaminterface.h"
27 #include "webrtc/api/peerconnectioninterface.h" 27 #include "webrtc/api/peerconnectioninterface.h"
28 #include "webrtc/api/test/fakeconstraints.h" 28 #include "webrtc/api/test/fakeconstraints.h"
29 #include "webrtc/base/asyncinvoker.h"
30 #include "webrtc/base/fakenetwork.h"
31 #include "webrtc/base/gunit.h"
32 #include "webrtc/base/helpers.h"
33 #include "webrtc/base/ssladapter.h"
34 #include "webrtc/base/sslstreamadapter.h"
35 #include "webrtc/base/thread.h"
36 #include "webrtc/base/virtualsocketserver.h"
37 #include "webrtc/media/engine/fakewebrtcvideoengine.h" 29 #include "webrtc/media/engine/fakewebrtcvideoengine.h"
38 #include "webrtc/p2p/base/p2pconstants.h" 30 #include "webrtc/p2p/base/p2pconstants.h"
39 #include "webrtc/p2p/base/portinterface.h" 31 #include "webrtc/p2p/base/portinterface.h"
40 #include "webrtc/p2p/base/sessiondescription.h" 32 #include "webrtc/p2p/base/sessiondescription.h"
41 #include "webrtc/p2p/base/testturnserver.h" 33 #include "webrtc/p2p/base/testturnserver.h"
42 #include "webrtc/p2p/client/basicportallocator.h" 34 #include "webrtc/p2p/client/basicportallocator.h"
43 #include "webrtc/pc/dtmfsender.h" 35 #include "webrtc/pc/dtmfsender.h"
44 #include "webrtc/pc/localaudiosource.h" 36 #include "webrtc/pc/localaudiosource.h"
45 #include "webrtc/pc/mediasession.h" 37 #include "webrtc/pc/mediasession.h"
46 #include "webrtc/pc/peerconnection.h" 38 #include "webrtc/pc/peerconnection.h"
47 #include "webrtc/pc/peerconnectionfactory.h" 39 #include "webrtc/pc/peerconnectionfactory.h"
48 #include "webrtc/pc/test/fakeaudiocapturemodule.h" 40 #include "webrtc/pc/test/fakeaudiocapturemodule.h"
49 #include "webrtc/pc/test/fakeperiodicvideocapturer.h" 41 #include "webrtc/pc/test/fakeperiodicvideocapturer.h"
50 #include "webrtc/pc/test/fakertccertificategenerator.h" 42 #include "webrtc/pc/test/fakertccertificategenerator.h"
51 #include "webrtc/pc/test/fakevideotrackrenderer.h" 43 #include "webrtc/pc/test/fakevideotrackrenderer.h"
52 #include "webrtc/pc/test/mockpeerconnectionobservers.h" 44 #include "webrtc/pc/test/mockpeerconnectionobservers.h"
45 #include "webrtc/rtc_base/asyncinvoker.h"
46 #include "webrtc/rtc_base/fakenetwork.h"
47 #include "webrtc/rtc_base/gunit.h"
48 #include "webrtc/rtc_base/helpers.h"
49 #include "webrtc/rtc_base/ssladapter.h"
50 #include "webrtc/rtc_base/sslstreamadapter.h"
51 #include "webrtc/rtc_base/thread.h"
52 #include "webrtc/rtc_base/virtualsocketserver.h"
53 53
54 using cricket::ContentInfo; 54 using cricket::ContentInfo;
55 using cricket::FakeWebRtcVideoDecoder; 55 using cricket::FakeWebRtcVideoDecoder;
56 using cricket::FakeWebRtcVideoDecoderFactory; 56 using cricket::FakeWebRtcVideoDecoderFactory;
57 using cricket::FakeWebRtcVideoEncoder; 57 using cricket::FakeWebRtcVideoEncoder;
58 using cricket::FakeWebRtcVideoEncoderFactory; 58 using cricket::FakeWebRtcVideoEncoderFactory;
59 using cricket::MediaContentDescription; 59 using cricket::MediaContentDescription;
60 using webrtc::DataBuffer; 60 using webrtc::DataBuffer;
61 using webrtc::DataChannelInterface; 61 using webrtc::DataChannelInterface;
62 using webrtc::DtmfSender; 62 using webrtc::DtmfSender;
(...skipping 2907 matching lines...) Expand 10 before | Expand all | Expand 10 after
2970 caller()->CreateAndSetAndSignalOffer(); 2970 caller()->CreateAndSetAndSignalOffer();
2971 ASSERT_TRUE_WAIT(SignalingStateStable(), kDefaultTimeout); 2971 ASSERT_TRUE_WAIT(SignalingStateStable(), kDefaultTimeout);
2972 // Wait for additional audio frames to be received by the callee. 2972 // Wait for additional audio frames to be received by the callee.
2973 ExpectNewFramesReceivedWithWait(0, 0, kDefaultExpectedAudioFrameCount, 0, 2973 ExpectNewFramesReceivedWithWait(0, 0, kDefaultExpectedAudioFrameCount, 0,
2974 kMaxWaitForFramesMs); 2974 kMaxWaitForFramesMs);
2975 } 2975 }
2976 2976
2977 } // namespace 2977 } // namespace
2978 2978
2979 #endif // if !defined(THREAD_SANITIZER) 2979 #endif // if !defined(THREAD_SANITIZER)
OLDNEW
« no previous file with comments | « webrtc/pc/peerconnection.cc ('k') | webrtc/pc/peerconnectionendtoend_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698