Allow linker initialization of lazy instance

chrome/browser/ui/webui/html_dialog_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/html_dialog_ui.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/lazy_instance.h"
 #include "base/values.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"
 #include "content/public/common/bindings_policy.h"
 
 static base::LazyInstance<PropertyAccessor<HtmlDialogUIDelegate*> >
-    g_html_dialog_ui_property_accessor(base::LINKER_INITIALIZED);
+    g_html_dialog_ui_property_accessor = LAZY_INSTANCE_INITIALIZER;
 
 HtmlDialogUI::HtmlDialogUI(TabContents* tab_contents)
     : ChromeWebUI(tab_contents) {
 }
 
 HtmlDialogUI::~HtmlDialogUI() {
   // Don't unregister our property. During the teardown of the TabContents,
   // this will be deleted, but the TabContents will already be destroyed.
   //
   // This object is owned indirectly by the TabContents. WebUIs can change, so
@@ skipping 65 matching lines @@
   // that are scoped in duration to the dialogs existence.
   bindings_ &= ~content::BINDINGS_POLICY_WEB_UI;
 }
 
 ExternalHtmlDialogUI::~ExternalHtmlDialogUI() {
 }
 
 bool HtmlDialogUIDelegate::HandleContextMenu(const ContextMenuParams& params) {
   return false;
 }