Consolidate manifest handler registration.

chrome/common/extensions/manifest_handler.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/extensions/manifest_handler.h"
 
 #include <map>
 
+#include "base/logging.h"
 #include "base/stl_util.h"
 #include "chrome/common/extensions/extension.h"
 
 namespace extensions {
 
 namespace {
 
 static base::LazyInstance<ManifestHandlerRegistry> g_registry =
     LAZY_INSTANCE_INITIALIZER;
 static ManifestHandlerRegistry* g_registry_override = NULL;
@@ skipping 31 matching lines @@
 }
 
 void ManifestHandler::Register() {
   linked_ptr<ManifestHandler> this_linked(this);
   const std::vector<std::string> keys = Keys();
   for (size_t i = 0; i < keys.size(); ++i)
     GetRegistry()->RegisterManifestHandler(keys[i], this_linked);
 }
 
 // static
-void ManifestHandler::ClearRegistryForTesting() {
-  GetRegistry()->ClearForTesting();
-}
-
-// static
 bool ManifestHandler::ParseExtension(Extension* extension, string16* error) {
   return GetRegistry()->ParseExtension(extension, error);
 }
 
 // static
 bool ManifestHandler::ValidateExtension(const Extension* extension,
                                         std::string* error,
                                         std::vector<InstallWarning>* warnings) {
   return GetRegistry()->ValidateExtension(extension, error, warnings);
 }
@@ skipping 51 matching lines @@
     }
   }
   for (std::set<ManifestHandler*>::iterator iter = handlers.begin();
        iter != handlers.end(); ++iter) {
     if (!(*iter)->Validate(extension, error, warnings))
       return false;
   }
   return true;
 }
 
-void ManifestHandlerRegistry::ClearForTesting() {
-  priority_map_.clear();
-  handlers_.clear();
-  is_sorted_ = false;
-}
-
 // static
 ManifestHandlerRegistry* ManifestHandlerRegistry::SetForTesting(
     ManifestHandlerRegistry* new_registry) {
   ManifestHandlerRegistry* old_registry = GetRegistry();
   if (new_registry != g_registry.Pointer())
     g_registry_override = new_registry;
   else
     g_registry_override = NULL;
   return old_registry;
 }
@@ skipping 46 matching lines @@
 
   // If there are any leftover unsorted handlers, they must have had
   // circular dependencies.
   CHECK(unsorted_handlers.size() == 0) << "Extension manifest handlers have "
                                        << "circular dependencies!";
 
   is_sorted_ = true;
 }
 
 }  // namespace extensions