Allow linker initialization of lazy instance

chrome/browser/sync/util/sqlite_utils.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 "chrome/browser/sync/util/sqlite_utils.h"
 
 #include <list>
 
 #include "base/file_path.h"
 #include "base/lazy_instance.h"
@@ skipping 62 matching lines @@
     base::AutoLock lock(lock_);
     errors_.push_back(handler);
   }
 
   typedef std::list<SQLErrorHandler*> ErrorList;
   ErrorList errors_;
   base::Lock lock_;
 };
 
 static base::LazyInstance<DefaultSQLErrorHandlerFactory>
-    g_default_sql_error_handler_factory(base::LINKER_INITIALIZED);
+    g_default_sql_error_handler_factory = LAZY_INSTANCE_INITIALIZER;
 
 SQLErrorHandlerFactory* GetErrorHandlerFactory() {
   // TODO(cpu): Testing needs to override the error handler.
   // Destruction of DefaultSQLErrorHandlerFactory handled by at_exit manager.
   return g_default_sql_error_handler_factory.Pointer();
 }
 
 int OpenSqliteDb(const FilePath& filepath, sqlite3** database) {
 #if defined(OS_WIN)
   // We want the default encoding to always be UTF-8, so we use the
@@ skipping 408 matching lines @@
   return (s != NULL);
 }
 
 std::wstring SQLStatement::column_wstring(int index) {
   std::wstring wstr;
   column_wstring(index, &wstr);
   return wstr;
 }
 
 }  // namespace sqlite_utils