diff options
Diffstat (limited to 'chrome/browser/extensions/extension_service_unittest.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_service_unittest.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc index 914271b..17160bf 100644 --- a/chrome/browser/extensions/extension_service_unittest.cc +++ b/chrome/browser/extensions/extension_service_unittest.cc @@ -8,6 +8,7 @@ #include <set> #include <vector> +#include "base/at_exit.h" #include "base/basictypes.h" #include "base/bind.h" #include "base/command_line.h" @@ -60,6 +61,7 @@ #include "content/browser/file_system/browser_file_system_helper.h" #include "content/browser/in_process_webkit/dom_storage_context.h" #include "content/browser/in_process_webkit/webkit_context.h" +#include "content/browser/plugin_service.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" #include "content/test/test_browser_thread.h" @@ -982,6 +984,9 @@ void PackExtensionTestClient::OnPackFailure(const std::string& error_message) { // Test loading good extensions from the profile directory. TEST_F(ExtensionServiceTest, LoadAllExtensionsFromDirectorySuccess) { + base::ShadowingAtExitManager at_exit_manager; + PluginService::GetInstance()->Init(); + // Initialize the test dir with a good Preferences/extensions. FilePath source_install_dir = data_dir_ .AppendASCII("good") @@ -1119,6 +1124,9 @@ TEST_F(ExtensionServiceTest, LoadAllExtensionsFromDirectoryFail) { // Test that partially deleted extensions are cleaned up during startup // Test loading bad extensions from the profile directory. TEST_F(ExtensionServiceTest, CleanupOnStartup) { + base::ShadowingAtExitManager at_exit_manager; + PluginService::GetInstance()->Init(); + FilePath source_install_dir = data_dir_ .AppendASCII("good") .AppendASCII("Extensions"); @@ -1452,6 +1460,9 @@ TEST_F(ExtensionServiceTest, GrantedPermissions) { // an extension contains an NPAPI plugin. Don't run this test on Chrome OS // since they don't support plugins. TEST_F(ExtensionServiceTest, GrantedFullAccessPermissions) { + base::ShadowingAtExitManager at_exit_manager; + PluginService::GetInstance()->Init(); + InitializeEmptyExtensionService(); FilePath path = data_dir_ |