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

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

Issue 1691463002: Move talk/session/media -> webrtc/pc (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Make the test target inherit the defines for rtc_pc Created 4 years, 10 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
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 #include <string> 11 #include <string>
12 #include <utility> 12 #include <utility>
13 13
14 #include "talk/session/media/mediasession.h" 14 #include "webrtc/pc/mediasession.h"
15 #include "webrtc/api/audiotrack.h" 15 #include "webrtc/api/audiotrack.h"
16 #include "webrtc/api/jsepsessiondescription.h" 16 #include "webrtc/api/jsepsessiondescription.h"
17 #include "webrtc/api/mediastream.h" 17 #include "webrtc/api/mediastream.h"
18 #include "webrtc/api/mediastreaminterface.h" 18 #include "webrtc/api/mediastreaminterface.h"
19 #include "webrtc/api/peerconnection.h" 19 #include "webrtc/api/peerconnection.h"
20 #include "webrtc/api/peerconnectioninterface.h" 20 #include "webrtc/api/peerconnectioninterface.h"
21 #include "webrtc/api/rtpreceiverinterface.h" 21 #include "webrtc/api/rtpreceiverinterface.h"
22 #include "webrtc/api/rtpsenderinterface.h" 22 #include "webrtc/api/rtpsenderinterface.h"
23 #include "webrtc/api/streamcollection.h" 23 #include "webrtc/api/streamcollection.h"
24 #ifdef WEBRTC_ANDROID 24 #ifdef WEBRTC_ANDROID
(...skipping 2464 matching lines...) Expand 10 before | Expand all | Expand 10 after
2489 FakeConstraints updated_answer_c; 2489 FakeConstraints updated_answer_c;
2490 answer_c.SetMandatoryReceiveAudio(false); 2490 answer_c.SetMandatoryReceiveAudio(false);
2491 answer_c.SetMandatoryReceiveVideo(false); 2491 answer_c.SetMandatoryReceiveVideo(false);
2492 2492
2493 cricket::MediaSessionOptions updated_answer_options; 2493 cricket::MediaSessionOptions updated_answer_options;
2494 EXPECT_TRUE( 2494 EXPECT_TRUE(
2495 ParseConstraintsForAnswer(&updated_answer_c, &updated_answer_options)); 2495 ParseConstraintsForAnswer(&updated_answer_c, &updated_answer_options));
2496 EXPECT_TRUE(updated_answer_options.has_audio()); 2496 EXPECT_TRUE(updated_answer_options.has_audio());
2497 EXPECT_TRUE(updated_answer_options.has_video()); 2497 EXPECT_TRUE(updated_answer_options.has_video());
2498 } 2498 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698