Manifest handler for all keys background-related.

chrome/browser/themes/browser_theme_pack_unittest.cc

Index: chrome/browser/themes/browser_theme_pack_unittest.cc
diff --git a/chrome/browser/themes/browser_theme_pack_unittest.cc b/chrome/browser/themes/browser_theme_pack_unittest.cc
index 3c1df2a8574903e03bbcb11525376dd42de07da1..07c3eb39e2e84c6d2d9e9b150f52463266908d05 100644
--- a/chrome/browser/themes/browser_theme_pack_unittest.cc
+++ b/chrome/browser/themes/browser_theme_pack_unittest.cc
@@ -14,7 +14,6 @@
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/api/themes/theme_handler.h"
-#include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/manifest_handler.h"
 #include "content/public/test/test_browser_thread.h"
 #include "grit/theme_resources.h"
@@ -35,9 +34,11 @@ class BrowserThemePackTest : public ::testing::Test {
 
   virtual void SetUp() OVERRIDE {
     testing::Test::SetUp();
-    extensions::ManifestHandler::Register(
-        extension_manifest_keys::kTheme,
-        make_linked_ptr(new extensions::ThemeHandler));
+    (new extensions::ThemeHandler)->Register();
+  }
+
+  virtual void TearDown() OVERRIDE {
+    extensions::ManifestHandler::ClearRegistryForTesting();
   }
 
   // Transformation for link underline colors.