Manifest handler for all keys background-related.

chrome/browser/extensions/image_loader_unittest.cc

Index: chrome/browser/extensions/image_loader_unittest.cc
diff --git a/chrome/browser/extensions/image_loader_unittest.cc b/chrome/browser/extensions/image_loader_unittest.cc
index 002c5bb686670c3c36012afe2dc9a9f9fd8a205b..fcb846ac0038ade26ce836911fb10957c8c0b4c8 100644
--- a/chrome/browser/extensions/image_loader_unittest.cc
+++ b/chrome/browser/extensions/image_loader_unittest.cc
@@ -13,7 +13,6 @@
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
-#include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/extensions/manifest.h"
 #include "chrome/common/extensions/manifest_handler.h"
@@ -100,14 +99,16 @@ class ImageLoaderTest : public testing::Test {
  private:
   virtual void SetUp() OVERRIDE {
     testing::Test::SetUp();
-    extensions::ManifestHandler::Register(
-        extension_manifest_keys::kIcons,
-        make_linked_ptr(new extensions::IconsHandler));
+    (new extensions::IconsHandler)->Register();
 
     file_thread_.Start();
     io_thread_.Start();
   }
 
+  virtual void TearDown() OVERRIDE {
+    extensions::ManifestHandler::ClearRegistryForTesting();
+  }
+
   int image_loaded_count_;
   bool quit_in_image_loaded_;
   MessageLoop ui_loop_;