Require explicit selection of traits for LazyInstance

ui/base/l10n/l10n_util_win.cc

 // Copyright (c) 2011 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 "ui/base/l10n/l10n_util_win.h"
 
 #include <windowsx.h>
 #include <algorithm>
 #include <iterator>
 
@@ skipping 58 matching lines @@
   OverrideLocaleHolder() {}
   const std::vector<std::string>& value() const { return value_; }
   void swap_value(std::vector<std::string>* override_value) {
     value_.swap(*override_value);
   }
  private:
   std::vector<std::string> value_;
   DISALLOW_COPY_AND_ASSIGN(OverrideLocaleHolder);
 };
 
-base::LazyInstance<OverrideLocaleHolder> override_locale_holder =
-    LAZY_INSTANCE_INITIALIZER;
+base::LazyInstance<OverrideLocaleHolder>::DestructorAtExit
+    override_locale_holder = LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 namespace l10n_util {
 
 int GetExtendedStyles() {
   return !base::i18n::IsRTL() ? 0 : WS_EX_LAYOUTRTL | WS_EX_RTLREADING;
 }
 
 int GetExtendedTooltipStyles() {
@@ skipping 105 matching lines @@
   } else {
     NOTREACHED() << "Failed to determine the UI language for locale override.";
   }
 }
 
 const std::vector<std::string>& GetLocaleOverrides() {
   return override_locale_holder.Get().value();
 }
 
 }  // namespace l10n_util