Allow linker initialization of lazy instance

content/worker/worker_thread.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/worker/worker_thread.h"
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/threading/thread_local.h"
 #include "content/common/appcache/appcache_dispatcher.h"
 #include "content/common/db_message_filter.h"
 #include "content/common/web_database_observer_impl.h"
 #include "content/common/worker_messages.h"
 #include "content/public/common/content_switches.h"
 #include "content/worker/websharedworker_stub.h"
 #include "content/worker/worker_webkitplatformsupport_impl.h"
 #include "ipc/ipc_sync_channel.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBlobRegistry.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabase.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"
 #include "webkit/glue/webkit_glue.h"
 
 using WebKit::WebRuntimeFeatures;
 
-static base::LazyInstance<base::ThreadLocalPointer<WorkerThread> > lazy_tls(
-    base::LINKER_INITIALIZED);
+static base::LazyInstance<base::ThreadLocalPointer<WorkerThread> > lazy_tls =
+    LAZY_INSTANCE_INITIALIZER;
 
 
 WorkerThread::WorkerThread() {
   lazy_tls.Pointer()->Set(this);
   webkit_platform_support_.reset(new WorkerWebKitPlatformSupportImpl);
   WebKit::initialize(webkit_platform_support_.get());
 
   appcache_dispatcher_.reset(new AppCacheDispatcher(this));
 
   web_database_observer_impl_.reset(new WebDatabaseObserverImpl(this));
@@ skipping 71 matching lines @@
   }
 }
 
 void WorkerThread::RemoveWorkerStub(WebSharedWorkerStub* stub) {
   worker_stubs_.erase(stub);
 }
 
 void WorkerThread::AddWorkerStub(WebSharedWorkerStub* stub) {
   worker_stubs_.insert(stub);
 }