Manifest handler for all keys background-related.

chrome/common/extensions/extension_file_util_unittest.cc

Index: chrome/common/extensions/extension_file_util_unittest.cc
diff --git a/chrome/common/extensions/extension_file_util_unittest.cc b/chrome/common/extensions/extension_file_util_unittest.cc
index 0d5da85959d4349640de629cc713b2d0997ce276..96773f01a262ca3e2840ef032ab076bf38281a43 100644
--- a/chrome/common/extensions/extension_file_util_unittest.cc
+++ b/chrome/common/extensions/extension_file_util_unittest.cc
@@ -15,6 +15,7 @@
 #include "chrome/common/extensions/api/extension_action/page_action_handler.h"
 #include "chrome/common/extensions/api/i18n/default_locale_handler.h"
 #include "chrome/common/extensions/api/icons/icons_handler.h"
+#include "chrome/common/extensions/background_info.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/manifest.h"
@@ -33,21 +34,15 @@ class ExtensionFileUtilTest : public testing::Test {
  protected:
   virtual void SetUp() OVERRIDE {
     testing::Test::SetUp();
-    extensions::ManifestHandler::Register(
-        extension_manifest_keys::kIcons,
-        make_linked_ptr(new extensions::IconsHandler));
-    extensions::ManifestHandler::Register(
-        keys::kBrowserAction,
-        make_linked_ptr(new extensions::BrowserActionHandler));
-    linked_ptr<extensions::PageActionHandler> page_action_handler(
-        new extensions::PageActionHandler);
-    extensions::ManifestHandler::Register(keys::kPageAction,
-                                          page_action_handler);
-    extensions::ManifestHandler::Register(keys::kPageActions,
-                                          page_action_handler);
-    extensions::ManifestHandler::Register(
-        keys::kDefaultLocale,
-        make_linked_ptr(new extensions::DefaultLocaleHandler));
+    (new extensions::BackgroundManifestHandler)->Register();
+    (new extensions::BrowserActionHandler)->Register();
+    (new extensions::DefaultLocaleHandler)->Register();
+    (new extensions::IconsHandler)->Register();
+    (new extensions::PageActionHandler)->Register();
+  }
+
+  virtual void TearDown() OVERRIDE {
+    extensions::ManifestHandler::ClearRegistryForTesting();
   }
 };