Consolidate manifest handler registration.

chrome/common/extensions/manifest_handler.h

 // 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.
 
 #ifndef CHROME_COMMON_EXTENSIONS_MANIFEST_HANDLER_H_
 #define CHROME_COMMON_EXTENSIONS_MANIFEST_HANDLER_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 57 matching lines @@
 
   // Call Parse on all registered manifest handlers that should parse
   // this extension.
   static bool ParseExtension(Extension* extension, string16* error);
 
   // Call Validate on all registered manifest handlers for this extension.
   static bool ValidateExtension(const Extension* extension,
                                 std::string* error,
                                 std::vector<InstallWarning>* warnings);
 
-  // Reset the manifest handler registry to an empty state. Useful for
-  // unit tests.
-  static void ClearRegistryForTesting();
-
  protected:
   // A convenience method for handlers that only register for 1 key,
   // so that they can define keys() { return SingleKey(kKey); }
   static const std::vector<std::string> SingleKey(const std::string& key);
 
  private:
   // The keys to register us for (in Register).
   virtual const std::vector<std::string> Keys() const = 0;
 };
 
 // The global registry for manifest handlers.
 class ManifestHandlerRegistry {
  private:
   friend class ManifestHandler;
   friend class ScopedTestingManifestHandlerRegistry;
   friend struct base::DefaultLazyInstanceTraits<ManifestHandlerRegistry>;
 
   ManifestHandlerRegistry();
   ~ManifestHandlerRegistry();
 
   void RegisterManifestHandler(const std::string& key,
                                linked_ptr<ManifestHandler> handler);
   bool ParseExtension(Extension* extension, string16* error);
   bool ValidateExtension(const Extension* extension,
                          std::string* error,
                          std::vector<InstallWarning>* warnings);
 
-  void ClearForTesting();
   // Overrides the current global ManifestHandlerRegistry with
   // |registry|, returning the current one.
   static ManifestHandlerRegistry* SetForTesting(
       ManifestHandlerRegistry* new_registry);
 
   typedef std::map<std::string, linked_ptr<ManifestHandler> >
       ManifestHandlerMap;
   typedef std::map<ManifestHandler*, int> ManifestHandlerPriorityMap;
 
   // Puts the manifest handlers in order such that each handler comes after
   // any handlers for their PrerequisiteKeys. If there is no handler for
   // a prerequisite key, that dependency is simply ignored.
   // CHECKs that there are no manifest handlers with circular dependencies.
   void SortManifestHandlers();
 
   // All registered manifest handlers.
   ManifestHandlerMap handlers_;
 
   // The priority for each manifest handler. Handlers with lower priority
   // values are evaluated first.
   ManifestHandlerPriorityMap priority_map_;
   bool is_sorted_;
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_COMMON_EXTENSIONS_MANIFEST_HANDLER_H_