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

Side by Side Diff: webrtc/modules/remote_bitrate_estimator/test/estimators/remb.h

Issue 2121993002: Added NiceMock for MockRtcEventLog in several unittests where we don't care about the event logging. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Removed EXPECT_CALL for calls related to RtcEventLog in bitrate_controller_unittest Created 4 years, 5 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 (c) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 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 28 matching lines...) Expand all
39 void OnPacketsSent(const Packets& packets) override {} 39 void OnPacketsSent(const Packets& packets) override {}
40 int64_t TimeUntilNextProcess() override; 40 int64_t TimeUntilNextProcess() override;
41 void Process() override; 41 void Process() override;
42 42
43 protected: 43 protected:
44 std::unique_ptr<BitrateController> bitrate_controller_; 44 std::unique_ptr<BitrateController> bitrate_controller_;
45 std::unique_ptr<RtcpBandwidthObserver> feedback_observer_; 45 std::unique_ptr<RtcpBandwidthObserver> feedback_observer_;
46 46
47 private: 47 private:
48 Clock* clock_; 48 Clock* clock_;
49 MockRtcEventLog event_log_; 49 ::testing::NiceMock<MockRtcEventLog> event_log_;
50 50
51 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RembBweSender); 51 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RembBweSender);
52 }; 52 };
53 53
54 class RembReceiver : public BweReceiver, public RemoteBitrateObserver { 54 class RembReceiver : public BweReceiver, public RemoteBitrateObserver {
55 public: 55 public:
56 static const uint32_t kRemoteBitrateEstimatorMinBitrateBps = 30000; 56 static const uint32_t kRemoteBitrateEstimatorMinBitrateBps = 30000;
57 57
58 RembReceiver(int flow_id, bool plot); 58 RembReceiver(int flow_id, bool plot);
59 virtual ~RembReceiver(); 59 virtual ~RembReceiver();
(...skipping 18 matching lines...) Expand all
78 std::unique_ptr<RemoteBitrateEstimator> estimator_; 78 std::unique_ptr<RemoteBitrateEstimator> estimator_;
79 79
80 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RembReceiver); 80 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RembReceiver);
81 }; 81 };
82 82
83 } // namespace bwe 83 } // namespace bwe
84 } // namespace testing 84 } // namespace testing
85 } // namespace webrtc 85 } // namespace webrtc
86 86
87 #endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_REMB_H_ 87 #endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_REMB_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698