Allow linker initialization of lazy instance

chrome/browser/ui/webui/constrained_html_ui.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/browser/ui/webui/constrained_html_ui.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/lazy_instance.h"
 #include "base/values.h"
 #include "chrome/browser/ui/webui/html_dialog_ui.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/notification_service.h"
 
 static base::LazyInstance<PropertyAccessor<ConstrainedHtmlUIDelegate*> >
-    g_constrained_html_ui_property_accessor(base::LINKER_INITIALIZED);
+    g_constrained_html_ui_property_accessor = LAZY_INSTANCE_INITIALIZER;
 
 ConstrainedHtmlUI::ConstrainedHtmlUI(TabContents* contents)
     : ChromeWebUI(contents) {
 }
 
 ConstrainedHtmlUI::~ConstrainedHtmlUI() {
 }
 
 void ConstrainedHtmlUI::RenderViewCreated(RenderViewHost* render_view_host) {
   ConstrainedHtmlUIDelegate* delegate = GetConstrainedDelegate();
@@ skipping 38 matching lines @@
   ConstrainedHtmlUIDelegate** property =
       GetPropertyAccessor().GetProperty(tab_contents()->property_bag());
   return property ? *property : NULL;
 }
 
 // static
 PropertyAccessor<ConstrainedHtmlUIDelegate*>&
     ConstrainedHtmlUI::GetPropertyAccessor() {
   return g_constrained_html_ui_property_accessor.Get();
 }