Fix MediaDevices* tests dependency on BrowserThread globals after ~BrowserThreadImpl().

content/browser/renderer_host/media/media_devices_manager_unittest.cc

 // Copyright 2016 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 "content/browser/renderer_host/media/media_devices_manager.h"
 
 #include <memory>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 107 matching lines @@
  public:
   MOCK_METHOD2(OnDevicesChanged,
                void(MediaDeviceType, const MediaDeviceInfoArray&));
 };
 
 }  // namespace
 
 class MediaDevicesManagerTest : public ::testing::Test {
  public:
   MediaDevicesManagerTest()
-      : video_capture_device_factory_(nullptr),
-        thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {}
+      : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP),
+        video_capture_device_factory_(nullptr) {}
   ~MediaDevicesManagerTest() override {}
 
   MOCK_METHOD1(MockCallback, void(const MediaDeviceEnumeration&));
 
   void EnumerateCallback(base::RunLoop* run_loop,
                          const MediaDeviceEnumeration& result) {
     MockCallback(result);
     run_loop->Quit();
   }
 
  protected:
   void SetUp() override {
     audio_manager_.reset(new MockAudioManager());
     video_capture_manager_ = new VideoCaptureManager(
         std::unique_ptr<media::VideoCaptureDeviceFactory>(
             new MockVideoCaptureDeviceFactory()));
     video_capture_manager_->Register(nullptr,
                                      base::ThreadTaskRunnerHandle::Get());
     video_capture_device_factory_ = static_cast<MockVideoCaptureDeviceFactory*>(
         video_capture_manager_->video_capture_device_factory());
     media_devices_manager_.reset(new MediaDevicesManager(
         audio_manager_.get(), video_capture_manager_, nullptr));
   }
 
   void EnableCache(MediaDeviceType type) {
     media_devices_manager_->SetCachePolicy(
         type, MediaDevicesManager::CachePolicy::SYSTEM_MONITOR);
   }
 
+  TestBrowserThreadBundle thread_bundle_;

[liberato (no reviews please), 2016/11/29 16:46:52]

it's worth a comment here that destruction order is important, and what depends
on it.

[gab, 2016/11/29 18:24:50]

Done.

+
   std::unique_ptr<MediaDevicesManager> media_devices_manager_;
   scoped_refptr<VideoCaptureManager> video_capture_manager_;
   MockVideoCaptureDeviceFactory* video_capture_device_factory_;
-  TestBrowserThreadBundle thread_bundle_;
   std::unique_ptr<MockAudioManager, media::AudioManagerDeleter> audio_manager_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MediaDevicesManagerTest);
 };
 
 TEST_F(MediaDevicesManagerTest, EnumerateNoCacheAudioInput) {
   EXPECT_CALL(*audio_manager_, MockGetAudioInputDeviceNames(_))
       .Times(kNumCalls);
   EXPECT_CALL(*video_capture_device_factory_, MockGetDeviceDescriptors())
@@ skipping 384 matching lines @@
   media_devices_manager_->OnDevicesChanged(base::SystemMonitor::DEVTYPE_AUDIO);
   media_devices_manager_->OnDevicesChanged(
       base::SystemMonitor::DEVTYPE_VIDEO_CAPTURE);
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(num_audio_input_devices, notification_all_audio_input.size());
   EXPECT_EQ(num_video_input_devices, notification_all_video_input.size());
   EXPECT_EQ(num_audio_output_devices, notification_all_audio_output.size());
 }
 
 }  // namespace content