Ensuring destruction order in MediaStreamImpl unit test.

content/renderer/media/media_stream_impl_unittest.cc

Index: content/renderer/media/media_stream_impl_unittest.cc
diff --git a/content/renderer/media/media_stream_impl_unittest.cc b/content/renderer/media/media_stream_impl_unittest.cc
index 110c69d2a478cd5e4826b587b026084cd01e1a39..34eb47fbbcd2a74cef735e58baf78e70beacf769 100644
--- a/content/renderer/media/media_stream_impl_unittest.cc
+++ b/content/renderer/media/media_stream_impl_unittest.cc
@@ -13,8 +13,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPeerConnectionHandler.h"
 
-// Disabled due to http://crbug.com/112408 .
-TEST(MediaStreamImplTest, DISABLED_Basic) {
+TEST(MediaStreamImplTest, Basic) {
   MessageLoop loop;
 
   // Create our test object.
@@ -43,4 +42,8 @@ TEST(MediaStreamImplTest, DISABLED_Basic) {
   ms_impl->ClosePeerConnection();
   EXPECT_FALSE(ms_impl->peer_connection_handler_);
   delete pc_handler;
+
+  // Ensure it's deleted first, since it holds naked references to other objects
+  // owned by the unit test.
+  ms_impl = NULL;

[tommi (sloooow) - chröme, 2012/02/09 12:20:45]

Since this doesn't guarantee that the object is deleted, what about adding this
check?

EXPECT_TRUE(ms_impl->HasOneRef());
ms_impl = NULL;

[Henrik Grunell, 2012/02/09 13:02:11]

Sounds good. (Though currently in the unit test there will only be one ref.)

 }