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

content/browser/renderer_host/media/video_capture_host_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 <map>
 #include <string>
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 252 matching lines @@
     EXPECT_EQ(0u, host_->entries_.size());
 
     CloseSession();
 
     // Simulate closing the IPC channel.
     host_->OnChannelClosing();
 
     // Release the reference to the mock object. The object will be destructed
     // on the current message loop.
     host_ = NULL;
+
+    media_stream_manager_->WillDestroyCurrentMessageLoop();
   }
 
   void OpenSession() {
     const int render_process_id = 1;
     const int render_view_id = 1;
     const int page_request_id = 1;
-    const GURL security_origin("http://test.com");
+    const GURL security_origin;
 
     ASSERT_TRUE(opened_device_label_.empty());
 
     // Enumerate video devices.
     StreamDeviceInfoArray devices;
     {
       base::RunLoop run_loop;
       std::string label = media_stream_manager_->EnumerateDevices(
           &stream_requester_,
           render_process_id,
@@ skipping 191 matching lines @@
 #ifdef DUMP_VIDEO
 TEST_F(VideoCaptureHostTest, CaptureAndDumpVideoVga) {
   CaptureAndDumpVideo(640, 480, 30);
 }
 TEST_F(VideoCaptureHostTest, CaptureAndDump720P) {
   CaptureAndDumpVideo(1280, 720, 30);
 }
 #endif
 
 }  // namespace content