Allow linker initialization of lazy instance

content/common/np_channel_base.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/common/np_channel_base.h"
 
 #include <stack>
 
 #include "base/auto_reset.h"
 #include "base/hash_tables.h"
 #include "base/lazy_instance.h"
 #include "base/string_number_conversions.h"
 #include "ipc/ipc_sync_message.h"
 
 #if defined(OS_POSIX)
 #include "ipc/ipc_channel_posix.h"
 #endif
 
 typedef base::hash_map<std::string, scoped_refptr<NPChannelBase> > ChannelMap;
 static base::LazyInstance<ChannelMap,
                           base::LeakyLazyInstanceTraits<ChannelMap> >
-     g_channels(base::LINKER_INITIALIZED);
+     g_channels = LAZY_INSTANCE_INITIALIZER;
 
 typedef std::stack<scoped_refptr<NPChannelBase> > NPChannelRefStack;
 static base::LazyInstance<NPChannelRefStack,
                           base::LeakyLazyInstanceTraits<NPChannelRefStack> >
-    g_lazy_channel_stack(base::LINKER_INITIALIZED);
+    g_lazy_channel_stack = LAZY_INSTANCE_INITIALIZER;
 
 static int next_pipe_id = 0;
 
 NPChannelBase* NPChannelBase::GetChannel(
     const IPC::ChannelHandle& channel_handle, IPC::Channel::Mode mode,
     ChannelFactory factory, base::MessageLoopProxy* ipc_message_loop,
     bool create_pipe_now, base::WaitableEvent* shutdown_event) {
   scoped_refptr<NPChannelBase> channel;
   std::string channel_key = channel_handle.name;
   ChannelMap::const_iterator iter = g_channels.Get().find(channel_key);
@@ skipping 232 matching lines @@
 
 void NPChannelBase::RemoveMappingForNPObjectStub(int route_id,
                                                  NPObject* object) {
   DCHECK(object != NULL);
   stub_map_.erase(object);
 }
 
 void NPChannelBase::RemoveMappingForNPObjectProxy(int route_id) {
   proxy_map_.erase(route_id);
 }