Media Galleries API: Fix MediaGalleriesPreferences finders race.

chrome/browser/media_galleries/media_file_system_registry_unittest.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.
 
 // MediaFileSystemRegistry unit tests.
 
 #include <algorithm>
 #include <set>
 
 #include "base/bind_helpers.h"
@@ skipping 338 matching lines @@
     return media_directories_.num_galleries();
   }
 
  protected:
   virtual void SetUp() OVERRIDE;
   virtual void TearDown() OVERRIDE;
 
  private:
   // This makes sure that at least one default gallery exists on the file
   // system.
-  EnsureMediaDirectoriesExists media_directories_;
+  TestMediaDirectoriesOverrides media_directories_;
 
   // Some test gallery directories.
   base::ScopedTempDir galleries_dir_;
   // An empty directory in |galleries_dir_|
   base::FilePath empty_dir_;
   // A directory in |galleries_dir_| with a DCIM directory in it.
   base::FilePath dcim_dir_;
 
   // MediaFileSystemRegistry owns this.
   TestMediaFileSystemContext* test_file_system_context_;
@@ skipping 95 matching lines @@
   // delete everything that references the profile.
   single_web_contents_.reset();
   shared_web_contents1_.reset();
   shared_web_contents2_.reset();
   profile_.reset();
 
   base::MessageLoop::current()->RunUntilIdle();
 }
 
 MediaGalleriesPreferences* ProfileState::GetMediaGalleriesPrefs() {
-  return MediaGalleriesPreferencesFactory::GetForProfile(profile_.get());
+  MediaGalleriesPreferences* prefs =
+      MediaGalleriesPreferencesFactory::GetForProfile(profile_.get());
+  base::RunLoop loop;
+  prefs->EnsureInitialized(loop.QuitClosure());
+  loop.Run();
+  return prefs;
 }
 
 void ProfileState::CheckGalleries(
     const std::string& test,
     const std::vector<MediaFileSystemInfo>& regular_extension_galleries,
     const std::vector<MediaFileSystemInfo>& all_extension_galleries) {
   content::RenderViewHost* rvh = single_web_contents_->GetRenderViewHost();
   MediaFileSystemRegistry* registry =
       g_browser_process->media_file_system_registry();
 
@@ skipping 106 matching lines @@
     profile_states_.push_back(state);
   }
 }
 
 ProfileState* MediaFileSystemRegistryTest::GetProfileState(size_t i) {
   return profile_states_[i];
 }
 
 MediaGalleriesPreferences* MediaFileSystemRegistryTest::GetPreferences(
     Profile* profile) {
-  return registry()->GetPreferences(profile);
+  MediaGalleriesPreferences* prefs = registry()->GetPreferences(profile);
+  base::RunLoop loop;
+  prefs->EnsureInitialized(loop.QuitClosure());
+  loop.Run();
+  return prefs;
 }
 
 std::string MediaFileSystemRegistryTest::AddUserGallery(
     StorageInfo::Type type,
     const std::string& unique_id,
     const base::FilePath& path) {
   std::string device_id = StorageInfo::MakeDeviceId(type, unique_id);
   DCHECK(!StorageInfo::IsMediaDevice(device_id));
 
   for (size_t i = 0; i < profile_states_.size(); ++i) {
@@ skipping 408 matching lines @@
     ASSERT_TRUE(PathService::Get(chrome::DIR_USER_PICTURES, &path));
     profile_state->AddNameForAllCompare(path.BaseName().LossyDisplayName());
     ASSERT_TRUE(PathService::Get(chrome::DIR_USER_VIDEOS, &path));
     profile_state->AddNameForAllCompare(path.BaseName().LossyDisplayName());
 
     profile_state->CheckGalleries("names-dir", one_expectation, auto_galleries);
   } else {
     profile_state->CheckGalleries("names", one_expectation, one_expectation);
   }
 }