Media Galleries API: Fix MediaGalleriesPreferences finders race.

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 26 matching lines @@
 #endif
 
 const char kTestGalleries[] = "testGalleries(%d)";
 
 }  // namespace
 
 // This function is to ensure at least one (fake) media gallery exists for
 // 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));
   preferences->AddGallery(gallery_info.device_id,
                           gallery_info.path,
                           false /* user_added */,
                           gallery_info.volume_label,
                           gallery_info.vendor_name,
                           gallery_info.model_name,
                           gallery_info.total_size_in_bytes,
@@ skipping 32 matching lines @@
     StorageMonitor::GetInstance()->receiver()->ProcessDetach(device_id_);
     content::RunAllPendingInMessageLoop();
   }
 
  private:
   std::string device_id_;
 };
 
 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(
       kTestGalleries, media_directories.num_galleries())));
 }
 
 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(
       kTestGalleries, media_directories.num_galleries())));
 }
 
 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());
   ASSERT_TRUE(RunPlatformAppTest("api_test/media_galleries/copy_to_access"))
       << message_;
 }
 
 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());
   ASSERT_TRUE(RunPlatformAppTest(
       "api_test/media_galleries/copy_to_access/no_access"))
       << message_;
 }
 
 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest,
                        MediaGalleriesAccessAttached) {
-  EnsureMediaDirectoriesExists media_directories;
+  TestMediaDirectoriesOverrides media_directories;
 
   AttachFakeDevice();
 
   ASSERT_TRUE(RunPlatformAppTest("api_test/media_galleries/access_attached"))
       << message_;
 
   RunSecondTestPhase(ASCIIToUTF16(base::StringPrintf(
       "testGalleries(%d, \"%s\")",
       media_directories.num_galleries() + 1, kDeviceName)));
 
   DetachFakeDevice();
 }
 
 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest,
                        GetFilesystemMetadata) {
-  EnsureMediaDirectoriesExists media_directories;
+  TestMediaDirectoriesOverrides media_directories;
   ASSERT_TRUE(RunPlatformAppTest("api_test/media_galleries/metadata"))
       << message_;
 }