Require explicit selection of traits for LazyInstance

base/i18n/number_formatting.cc

 // 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.
 
 #include "base/i18n/number_formatting.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 24 matching lines @@
     // This can cause problems if a different allocator is used by this file
     // than by ICU.
     UErrorCode status = U_ZERO_ERROR;
     number_format.reset(icu::NumberFormat::createInstance(status));
     DCHECK(U_SUCCESS(status));
   }
 
   std::unique_ptr<icu::NumberFormat> number_format;
 };
 
-LazyInstance<NumberFormatWrapper> g_number_format_int =
+LazyInstance<NumberFormatWrapper>::DestructorAtExit g_number_format_int =
     LAZY_INSTANCE_INITIALIZER;
-LazyInstance<NumberFormatWrapper> g_number_format_float =
+LazyInstance<NumberFormatWrapper>::DestructorAtExit g_number_format_float =
     LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 string16 FormatNumber(int64_t number) {
   icu::NumberFormat* number_format =
       g_number_format_int.Get().number_format.get();
 
   if (!number_format) {
     // As a fallback, just return the raw number in a string.
@@ skipping 29 matching lines @@
 namespace testing {
 
 void ResetFormatters() {
   g_number_format_int.Get().Reset();
   g_number_format_float.Get().Reset();
 }
 
 }  // namespace testing
 
 }  // namespace base