chrome/browser/extensions/api/media_galleries_private/gallery_watch_state_tracker.cc - Issue 24269007: Media Galleries API: Fix MediaGalleriesPreferences finders race.

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/extensions/api/media_galleries_private/gallery_watch_state_tracker.cc

Issue 24269007: Media Galleries API: Fix MediaGalleriesPreferences finders race. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 3 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/extensions/api/media_galleries/media_galleries_apitest.cc ('k') | chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.h » ('j') | chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/media_galleries_private/gallery_watch_state_tracker.cc

diff --git a/chrome/browser/extensions/api/media_galleries_private/gallery_watch_state_tracker.cc b/chrome/browser/extensions/api/media_galleries_private/gallery_watch_state_tracker.cc

index e62718e48757d82d757120f6dcdde505bd039f38..d60718fbbe0210b17f923c54b2e573e2f87f2087 100644

--- a/chrome/browser/extensions/api/media_galleries_private/gallery_watch_state_tracker.cc

+++ b/chrome/browser/extensions/api/media_galleries_private/gallery_watch_state_tracker.cc

@@ -82,16 +82,16 @@ GalleryWatchStateTracker::GalleryWatchStateTracker(Profile* profile)

registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,

content::Source<Profile>(profile_));

MediaGalleriesPreferences* preferences =

- g_browser_process->media_file_system_registry()->GetPreferences(

- profile);

+ g_browser_process->media_file_system_registry()->GetPreferences(profile);

+ DCHECK(preferences->IsInitialized());

preferences->AddGalleryChangeObserver(this);

}

GalleryWatchStateTracker::~GalleryWatchStateTracker() {

DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));

MediaGalleriesPreferences* preferences =

- g_browser_process->media_file_system_registry()->GetPreferences(

- profile_);

+ g_browser_process->media_file_system_registry()->GetPreferences(profile_);

+ DCHECK(preferences->IsInitialized());

preferences->RemoveGalleryChangeObserver(this);

}

@@ -260,6 +260,7 @@ void GalleryWatchStateTracker::ReadFromStorage(

DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));

MediaGalleriesPreferences* preferences =

g_browser_process->media_file_system_registry()->GetPreferences(profile_);

+ DCHECK(preferences->IsInitialized());

base::ListValue* list = NULL;

if (!value.get() || !value->GetAsList(&list))

return;