Media Galleries API: Fix MediaGalleriesPreferences finders race.

chrome/browser/media_galleries/media_galleries_test_util.h

 // 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.
 
 #ifndef CHROME_BROWSER_MEDIA_GALLERIES_MEDIA_GALLERIES_TEST_UTIL_H_
 #define CHROME_BROWSER_MEDIA_GALLERIES_MEDIA_GALLERIES_TEST_UTIL_H_
 
 #include "base/basictypes.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/test/scoped_path_override.h"
 
 namespace extensions {
 class Extension;
 }
 
 class Profile;
 
 scoped_refptr<extensions::Extension> AddMediaGalleriesApp(
     const std::string& name,
     const std::vector<std::string>& media_galleries_permissions,
     Profile* profile);
 
-class EnsureMediaDirectoriesExists {
+class TestMediaDirectoriesOverrides {

[Lei Zhang, 2013/09/20 23:55:28]

Is this needed in this CL?

[tommycli, 2013/09/23 20:39:12]

Done. I took it out.

  public:
-  EnsureMediaDirectoriesExists();
-  ~EnsureMediaDirectoriesExists();
+  TestMediaDirectoriesOverrides();
+  ~TestMediaDirectoriesOverrides();
 
   int num_galleries() const { return num_galleries_; }
 
  private:
   void Init();
 
   base::ScopedTempDir fake_dir_;
 
   int num_galleries_;
 
   scoped_ptr<base::ScopedPathOverride> appdir_override_;
   scoped_ptr<base::ScopedPathOverride> music_override_;
   scoped_ptr<base::ScopedPathOverride> pictures_override_;
   scoped_ptr<base::ScopedPathOverride> video_override_;
 
-  DISALLOW_COPY_AND_ASSIGN(EnsureMediaDirectoriesExists);
+  DISALLOW_COPY_AND_ASSIGN(TestMediaDirectoriesOverrides);
 };
 
 #endif  // CHROME_BROWSER_MEDIA_GALLERIES_MEDIA_GALLERIES_TEST_UTIL_H_