Ensuring destruction order in MediaStreamImpl unit test.

content/renderer/media/media_stream_impl_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "content/renderer/media/media_stream_impl.h"
 #include "content/renderer/media/mock_media_stream_dependency_factory.h"
 #include "content/renderer/media/mock_media_stream_dispatcher.h"
 #include "content/renderer/media/mock_web_peer_connection_handler_client.h"
 #include "content/renderer/media/video_capture_impl_manager.h"
 #include "content/renderer/p2p/socket_dispatcher.h"
 #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.
   scoped_ptr<MockMediaStreamDispatcher> ms_dispatcher(
       new MockMediaStreamDispatcher());
   scoped_ptr<content::P2PSocketDispatcher> p2p_socket_dispatcher(
       new content::P2PSocketDispatcher(NULL));
   scoped_refptr<VideoCaptureImplManager> vc_manager(
       new VideoCaptureImplManager());
   MockMediaStreamDependencyFactory* dependency_factory =
       new MockMediaStreamDependencyFactory();
   scoped_refptr<MediaStreamImpl> ms_impl(new MediaStreamImpl(
       ms_dispatcher.get(),
       p2p_socket_dispatcher.get(),
       vc_manager.get(),
       dependency_factory));
 
   // TODO(grunell): Add tests for WebKit::WebUserMediaClient and
   // MediaStreamDispatcherEventHandler implementations.
 
   WebKit::MockWebPeerConnectionHandlerClient client;
   WebKit::WebPeerConnectionHandler* pc_handler =
       ms_impl->CreatePeerConnectionHandler(&client);
   EXPECT_TRUE(ms_impl->peer_connection_handler_);
 
   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.)

 }