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

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

Issue 2632203003: Delete deprecated PeerConnection methods, and corresponding using declarations. (Closed)
Patch Set: Make two additional methods pure virtual. 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
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 489 matching lines...) Expand 10 before | Expand all | Expand 10 after
500 } 500 }
501 501
502 MOCK_METHOD0(OnChanged, void()); 502 MOCK_METHOD0(OnChanged, void());
503 503
504 private: 504 private:
505 NotifierInterface* notifier_; 505 NotifierInterface* notifier_;
506 }; 506 };
507 507
508 class MockPeerConnectionObserver : public PeerConnectionObserver { 508 class MockPeerConnectionObserver : public PeerConnectionObserver {
509 public: 509 public:
510 // We need these using declarations because there are two versions of each of
511 // the below methods and we only override one of them.
512 // TODO(deadbeef): Remove once there's only one version of the methods.
513 using PeerConnectionObserver::OnAddStream;
514 using PeerConnectionObserver::OnRemoveStream;
515 using PeerConnectionObserver::OnDataChannel;
516
517 MockPeerConnectionObserver() : remote_streams_(StreamCollection::Create()) {} 510 MockPeerConnectionObserver() : remote_streams_(StreamCollection::Create()) {}
518 virtual ~MockPeerConnectionObserver() { 511 virtual ~MockPeerConnectionObserver() {
519 } 512 }
520 void SetPeerConnectionInterface(PeerConnectionInterface* pc) { 513 void SetPeerConnectionInterface(PeerConnectionInterface* pc) {
521 pc_ = pc; 514 pc_ = pc;
522 if (pc) { 515 if (pc) {
523 state_ = pc_->signaling_state(); 516 state_ = pc_->signaling_state();
524 } 517 }
525 } 518 }
526 void OnSignalingChange( 519 void OnSignalingChange(
(...skipping 2829 matching lines...) Expand 10 before | Expand all | Expand 10 after
3356 EXPECT_NE(a, f); 3349 EXPECT_NE(a, f);
3357 3350
3358 PeerConnectionInterface::RTCConfiguration g; 3351 PeerConnectionInterface::RTCConfiguration g;
3359 g.disable_ipv6 = true; 3352 g.disable_ipv6 = true;
3360 EXPECT_NE(a, g); 3353 EXPECT_NE(a, g);
3361 3354
3362 PeerConnectionInterface::RTCConfiguration h( 3355 PeerConnectionInterface::RTCConfiguration h(
3363 PeerConnectionInterface::RTCConfigurationType::kAggressive); 3356 PeerConnectionInterface::RTCConfigurationType::kAggressive);
3364 EXPECT_NE(a, h); 3357 EXPECT_NE(a, h);
3365 } 3358 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698