Require explicit selection of traits for LazyInstance

extensions/common/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 EXTENSIONS_COMMON_MANIFEST_HANDLER_H_
 #define EXTENSIONS_COMMON_MANIFEST_HANDLER_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 105 matching lines @@
  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>;
+  friend struct base::LazyInstanceTraitsBase<ManifestHandlerRegistry>;
 
   ManifestHandlerRegistry();
   ~ManifestHandlerRegistry();
 
   void Finalize();
 
   void RegisterManifestHandler(const std::string& key,
                                linked_ptr<ManifestHandler> handler);
   bool ParseExtension(Extension* extension, base::string16* error);
   bool ValidateExtension(const Extension* extension,
@@ skipping 27 matching lines @@
   // The priority for each manifest handler. Handlers with lower priority
   // values are evaluated first.
   ManifestHandlerPriorityMap priority_map_;
 
   bool is_finalized_;
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_COMMON_MANIFEST_HANDLER_H_