Add a new GetInstance() method for remaining files with singleton classes under chrome/browser.

chrome/browser/dom_ui/html_dialog_ui.cc

 // Copyright (c) 2006-2008 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/dom_ui/html_dialog_ui.h"
 
 #include "base/callback.h"
-#include "base/singleton.h"
+#include "base/lazy_instance.h"
 #include "base/values.h"
 #include "chrome/browser/dom_ui/dom_ui_util.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/common/bindings_policy.h"
 
+static base::LazyInstance<PropertyAccessor<HtmlDialogUIDelegate*> >
+    g_html_dialog_ui_property_accessor(base::LINKER_INITIALIZED);
+
 HtmlDialogUI::HtmlDialogUI(TabContents* tab_contents) : DOMUI(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. DOMUIs can change, so
   // it's scary if this DOMUI is changed out and replaced with something else,
   // since the property will still point to the old delegate. But the delegate
   // is itself the owner of the TabContents for a dialog so will be in scope,
   // and the HTML dialogs won't swap DOMUIs anyway since they don't navigate.
 }
 
 // static
 PropertyAccessor<HtmlDialogUIDelegate*>& HtmlDialogUI::GetPropertyAccessor() {
-  return *Singleton< PropertyAccessor<HtmlDialogUIDelegate*> >::get();
+  return g_html_dialog_ui_property_accessor.Get();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Private:
 
 void HtmlDialogUI::RenderViewCreated(RenderViewHost* render_view_host) {
   // Hook up the javascript function calls, also known as chrome.send("foo")
   // calls in the HTML, to the actual C++ functions.
   RegisterMessageCallback("DialogClose",
                           NewCallback(this, &HtmlDialogUI::OnDialogClosed));
@@ skipping 34 matching lines @@
   // that are scoped in duration to the dialogs existence.
   bindings_ &= ~BindingsPolicy::DOM_UI;
 }
 
 ExternalHtmlDialogUI::~ExternalHtmlDialogUI() {
 }
 
 bool HtmlDialogUIDelegate::HandleContextMenu(const ContextMenuParams& params) {
   return false;
 }