aboutsummaryrefslogtreecommitdiff
path: root/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.cc
diff options
context:
space:
mode:
authorstefan@webrtc.org <stefan@webrtc.org>2015-02-06 12:59:39 +0000
committerstefan@webrtc.org <stefan@webrtc.org>2015-02-06 13:00:26 +0000
commit10a9e924ebf9720bc043f9d15c5317c79216bc48 (patch)
treee0988db63383a0f8910abfbf42502dd923e68f84 /webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.cc
parent4b320cf2149b317c9ab08fe7c7017f5756651e69 (diff)
downloadwebrtc-10a9e924ebf9720bc043f9d15c5317c79216bc48.tar.gz
Fix delete of stack allocated object causing test crashes.
Introduced in r8264. BUG=4173 R=bjornv@webrtc.org Review URL: https://webrtc-codereview.appspot.com/37959004 Cr-Commit-Position: refs/heads/master@{#8266} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8266 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.cc')
-rw-r--r--webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.cc b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.cc
index b2627a1cc7..8702e3ab6f 100644
--- a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.cc
+++ b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.cc
@@ -805,10 +805,8 @@ SendSideBwe* CreateEstimator(BandwidthEstimatorType estimator,
return new RembSendSideBwe(kbps, observer, clock);
case kFullSendSideEstimator:
return new FullSendSideBwe(kbps, observer, clock);
- case kNullEstimator: {
- static NullSendSideBwe null_bwe;
- return &null_bwe;
- }
+ case kNullEstimator:
+ return new NullSendSideBwe();
}
assert(false);
return NULL;