Require explicit selection of traits for LazyInstance

extensions/common/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 "extensions/common/manifest_handler.h"
 
 #include <stddef.h>
 
 #include <map>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/permissions/manifest_permission.h"
 #include "extensions/common/permissions/manifest_permission_set.h"
 
 namespace extensions {
 
 namespace {
 
-static base::LazyInstance<ManifestHandlerRegistry> g_registry =
-    LAZY_INSTANCE_INITIALIZER;
+static base::LazyInstance<ManifestHandlerRegistry>::DestructorAtExit
+    g_registry = LAZY_INSTANCE_INITIALIZER;
 static ManifestHandlerRegistry* g_registry_override = NULL;
 
 ManifestHandlerRegistry* GetRegistry() {
   if (!g_registry_override)
     return g_registry.Pointer();
   return g_registry_override;
 }
 
 }  // namespace
 
@@ skipping 210 matching lines @@
     unsorted_handlers.swap(next_unsorted_handlers);
   }
 
   // If there are any leftover unsorted handlers, they must have had
   // circular dependencies.
   CHECK_EQ(unsorted_handlers.size(), std::set<ManifestHandler*>::size_type(0))
       << "Extension manifest handlers have circular dependencies!";
 }
 
 }  // namespace extensions