Index: chrome/browser/media_galleries/media_file_system_registry_unittest.cc |
diff --git a/chrome/browser/media_galleries/media_file_system_registry_unittest.cc b/chrome/browser/media_galleries/media_file_system_registry_unittest.cc |
index f0c2b767d7a6d3c81311df0a9b977ca56622404d..4582aab2bd6c09218d90453af26d31d43c43e07f 100644 |
--- a/chrome/browser/media_galleries/media_file_system_registry_unittest.cc |
+++ b/chrome/browser/media_galleries/media_file_system_registry_unittest.cc |
@@ -790,12 +790,21 @@ void MediaFileSystemRegistryTest::TearDown() { |
MediaFileSystemRegistry* registry = |
g_browser_process->media_file_system_registry(); |
EXPECT_EQ(0U, GetExtensionGalleriesHostCount(registry)); |
- TestStorageMonitor::Destroy(); |
+ |
#if defined(OS_CHROMEOS) |
test_user_manager_.reset(); |
#endif |
+ // The TestingProfile must be destroyed before the TestingBrowserProcess |
+ // because it uses it in its destructor. |
ChromeRenderViewHostTestHarness::TearDown(); |
+ |
+ // The MediaFileSystemRegistry owned by the TestingBrowserProcess must be |
+ // destroyed before the StorageMonitor because it calls |
+ // StorageMonitor::RemoveObserver() in its destructor. |
+ TestingBrowserProcess::DeleteInstance(); |
+ |
+ TestStorageMonitor::Destroy(); |
} |
/////////// |