Require explicit selection of traits for LazyInstance

ui/base/l10n/l10n_util_mac.mm

 // Copyright (c) 2012 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.
 
 #import <Foundation/Foundation.h>
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/mac/bundle_locations.h"
 #include "base/strings/sys_string_conversions.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
 namespace {
 
-base::LazyInstance<std::string> g_overridden_locale = LAZY_INSTANCE_INITIALIZER;
+base::LazyInstance<std::string>::DestructorAtExit g_overridden_locale =
+    LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 namespace l10n_util {
 
 const std::string& GetLocaleOverride() {
   return g_overridden_locale.Get();
 }
 
 void OverrideLocaleWithCocoaLocale() {
@@ skipping 130 matching lines @@
   return FixUpWindowsStyleLabel(l10n_util::GetStringFUTF16(message_id,
                                                            a, b, c, d));
 }
 
 NSString* GetPluralNSStringF(int message_id, int number) {
   return base::SysUTF16ToNSString(l10n_util::GetPluralStringFUTF16(message_id,
                                                                    number));
 }
 
 }  // namespace l10n_util