Consolidate manifest handler registration.

chrome/common/extensions/manifest_handler.cc

Index: chrome/common/extensions/manifest_handler.cc
diff --git a/chrome/common/extensions/manifest_handler.cc b/chrome/common/extensions/manifest_handler.cc
index a97a7cddcd800f209736ace29e053503dec5c6f3..2072aa9aa9a65a30dfb9f1952605ecf22777eafb 100644
--- a/chrome/common/extensions/manifest_handler.cc
+++ b/chrome/common/extensions/manifest_handler.cc
@@ -6,6 +6,7 @@
 
 #include <map>
 
+#include "base/logging.h"
 #include "base/stl_util.h"
 #include "chrome/common/extensions/extension.h"
 
@@ -57,11 +58,6 @@ void ManifestHandler::Register() {
 }
 
 // static
-void ManifestHandler::ClearRegistryForTesting() {
-  GetRegistry()->ClearForTesting();
-}
-
-// static
 bool ManifestHandler::ParseExtension(Extension* extension, string16* error) {
   return GetRegistry()->ParseExtension(extension, error);
 }
@@ -133,12 +129,6 @@ bool ManifestHandlerRegistry::ValidateExtension(
   return true;
 }
 
-void ManifestHandlerRegistry::ClearForTesting() {
-  priority_map_.clear();
-  handlers_.clear();
-  is_sorted_ = false;
-}
-
 // static
 ManifestHandlerRegistry* ManifestHandlerRegistry::SetForTesting(
     ManifestHandlerRegistry* new_registry) {