Allow linker initialization of lazy instance

chrome_frame/urlmon_moniker.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_frame/urlmon_moniker.h"
 
 #include <exdisp.h>
 #include <shlguid.h>
 
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome_frame/bho.h"
 #include "chrome_frame/bind_context_info.h"
 #include "chrome_frame/chrome_active_document.h"
 #include "chrome_frame/exception_barrier.h"
 #include "chrome_frame/urlmon_bind_status_callback.h"
 #include "chrome_frame/utils.h"
 #include "chrome_frame/vtable_patch_manager.h"
 #include "net/http/http_util.h"
 
 static const int kMonikerBindToObject = 8;
 static const int kMonikerBindToStorage = kMonikerBindToObject + 1;
 
 base::LazyInstance<base::ThreadLocalPointer<NavigationManager> >
-    NavigationManager::thread_singleton_(base::LINKER_INITIALIZED);
+    NavigationManager::thread_singleton_ = LAZY_INSTANCE_INITIALIZER;
 
 BEGIN_VTABLE_PATCHES(IMoniker)
   VTABLE_PATCH_ENTRY(kMonikerBindToObject, MonikerPatch::BindToObject)
   VTABLE_PATCH_ENTRY(kMonikerBindToStorage, MonikerPatch::BindToStorage)
 END_VTABLE_PATCHES()
 
 ////////////////////////////
 
 HRESULT NavigationManager::NavigateToCurrentUrlInCF(IBrowserService* browser) {
   DCHECK(browser);
@@ skipping 216 matching lines @@
 
   // If the binding terminates before the data could be played back
   // now is the chance. Sometimes OnStopBinding happens after this returns
   // and then it's too late.
   if ((S_OK == hr) && callback)
     callback->MayPlayBack(BSCF_LASTDATANOTIFICATION);
 
   return hr;
 }