Index: chrome/browser/media_galleries/media_file_system_registry_unittest.cc |
diff --git a/chrome/browser/media_galleries/media_file_system_registry_unittest.cc b/chrome/browser/media_galleries/media_file_system_registry_unittest.cc |
index 2bbe23de1ef0023028d5acb9d176fa2b3ec899d7..ec08062b946a17112f3ff6f953d37ef38150a4ec 100644 |
--- a/chrome/browser/media_galleries/media_file_system_registry_unittest.cc |
+++ b/chrome/browser/media_galleries/media_file_system_registry_unittest.cc |
@@ -31,7 +31,9 @@ |
#include "chrome/browser/storage_monitor/removable_device_constants.h" |
#include "chrome/browser/storage_monitor/storage_monitor.h" |
#include "chrome/browser/storage_monitor/test_storage_monitor.h" |
+#include "chrome/common/extensions/background_info.h" |
#include "chrome/common/extensions/extension.h" |
+#include "chrome/common/extensions/manifest_handler.h" |
#include "chrome/test/base/chrome_render_view_host_test_harness.h" |
#include "chrome/test/base/testing_browser_process.h" |
#include "chrome/test/base/testing_profile.h" |
@@ -789,6 +791,7 @@ void MediaFileSystemRegistryTest::SetUp() { |
TestMediaStorageUtil::SetTestingMode(); |
test_file_system_context_ = new TestMediaFileSystemContext( |
g_browser_process->media_file_system_registry()); |
+ (new extensions::BackgroundManifestHandler)->Register(); |
ASSERT_TRUE(galleries_dir_.CreateUniqueTempDir()); |
empty_dir_ = galleries_dir_.path().AppendASCII("empty"); |
@@ -806,6 +809,7 @@ void MediaFileSystemRegistryTest::TearDown() { |
EXPECT_EQ(0U, registry->GetExtensionGalleriesHostCountForTests()); |
BrowserThread::GetBlockingPool()->FlushForTesting(); |
MessageLoop::current()->RunUntilIdle(); |
+ extensions::ManifestHandler::ClearRegistryForTesting(); |
} |
/////////// |