Media Galleries API: Fix MediaGalleriesPreferences finders race.

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

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..f9bf055c1d43b842d3faf675c60f7f2357093d69 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));
@@ -101,7 +100,7 @@ class MediaGalleriesPlatformAppBrowserTest : public PlatformAppBrowserTest {
 
 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest,
                        MediaGalleriesNoAccess) {
-  EnsureMediaDirectoriesExists media_directories;
+  TestMediaDirectoriesOverrides media_directories;
   ASSERT_TRUE(RunPlatformAppTest("api_test/media_galleries/no_access"))
       << message_;
   RunSecondTestPhase(base::UTF8ToUTF16(base::StringPrintf(
@@ -109,21 +108,21 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest,
 }
 
 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest, NoGalleriesRead) {
-  EnsureMediaDirectoriesExists media_directories;
+  TestMediaDirectoriesOverrides media_directories;
   ASSERT_TRUE(RunPlatformAppTest("api_test/media_galleries/no_galleries"))
       << message_;
 }
 
 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest,
                        NoGalleriesCopyTo) {
-  EnsureMediaDirectoriesExists media_directories;
+  TestMediaDirectoriesOverrides media_directories;
   ASSERT_TRUE(RunPlatformAppTest(
       "api_test/media_galleries/no_galleries_copy_to")) << message_;
 }
 
 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest,
                        MediaGalleriesRead) {
-  EnsureMediaDirectoriesExists media_directories;
+  TestMediaDirectoriesOverrides media_directories;
   ASSERT_TRUE(RunPlatformAppTest("api_test/media_galleries/read_access"))
       << message_;
   RunSecondTestPhase(base::UTF8ToUTF16(base::StringPrintf(
@@ -132,7 +131,7 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest,
 
 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest,
                        MediaGalleriesCopyTo) {
-  EnsureMediaDirectoriesExists media_directories;
+  TestMediaDirectoriesOverrides media_directories;
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
   MakeFakeMediaGalleryForTest(browser()->profile(), temp_dir.path());
@@ -142,7 +141,7 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest,
 
 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest,
                        MediaGalleriesCopyToNoAccess) {
-  EnsureMediaDirectoriesExists media_directories;
+  TestMediaDirectoriesOverrides media_directories;
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
   MakeFakeMediaGalleryForTest(browser()->profile(), temp_dir.path());
@@ -153,7 +152,7 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest,
 
 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest,
                        MediaGalleriesAccessAttached) {
-  EnsureMediaDirectoriesExists media_directories;
+  TestMediaDirectoriesOverrides media_directories;
 
   AttachFakeDevice();
 
@@ -169,7 +168,7 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest,
 
 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest,
                        GetFilesystemMetadata) {
-  EnsureMediaDirectoriesExists media_directories;
+  TestMediaDirectoriesOverrides media_directories;
   ASSERT_TRUE(RunPlatformAppTest("api_test/media_galleries/metadata"))
       << message_;
 }