Media Galleries API: Fix MediaGalleriesPreferences finders race.

chrome/browser/media_galleries/media_galleries_test_util.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 "chrome/browser/media_galleries/media_galleries_test_util.h"
 
 #include "base/base_paths.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
@@ skipping 49 matching lines @@
       extensions::Blacklist::NOT_BLACKLISTED,
       syncer::StringOrdinal::CreateInitialOrdinal());
   ExtensionService* extension_service =
       extensions::ExtensionSystem::Get(profile)->extension_service();
   extension_service->AddExtension(extension.get());
   extension_service->EnableExtension(extension->id());
 
   return extension;
 }
 
-EnsureMediaDirectoriesExists::EnsureMediaDirectoriesExists()
+TestMediaDirectoriesOverrides::TestMediaDirectoriesOverrides()
     : num_galleries_(0) {
   Init();
 }
 
-EnsureMediaDirectoriesExists::~EnsureMediaDirectoriesExists() {
+TestMediaDirectoriesOverrides::~TestMediaDirectoriesOverrides() {
 }
 
-void EnsureMediaDirectoriesExists::Init() {
+void TestMediaDirectoriesOverrides::Init() {
 #if defined(OS_CHROMEOS) || defined(OS_ANDROID)
   return;
 #else
 
   ASSERT_TRUE(fake_dir_.CreateUniqueTempDir());
 
 #if defined(OS_WIN) || defined(OS_MACOSX)
   // This is to make sure the tests don't think iTunes is installed (unless
   // we control it specifically).
   appdir_override_.reset(new base::ScopedPathOverride(
       base::DIR_APP_DATA, fake_dir_.path().AppendASCII("itunes")));
 #endif
 
   music_override_.reset(new base::ScopedPathOverride(
     chrome::DIR_USER_MUSIC, fake_dir_.path().AppendASCII("music")));
   pictures_override_.reset(new base::ScopedPathOverride(
     chrome::DIR_USER_PICTURES, fake_dir_.path().AppendASCII("pictures")));
   video_override_.reset(new base::ScopedPathOverride(
     chrome::DIR_USER_VIDEOS, fake_dir_.path().AppendASCII("videos")));
   num_galleries_ = 3;
 #endif
 }