Media Galleries API: Fix MediaGalleriesPreferences finders race.

chrome/browser/media_galleries/media_galleries_permissions_unittest.cc

 // Copyright 2013 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/memory/scoped_ptr.h"
+#include "base/run_loop.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_prefs_unittest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/media_galleries/media_galleries_preferences.h"
+#include "chrome/browser/media_galleries/media_galleries_test_util.h"
 #include "chrome/browser/storage_monitor/test_storage_monitor.h"
 #include "chrome/test/base/testing_profile.h"
+#include "content/public/browser/browser_thread.h"
+#include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 void AddGalleryPermission(MediaGalleryPrefId gallery,
                           bool has_access,
                           std::vector<MediaGalleryPermission>* vector) {
   MediaGalleryPermission permission;
   permission.pref_id = gallery;
   permission.has_permission = has_access;
   vector->push_back(permission);
 }
 
 }  // namespace
 
 // Test the MediaGalleries permissions functions.
 class MediaGalleriesPermissionsTest : public extensions::ExtensionPrefsTest {
  protected:
-  MediaGalleriesPermissionsTest() {}
+  MediaGalleriesPermissionsTest()
+      : file_thread_(content::BrowserThread::FILE) {
+  }
   virtual ~MediaGalleriesPermissionsTest() {}
 
   // This is the same implementation as ExtensionPrefsTest::TearDown(), except
   // for also resetting the ExtensionPrefs used by |gallery_prefs_| after
   // TestExtensionPrefs reconstructs them.
   virtual void TearDown() OVERRIDE {
     Verify();
 
     // Reset ExtensionPrefs, and re-verify.
     prefs_.ResetPrefRegistry();
     RegisterPreferences(prefs_.pref_registry().get());
     prefs_.RecreateExtensionPrefs();
     gallery_prefs_->SetExtensionPrefsForTesting(prefs());
     Verify();
     prefs_.pref_service()->CommitPendingWrite();
     message_loop_.RunUntilIdle();
 
     TestStorageMonitor::RemoveSingleton();
 
     testing::Test::TearDown();
   }
 
   virtual void Initialize() OVERRIDE {
+    file_thread_.Start();
+
     ASSERT_TRUE(TestStorageMonitor::CreateAndInstall());
     profile_.reset(new TestingProfile);
     gallery_prefs_.reset(new MediaGalleriesPreferences(profile_.get()));
+    base::RunLoop loop;
+    gallery_prefs_->EnsureInitialized(loop.QuitClosure());
+    loop.Run();
+
     gallery_prefs_->SetExtensionPrefsForTesting(prefs());
 
     extension1_id_ = prefs_.AddExtensionAndReturnId("test1");
     extension2_id_ = prefs_.AddExtensionAndReturnId("test2");
     extension3_id_ = prefs_.AddExtensionAndReturnId("test3");
     // Id4 isn't used to ensure that an empty permission list is ok.
     extension4_id_ = prefs_.AddExtensionAndReturnId("test4");
     Verify();
 
     gallery_prefs_->SetGalleryPermissionInPrefs(extension1_id_, 1, false);
@@ skipping 59 matching lines @@
   std::string extension1_id_;
   std::string extension2_id_;
   std::string extension3_id_;
   std::string extension4_id_;
 
   std::vector<MediaGalleryPermission> extension1_expectation_;
   std::vector<MediaGalleryPermission> extension2_expectation_;
   std::vector<MediaGalleryPermission> extension3_expectation_;
   std::vector<MediaGalleryPermission> extension4_expectation_;
 
+  // Needed for |gallery_prefs_| to initialize correctly.
+  TestMediaDirectoriesOverrides ensure_media_directories_exists_;
+  content::TestBrowserThread file_thread_;

[Lei Zhang, 2013/09/21 00:12:35]

ajwong said to "Use TestBrowserThreadBundle" instead.

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

I tried it. Because the base class already spawns a UI thread, the bundle
doesn't (easily) work.

+
   scoped_ptr<TestingProfile> profile_;
   scoped_ptr<MediaGalleriesPreferences> gallery_prefs_;
 };
 
 TEST_F(MediaGalleriesPermissionsTest, MediaGalleries) {}