Revert 232766 "Refactor MediaStreamManager to never output real ..."

content/browser/renderer_host/media/media_stream_manager_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 <string>
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "content/browser/browser_thread_impl.h"
@@ skipping 59 matching lines @@
         message_loop_(base::MessageLoopProxy::current()) {
     // Create our own MediaStreamManager.
     audio_manager_.reset(new MockAudioManager());
     media_stream_manager_.reset(new MediaStreamManager(audio_manager_.get()));
 
     // Use fake devices in order to run on the bots.
     media_stream_manager_->UseFakeDevice();
   }
 
   virtual ~MediaStreamManagerTest() {
+    media_stream_manager_->WillDestroyCurrentMessageLoop();
   }
 
   MOCK_METHOD1(Response, void(int index));
   void ResponseCallback(int index,
                         const MediaStreamDevices& devices,
                         scoped_ptr<MediaStreamUIProxy> ui_proxy) {
     Response(index);
     message_loop_->PostTask(FROM_HERE, run_loop_.QuitClosure());
   }
 
@@ skipping 31 matching lines @@
 
   // Expecting the callback will be triggered and quit the test.
   EXPECT_CALL(*this, Response(0));
   run_loop_.Run();
 }
 
 TEST_F(MediaStreamManagerTest, MakeAndCancelMediaAccessRequest) {
   std::string label = MakeMediaAccessRequest(0);
   // No callback is expected.
   media_stream_manager_->CancelRequest(label);
-  run_loop_.RunUntilIdle();
-  media_stream_manager_->WillDestroyCurrentMessageLoop();
 }
 
 TEST_F(MediaStreamManagerTest, MakeMultipleRequests) {
   // First request.
   std::string label1 =  MakeMediaAccessRequest(0);
 
   // Second request.
   int render_process_id = 2;
   int render_view_id = 2;
   int page_request_id = 2;
@@ skipping 24 matching lines @@
   std::string label2 = MakeMediaAccessRequest(1);
   media_stream_manager_->CancelRequest(label1);
 
   // Expecting the callback from the second request will be triggered and
   // quit the test.
   EXPECT_CALL(*this, Response(1));
   run_loop_.Run();
 }
 
 }  // namespace content