Require explicit selection of traits for LazyInstance

extensions/common/message_bundle.cc

 // Copyright 2014 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/message_bundle.h"
 
 #include <memory>
 #include <string>
 #include <vector>
 
@@ skipping 300 matching lines @@
 
 // Unique class for Singleton.
 struct ExtensionToMessagesMap {
   ExtensionToMessagesMap();
   ~ExtensionToMessagesMap();
 
   // Maps extension ID to message map.
   ExtensionToL10nMessagesMap messages_map;
 };
 
-static base::LazyInstance<ExtensionToMessagesMap> g_extension_to_messages_map =
-    LAZY_INSTANCE_INITIALIZER;
+static base::LazyInstance<ExtensionToMessagesMap>::DestructorAtExit
+    g_extension_to_messages_map = LAZY_INSTANCE_INITIALIZER;
 
 ExtensionToMessagesMap::ExtensionToMessagesMap() {}
 
 ExtensionToMessagesMap::~ExtensionToMessagesMap() {}
 
 ExtensionToL10nMessagesMap* GetExtensionToL10nMessagesMap() {
   return &g_extension_to_messages_map.Get().messages_map;
 }
 
 L10nMessagesMap* GetL10nMessagesMap(const std::string& extension_id) {
   ExtensionToL10nMessagesMap::iterator it =
       g_extension_to_messages_map.Get().messages_map.find(extension_id);
   if (it != g_extension_to_messages_map.Get().messages_map.end())
     return &(it->second);
 
   return NULL;
 }
 
 void EraseL10nMessagesMap(const std::string& extension_id) {
   g_extension_to_messages_map.Get().messages_map.erase(extension_id);
 }
 
 }  // namespace extensions