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

Unified Diff: chrome/browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc

Issue 2664073003: Destroy MediaFileSystemRegistry before StorageMonitor in MTPDeviceDelegateImplWinTest. (Closed)
Patch Set: Created 3 years, 11 months 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc
diff --git a/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc b/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc
index 7d0f923a92069f3ea4d7efcd0fe49b967d0d2483..3b97bc26c8f4a4b9d3dd0938f1125b2bd449881c 100644
--- a/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc
+++ b/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc
@@ -111,6 +111,11 @@ void MTPDeviceDelegateImplWinTest::SetUp() {
}
void MTPDeviceDelegateImplWinTest::TearDown() {
+ // The MediaFileSystemRegistry owned by the TestingBrowserProcess must be
+ // destroyed before the StorageMonitor because it calls
+ // StorageMonitor::RemoveObserver() in its destructor.
+ TestingBrowserProcess::DeleteInstance();
+
// Windows storage monitor must be destroyed on the same thread
// as construction.
TestStorageMonitor::Destroy();
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698