Allow linker initialization of lazy instance

content/browser/in_process_webkit/indexed_db_key_utility_client.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 "content/browser/in_process_webkit/indexed_db_key_utility_client.h"
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/synchronization/waitable_event.h"
 #include "content/browser/utility_process_host.h"
@@ skipping 90 matching lines @@
 
   // Used in the IO thread.
   UtilityProcessHost* utility_process_host_;
   scoped_refptr<Client> client_;
 
   DISALLOW_COPY_AND_ASSIGN(KeyUtilityClientImpl);
 };
 
 // IndexedDBKeyUtilityClient definitions.
 
-static base::LazyInstance<IndexedDBKeyUtilityClient> client_instance(
-    base::LINKER_INITIALIZED);
+static base::LazyInstance<IndexedDBKeyUtilityClient> client_instance =
+    LAZY_INSTANCE_INITIALIZER;
 
 IndexedDBKeyUtilityClient::IndexedDBKeyUtilityClient()
     : is_shutdown_(false) {
   // Note that creating the impl_ object is deferred until it is first needed,
   // as this class can be constructed even though it never gets used.
 }
 
 IndexedDBKeyUtilityClient::~IndexedDBKeyUtilityClient() {
   DCHECK(!impl_ || is_shutdown_);
 }
@@ skipping 263 matching lines @@
 void KeyUtilityClientImpl::Client::OnInjectIDBKeyFinished(
     const content::SerializedScriptValue& value) {
   parent_->SetValueAfterInjection(value);
   parent_->FinishInjectingKey();
 }
 
 void KeyUtilityClientImpl::Client::OnIDBKeysFromValuesAndKeyPathFailed(
     int id) {
   parent_->FinishCreatingKeys();
 }