chrome/browser/media_galleries/media_galleries_preferences_unittest.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/media_galleries/media_galleries_preferences_unittest.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

« chrome/browser/media_galleries/media_galleries_preferences.cc ('K') | « chrome/browser/media_galleries/media_galleries_preferences.cc ('k') | chrome/browser/storage_monitor/storage_monitor.h » ('j') | chrome/browser/ui/webui/options/media_galleries_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media_galleries/media_galleries_preferences_unittest.cc

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

index 0d25707f4a47ec892f2450d79070272705e7637e..6f172f5a121199bed205f9ba4d9fabbee9af5269 100644

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

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

@@ -9,6 +9,7 @@

#include "base/command_line.h"

#include "base/memory/ref_counted.h"

#include "base/memory/scoped_ptr.h"

+#include "base/run_loop.h"

#include "base/strings/utf_string_conversions.h"

#include "base/values.h"

#include "chrome/browser/extensions/extension_system.h"

@@ -110,6 +111,9 @@ class MediaGalleriesPreferencesTest : public testing::Test {

CommandLine::ForCurrentProcess(), base::FilePath(), false);

gallery_prefs_.reset(new MediaGalleriesPreferences(profile_.get()));

+ base::RunLoop loop;

+ gallery_prefs_->EnsureInitialized(loop.QuitClosure());

+ loop.Run();

// Load the default galleries into the expectations.

const MediaGalleriesPrefInfoMap& known_galleries =