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

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

Issue 1921653002: Enable -Winconsistent-missing-override flag. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase. Created 4 years, 7 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/peerconnectionfactory.h ('k') | webrtc/api/rtpsender.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 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 406 matching lines...) Expand 10 before | Expand all | Expand 10 after
417 public: 417 public:
418 MockPeerConnectionObserver() : remote_streams_(StreamCollection::Create()) {} 418 MockPeerConnectionObserver() : remote_streams_(StreamCollection::Create()) {}
419 ~MockPeerConnectionObserver() { 419 ~MockPeerConnectionObserver() {
420 } 420 }
421 void SetPeerConnectionInterface(PeerConnectionInterface* pc) { 421 void SetPeerConnectionInterface(PeerConnectionInterface* pc) {
422 pc_ = pc; 422 pc_ = pc;
423 if (pc) { 423 if (pc) {
424 state_ = pc_->signaling_state(); 424 state_ = pc_->signaling_state();
425 } 425 }
426 } 426 }
427 virtual void OnSignalingChange( 427 void OnSignalingChange(
428 PeerConnectionInterface::SignalingState new_state) { 428 PeerConnectionInterface::SignalingState new_state) override {
429 EXPECT_EQ(pc_->signaling_state(), new_state); 429 EXPECT_EQ(pc_->signaling_state(), new_state);
430 state_ = new_state; 430 state_ = new_state;
431 } 431 }
432 // TODO(bemasc): Remove this once callers transition to OnIceGatheringChange. 432 // TODO(bemasc): Remove this once callers transition to OnIceGatheringChange.
433 virtual void OnStateChange(StateType state_changed) { 433 virtual void OnStateChange(StateType state_changed) {
434 if (pc_.get() == NULL) 434 if (pc_.get() == NULL)
435 return; 435 return;
436 switch (state_changed) { 436 switch (state_changed) {
437 case kSignalingState: 437 case kSignalingState:
438 // OnSignalingChange and OnStateChange(kSignalingState) should always 438 // OnSignalingChange and OnStateChange(kSignalingState) should always
(...skipping 2222 matching lines...) Expand 10 before | Expand all | Expand 10 after
2661 FakeConstraints updated_answer_c; 2661 FakeConstraints updated_answer_c;
2662 answer_c.SetMandatoryReceiveAudio(false); 2662 answer_c.SetMandatoryReceiveAudio(false);
2663 answer_c.SetMandatoryReceiveVideo(false); 2663 answer_c.SetMandatoryReceiveVideo(false);
2664 2664
2665 cricket::MediaSessionOptions updated_answer_options; 2665 cricket::MediaSessionOptions updated_answer_options;
2666 EXPECT_TRUE( 2666 EXPECT_TRUE(
2667 ParseConstraintsForAnswer(&updated_answer_c, &updated_answer_options)); 2667 ParseConstraintsForAnswer(&updated_answer_c, &updated_answer_options));
2668 EXPECT_TRUE(updated_answer_options.has_audio()); 2668 EXPECT_TRUE(updated_answer_options.has_audio());
2669 EXPECT_TRUE(updated_answer_options.has_video()); 2669 EXPECT_TRUE(updated_answer_options.has_video());
2670 } 2670 }
OLDNEW
« no previous file with comments | « webrtc/api/peerconnectionfactory.h ('k') | webrtc/api/rtpsender.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698