chrome/browser/extensions/api/media_galleries/media_galleries_apitest.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/media_galleries_apitest.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 | « no previous file | chrome/browser/extensions/api/media_galleries_private/gallery_watch_state_tracker.cc » ('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/media_galleries_apitest.cc

diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc b/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc

index 8d8b3413fba9a265e8a31279b0a0d74c2a48a640..9eb5929c8fb265b1a6d69c744cc930ec5f206e3b 100644

--- a/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc

+++ b/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc

@@ -44,11 +44,10 @@ const char kTestGalleries[] = "testGalleries(%d)";

// testing platforms with no default media galleries, such as CHROMEOS.

void MakeFakeMediaGalleryForTest(Profile* profile, const base::FilePath& path) {

base::RunLoop runloop;

- StorageMonitor::GetInstance()->EnsureInitialized(runloop.QuitClosure());

- runloop.Run();

MediaGalleriesPreferences* preferences =

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

+ preferences->EnsureInitialized(runloop.QuitClosure());

+ runloop.Run();

MediaGalleryPrefInfo gallery_info;

ASSERT_FALSE(preferences->LookUpGalleryByPath(path, &gallery_info));