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 2468093004: WebRTC: Fix and enable -Woverloaded-virtual warnings. (Closed)
Patch Set: Fixed errors and reverted video capture changes Created 4 years, 1 month 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
(...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after
428 } 428 }
429 429
430 MOCK_METHOD0(OnChanged, void()); 430 MOCK_METHOD0(OnChanged, void());
431 431
432 private: 432 private:
433 NotifierInterface* notifier_; 433 NotifierInterface* notifier_;
434 }; 434 };
435 435
436 class MockPeerConnectionObserver : public PeerConnectionObserver { 436 class MockPeerConnectionObserver : public PeerConnectionObserver {
437 public: 437 public:
438 // We need these using declarations because there are two versions of each of
439 // the below methods and we only override one of them.
440 // TODO(deadbeef): Remove once there's only one version of the methods.
441 using PeerConnectionObserver::OnAddStream;
442 using PeerConnectionObserver::OnRemoveStream;
443 using PeerConnectionObserver::OnDataChannel;
444
438 MockPeerConnectionObserver() : remote_streams_(StreamCollection::Create()) {} 445 MockPeerConnectionObserver() : remote_streams_(StreamCollection::Create()) {}
439 virtual ~MockPeerConnectionObserver() { 446 virtual ~MockPeerConnectionObserver() {
440 } 447 }
441 void SetPeerConnectionInterface(PeerConnectionInterface* pc) { 448 void SetPeerConnectionInterface(PeerConnectionInterface* pc) {
442 pc_ = pc; 449 pc_ = pc;
443 if (pc) { 450 if (pc) {
444 state_ = pc_->signaling_state(); 451 state_ = pc_->signaling_state();
445 } 452 }
446 } 453 }
447 void OnSignalingChange( 454 void OnSignalingChange(
(...skipping 2444 matching lines...) Expand 10 before | Expand all | Expand 10 after
2892 FakeConstraints updated_answer_c; 2899 FakeConstraints updated_answer_c;
2893 answer_c.SetMandatoryReceiveAudio(false); 2900 answer_c.SetMandatoryReceiveAudio(false);
2894 answer_c.SetMandatoryReceiveVideo(false); 2901 answer_c.SetMandatoryReceiveVideo(false);
2895 2902
2896 cricket::MediaSessionOptions updated_answer_options; 2903 cricket::MediaSessionOptions updated_answer_options;
2897 EXPECT_TRUE( 2904 EXPECT_TRUE(
2898 ParseConstraintsForAnswer(&updated_answer_c, &updated_answer_options)); 2905 ParseConstraintsForAnswer(&updated_answer_c, &updated_answer_options));
2899 EXPECT_TRUE(updated_answer_options.has_audio()); 2906 EXPECT_TRUE(updated_answer_options.has_audio());
2900 EXPECT_TRUE(updated_answer_options.has_video()); 2907 EXPECT_TRUE(updated_answer_options.has_video());
2901 } 2908 }
OLDNEW
« no previous file with comments | « webrtc/api/peerconnectionfactory_unittest.cc ('k') | webrtc/api/test/peerconnectiontestwrapper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698