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