Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(519)

Unified Diff: content/browser/renderer_host/media/media_devices_manager_unittest.cc

Issue 2535043003: Fix MediaDevices* tests dependency on BrowserThread globals after ~BrowserThreadImpl(). (Closed)
Patch Set: +comment Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/media/media_devices_manager_unittest.cc
diff --git a/content/browser/renderer_host/media/media_devices_manager_unittest.cc b/content/browser/renderer_host/media/media_devices_manager_unittest.cc
index cdbac6481a7c736508aef10fa09428902b7fd0a1..202b829b0a117e67f20782599ddb23191dc5966c 100644
--- a/content/browser/renderer_host/media/media_devices_manager_unittest.cc
+++ b/content/browser/renderer_host/media/media_devices_manager_unittest.cc
@@ -125,8 +125,8 @@ class MockMediaDeviceChangeSubscriber : public MediaDeviceChangeSubscriber {
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&));
@@ -156,10 +156,13 @@ class MediaDevicesManagerTest : public ::testing::Test {
type, MediaDevicesManager::CachePolicy::SYSTEM_MONITOR);
}
+ // Must outlive MediaDevicesManager as ~MediaDevicesManager() verifies it's
+ // running on the IO thread.
+ TestBrowserThreadBundle thread_bundle_;
+
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:

Powered by Google App Engine
This is Rietveld 408576698