Fix teardown of a couple of test suites

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/command_line.h"
 #include "base/location.h"
 #include "base/run_loop.h"
@@ skipping 152 matching lines @@
   MediaStreamManagerTest()
       : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP),
         task_runner_(base::ThreadTaskRunnerHandle::Get()) {
     // Create our own MediaStreamManager. Use fake devices to run on the bots.
     base::CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kUseFakeDeviceForMediaStream);
     audio_manager_.reset(new MockAudioManager());
     media_stream_manager_.reset(new MediaStreamManager(audio_manager_.get()));
 }
 
-  virtual ~MediaStreamManagerTest() {
+  ~MediaStreamManagerTest() override {
+    // Since the main thread of this test suite is the IO thread,
+    // we need to flush it to clear any pending operations before
+    // deleting the MSM.
+    base::RunLoop loop;
+    loop.RunUntilIdle();
+    media_stream_manager_->WillDestroyCurrentMessageLoop();
   }
 
   MOCK_METHOD1(Response, void(int index));
   void ResponseCallback(int index,
                         const MediaStreamDevices& devices,
                         scoped_ptr<MediaStreamUIProxy> ui_proxy) {
     Response(index);
     task_runner_->PostTask(FROM_HERE, run_loop_.QuitClosure());
   }
 
@@ skipping 131 matching lines @@
     std::string label = media_stream_manager_->EnumerateDevices(
         &requester, render_process_id, render_frame_id, GetMockSaltCallback(),
         page_request_id, MEDIA_DEVICE_AUDIO_OUTPUT, security_origin);
     run_loop.Run();
     // CancelRequest is necessary for enumeration requests.
     media_stream_manager_->CancelRequest(label);
   }
 }
 
 }  // namespace content