chrome/browser/media_galleries/media_file_system_registry.cc - Issue 14556015: [Media Galleries] Lazily initialize the storage monitor.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 14556015: [Media Galleries] Lazily initialize the storage monitor. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Harden async boundary in WebUI Created 7 years, 7 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:

Index: chrome/browser/media_galleries/media_file_system_registry.cc

diff --git a/chrome/browser/media_galleries/media_file_system_registry.cc b/chrome/browser/media_galleries/media_file_system_registry.cc

index 88c3752ae5d316cc9e23e7577ac965b23e2babde..31a729600344a3a37d2880da6c8a57ba64aaed20 100644

--- a/chrome/browser/media_galleries/media_file_system_registry.cc

+++ b/chrome/browser/media_galleries/media_file_system_registry.cc

@@ -471,8 +471,7 @@ MediaGalleriesPreferences* MediaFileSystemRegistry::GetPreferences(

// TODO(gbillock): Move this stanza to MediaGalleriesPreferences init code.

// StorageMonitor may be NULL in unit tests.

StorageMonitor* monitor = StorageMonitor::GetInstance();

- if (!monitor)

- return preferences;

+ DCHECK(monitor->IsInitialized());

std::vector<StorageInfo> existing_devices = monitor->GetAttachedStorage();

for (size_t i = 0; i < existing_devices.size(); i++) {

if (!StorageInfo::IsMediaDevice(existing_devices[i].device_id()))