Allow linker initialization of lazy instance

base/i18n/number_formatting.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 "base/i18n/number_formatting.h"
 
 #include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 18 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));
   }
 
   scoped_ptr<icu::NumberFormat> number_format;
 };
 
-LazyInstance<NumberFormatWrapper> g_number_format_int(LINKER_INITIALIZED);
-LazyInstance<NumberFormatWrapper> g_number_format_float(LINKER_INITIALIZED);
+LazyInstance<NumberFormatWrapper> g_number_format_int =
+    LAZY_INSTANCE_INITIALIZER;
+LazyInstance<NumberFormatWrapper> g_number_format_float =
+    LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 string16 FormatNumber(int64 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.
     return UTF8ToUTF16(StringPrintf("%" PRId64, number));
@@ skipping 23 matching lines @@
 namespace testing {
 
 void ResetFormatters() {
   g_number_format_int.Get().Reset();
   g_number_format_float.Get().Reset();
 }
 
 }  // namespace testing
 
 }  // namespace base