From 10a9e924ebf9720bc043f9d15c5317c79216bc48 Mon Sep 17 00:00:00 2001
From: "stefan@webrtc.org" <stefan@webrtc.org>
Date: Fri, 6 Feb 2015 12:59:39 +0000
Subject: [PATCH] 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
---
 .../remote_bitrate_estimator/test/bwe_test_framework.cc     | 6 ++----
 1 file 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;