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

Unified Diff: chrome/browser/media_galleries/media_galleries_permission_controller.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
« no previous file with comments | « chrome/browser/media_galleries/media_file_system_registry_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/media_galleries/media_galleries_permission_controller.cc
diff --git a/chrome/browser/media_galleries/media_galleries_permission_controller.cc b/chrome/browser/media_galleries/media_galleries_permission_controller.cc
index b2c4d4ba3e3ef3f7714cbf0ba3ac07abcfe6d26a..380978410d2f750eac2d2708aa5c60491894953f 100644
--- a/chrome/browser/media_galleries/media_galleries_permission_controller.cc
+++ b/chrome/browser/media_galleries/media_galleries_permission_controller.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/media_galleries/media_galleries_permission_controller.h"
#include "base/base_paths.h"
+#include "base/logging.h"
#include "base/path_service.h"
#include "base/stl_util.h"
#include "base/strings/utf_string_conversions.h"
@@ -81,8 +82,8 @@ MediaGalleriesPermissionController::MediaGalleriesPermissionController(
}
void MediaGalleriesPermissionController::OnPreferencesInitialized() {
- if (StorageMonitor::GetInstance())
- StorageMonitor::GetInstance()->AddObserver(this);
+ DCHECK(StorageMonitor::GetInstance());
+ StorageMonitor::GetInstance()->AddObserver(this);
// |preferences_| may be NULL in tests.
if (preferences_) {
@@ -107,8 +108,8 @@ MediaGalleriesPermissionController::MediaGalleriesPermissionController(
}
MediaGalleriesPermissionController::~MediaGalleriesPermissionController() {
- if (StorageMonitor::GetInstance())
- StorageMonitor::GetInstance()->RemoveObserver(this);
+ DCHECK(StorageMonitor::GetInstance());
+ StorageMonitor::GetInstance()->RemoveObserver(this);
// |preferences_| may be NULL in tests.
if (preferences_)
« no previous file with comments | « chrome/browser/media_galleries/media_file_system_registry_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698