diff options
| author | henrikg <henrikg@webrtc.org> | 2015-09-09 23:43:40 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-10 06:43:49 +0000 |
| commit | 0de8ff488d92e0bc6b7b65662898ff5e955cda93 (patch) | |
| tree | f883649c5d0470602045369664cb8753e7748fba /webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h | |
| parent | 11e498545b3f574030f9bf025f4fc5cd512b1b84 (diff) | |
| download | webrtc-0de8ff488d92e0bc6b7b65662898ff5e955cda93.tar.gz | |
Consolidate constructormagic macros with Chromium version and remove Chromium override.
Part of work removing dependency on Chromium's base.
Only adds "= delete". From https://codereview.chromium.org/1151443003 :
"This will guarantee the error to be at compile time, and not rely on the call visibility (private)."
In consequence of that change, fixed an illegal copy and removed a bunch of unused variables.
BUG=chromium:468375 (in particular comment #37)
NOTRY=true
Review URL: https://codereview.webrtc.org/1316363005
Cr-Commit-Position: refs/heads/master@{#9913}
Diffstat (limited to 'webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h')
| -rw-r--r-- | webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h index ceaa6373ff..cf4a649d53 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h +++ b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h @@ -370,7 +370,6 @@ class ChokeFilter : public PacketProcessor { uint32_t capacity_kbps_; int64_t last_send_time_us_; rtc::scoped_ptr<DelayCapHelper> delay_cap_helper_; - int64_t max_delay_us_; DISALLOW_IMPLICIT_CONSTRUCTORS(ChokeFilter); }; @@ -447,8 +446,6 @@ class VideoSource { int64_t next_frame_rand_ms_; int64_t now_ms_; RTPHeader prototype_header_; - int64_t start_plotting_ms_; - uint32_t previous_bitrate_bps_; DISALLOW_IMPLICIT_CONSTRUCTORS(VideoSource); }; |