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

Unified Diff: chrome/browser/media_galleries/gallery_watch_manager_unittest.cc

Issue 2654303002: Always call StorageMonitor::RemoveObserver in ~MediaFileSystemRegistry. (Closed)
Patch Set: add include 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
Index: chrome/browser/media_galleries/gallery_watch_manager_unittest.cc
diff --git a/chrome/browser/media_galleries/gallery_watch_manager_unittest.cc b/chrome/browser/media_galleries/gallery_watch_manager_unittest.cc
index 8c587cd43ba32c7391b6d3c66576638e7b2ee2be..b976f6e2c2b980e0cfd9043b67c30995d32218a4 100644
--- a/chrome/browser/media_galleries/gallery_watch_manager_unittest.cc
+++ b/chrome/browser/media_galleries/gallery_watch_manager_unittest.cc
@@ -20,6 +20,7 @@
#include "chrome/browser/media_galleries/media_galleries_preferences.h"
#include "chrome/browser/media_galleries/media_galleries_preferences_factory.h"
#include "chrome/browser/media_galleries/media_galleries_test_util.h"
+#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_profile.h"
#include "components/storage_monitor/test_storage_monitor.h"
#include "content/public/test/test_browser_thread_bundle.h"
@@ -95,6 +96,16 @@ class GalleryWatchManagerTest : public GalleryWatchManagerObserver,
manager_->RemoveObserver(profile_.get());
}
manager_.reset();
+
+ // The TestingProfile must be destroyed before the TestingBrowserProcess
+ // because it uses it in its destructor.
+ ShutdownProfile();
+
+ // The MediaFileSystemRegistry owned by the TestingBrowserProcess must be
+ // destroyed before the StorageMonitor because it calls
+ // StorageMonitor::RemoveObserver() in its destructor.
+ TestingBrowserProcess::DeleteInstance();
+
storage_monitor::TestStorageMonitor::Destroy();
}
« no previous file with comments | « chrome/browser/media_galleries/gallery_watch_manager.cc ('k') | chrome/browser/media_galleries/media_file_system_registry.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698