| OLD | NEW |
| 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 508 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 519 } | 519 } |
| 520 | 520 |
| 521 MOCK_METHOD0(OnChanged, void()); | 521 MOCK_METHOD0(OnChanged, void()); |
| 522 | 522 |
| 523 private: | 523 private: |
| 524 NotifierInterface* notifier_; | 524 NotifierInterface* notifier_; |
| 525 }; | 525 }; |
| 526 | 526 |
| 527 class MockPeerConnectionObserver : public PeerConnectionObserver { | 527 class MockPeerConnectionObserver : public PeerConnectionObserver { |
| 528 public: | 528 public: |
| 529 // We need these using declarations because there are two versions of each of | |
| 530 // the below methods and we only override one of them. | |
| 531 // TODO(deadbeef): Remove once there's only one version of the methods. | |
| 532 using PeerConnectionObserver::OnAddStream; | |
| 533 using PeerConnectionObserver::OnRemoveStream; | |
| 534 using PeerConnectionObserver::OnDataChannel; | |
| 535 | |
| 536 MockPeerConnectionObserver() : remote_streams_(StreamCollection::Create()) {} | 529 MockPeerConnectionObserver() : remote_streams_(StreamCollection::Create()) {} |
| 537 virtual ~MockPeerConnectionObserver() { | 530 virtual ~MockPeerConnectionObserver() { |
| 538 } | 531 } |
| 539 void SetPeerConnectionInterface(PeerConnectionInterface* pc) { | 532 void SetPeerConnectionInterface(PeerConnectionInterface* pc) { |
| 540 pc_ = pc; | 533 pc_ = pc; |
| 541 if (pc) { | 534 if (pc) { |
| 542 state_ = pc_->signaling_state(); | 535 state_ = pc_->signaling_state(); |
| 543 } | 536 } |
| 544 } | 537 } |
| 545 void OnSignalingChange( | 538 void OnSignalingChange( |
| (...skipping 2861 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3407 EXPECT_NE(a, f); | 3400 EXPECT_NE(a, f); |
| 3408 | 3401 |
| 3409 PeerConnectionInterface::RTCConfiguration g; | 3402 PeerConnectionInterface::RTCConfiguration g; |
| 3410 g.disable_ipv6 = true; | 3403 g.disable_ipv6 = true; |
| 3411 EXPECT_NE(a, g); | 3404 EXPECT_NE(a, g); |
| 3412 | 3405 |
| 3413 PeerConnectionInterface::RTCConfiguration h( | 3406 PeerConnectionInterface::RTCConfiguration h( |
| 3414 PeerConnectionInterface::RTCConfigurationType::kAggressive); | 3407 PeerConnectionInterface::RTCConfigurationType::kAggressive); |
| 3415 EXPECT_NE(a, h); | 3408 EXPECT_NE(a, h); |
| 3416 } | 3409 } |
| OLD | NEW |