Allow linker initialization of lazy instance

content/browser/renderer_host/java/java_bridge_channel_host.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/renderer_host/java/java_bridge_channel_host.h"
 
 #include "base/lazy_instance.h"
 #include "base/stringprintf.h"
 #include "base/synchronization/waitable_event.h"
 
 using base::WaitableEvent;
 
 namespace {
 struct WaitableEventLazyInstanceTraits
     : public base::DefaultLazyInstanceTraits<WaitableEvent> {
   static WaitableEvent* New(void* instance) {
     // Use placement new to initialize our instance in our preallocated space.
     // The parenthesis is very important here to force POD type initialization.
     return new (instance) WaitableEvent(false, false);
   }
 };
-base::LazyInstance<WaitableEvent, WaitableEventLazyInstanceTraits> dummy_event(
-    base::LINKER_INITIALIZED);
+base::LazyInstance<WaitableEvent, WaitableEventLazyInstanceTraits> dummy_event =
+    LAZY_INSTANCE_INITIALIZER;
 }
 
 JavaBridgeChannelHost* JavaBridgeChannelHost::GetJavaBridgeChannelHost(
     int renderer_id, base::MessageLoopProxy* ipc_message_loop) {
   std::string channel_name(StringPrintf("r%d.javabridge", renderer_id));
   // We don't use a shutdown event because the Java Bridge only sends messages
   // from renderer to browser, so we'll never be waiting for a sync IPC to
   // complete. So we use an event which is never signaled.
   return static_cast<JavaBridgeChannelHost*>(NPChannelBase::GetChannel(
       channel_name,
@@ skipping 23 matching lines @@
 #endif
 
   return true;
 }
 
 bool JavaBridgeChannelHost::Send(IPC::Message* msg) {
   CHECK(!msg->is_sync() && msg->is_reply()) <<
       "Java Bridge only sends messages from renderer to browser.";
   return NPChannelBase::Send(msg);
 }