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

Side by Side Diff: webrtc/api/peerconnectioninterface_unittest.cc

Issue 2614813003: Revert of Separating SCTP code from BaseChannel/MediaChannel. (Closed)
Patch Set: Also reverting https://codereview.webrtc.org/2612963002 Created 3 years, 11 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/api/peerconnection.cc ('k') | webrtc/api/rtcstatscollector.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
(...skipping 17 matching lines...) Expand all
28 #include "webrtc/api/test/mockpeerconnectionobservers.h" 28 #include "webrtc/api/test/mockpeerconnectionobservers.h"
29 #include "webrtc/api/test/testsdpstrings.h" 29 #include "webrtc/api/test/testsdpstrings.h"
30 #include "webrtc/api/videocapturertracksource.h" 30 #include "webrtc/api/videocapturertracksource.h"
31 #include "webrtc/api/videotrack.h" 31 #include "webrtc/api/videotrack.h"
32 #include "webrtc/base/gunit.h" 32 #include "webrtc/base/gunit.h"
33 #include "webrtc/base/ssladapter.h" 33 #include "webrtc/base/ssladapter.h"
34 #include "webrtc/base/sslstreamadapter.h" 34 #include "webrtc/base/sslstreamadapter.h"
35 #include "webrtc/base/stringutils.h" 35 #include "webrtc/base/stringutils.h"
36 #include "webrtc/base/thread.h" 36 #include "webrtc/base/thread.h"
37 #include "webrtc/media/base/fakevideocapturer.h" 37 #include "webrtc/media/base/fakevideocapturer.h"
38 #include "webrtc/media/sctp/sctptransportinternal.h" 38 #include "webrtc/media/sctp/sctpdataengine.h"
39 #include "webrtc/p2p/base/fakeportallocator.h" 39 #include "webrtc/p2p/base/fakeportallocator.h"
40 #include "webrtc/p2p/base/faketransportcontroller.h" 40 #include "webrtc/p2p/base/faketransportcontroller.h"
41 #include "webrtc/pc/mediasession.h" 41 #include "webrtc/pc/mediasession.h"
42 #include "webrtc/test/gmock.h" 42 #include "webrtc/test/gmock.h"
43 43
44 #ifdef WEBRTC_ANDROID 44 #ifdef WEBRTC_ANDROID
45 #include "webrtc/api/test/androidtestinitializer.h" 45 #include "webrtc/api/test/androidtestinitializer.h"
46 #endif 46 #endif
47 47
48 static const char kStreamLabel1[] = "local_stream_1"; 48 static const char kStreamLabel1[] = "local_stream_1";
(...skipping 3178 matching lines...) Expand 10 before | Expand all | Expand 10 after
3227 EXPECT_TRUE(updated_answer_options.has_video()); 3227 EXPECT_TRUE(updated_answer_options.has_video());
3228 } 3228 }
3229 3229
3230 TEST(RtcErrorTest, OstreamOperator) { 3230 TEST(RtcErrorTest, OstreamOperator) {
3231 std::ostringstream oss; 3231 std::ostringstream oss;
3232 oss << webrtc::RtcError::NONE << ' ' 3232 oss << webrtc::RtcError::NONE << ' '
3233 << webrtc::RtcError::INVALID_PARAMETER << ' ' 3233 << webrtc::RtcError::INVALID_PARAMETER << ' '
3234 << webrtc::RtcError::INTERNAL_ERROR; 3234 << webrtc::RtcError::INTERNAL_ERROR;
3235 EXPECT_EQ("NONE INVALID_PARAMETER INTERNAL_ERROR", oss.str()); 3235 EXPECT_EQ("NONE INVALID_PARAMETER INTERNAL_ERROR", oss.str());
3236 } 3236 }
OLDNEW
« no previous file with comments | « webrtc/api/peerconnection.cc ('k') | webrtc/api/rtcstatscollector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698