Convert chrome_url_data_manager (previously a global) into a Singleton. This

chrome/browser/dom_ui/history_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/history_ui.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/i18n/time_formatting.h"
 #include "base/message_loop.h"
+#include "base/singleton.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/thread.h"
 #include "base/time.h"
 #include "base/values.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/dom_ui/dom_ui_favicon_source.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/history/history_types.h"
@@ skipping 85 matching lines @@
   cancelable_consumer_.CancelAllRequests();
   if (remover_)
     remover_->RemoveObserver(this);
 }
 
 DOMMessageHandler* BrowsingHistoryHandler::Attach(DOMUI* dom_ui) {
   // Create our favicon data source.
   ChromeThread::PostTask(
       ChromeThread::IO, FROM_HERE,
       NewRunnableMethod(
-          &chrome_url_data_manager,
+          Singleton<ChromeURLDataManager>().get(),
           &ChromeURLDataManager::AddDataSource,
           new DOMUIFavIconSource(dom_ui->GetProfile())));
 
   // Get notifications when history is cleared.
   registrar_.Add(this, NotificationType::HISTORY_URLS_DELETED,
       Source<Profile>(dom_ui->GetProfile()->GetOriginalProfile()));
   return DOMMessageHandler::Attach(dom_ui);
 }
 
 void BrowsingHistoryHandler::RegisterMessages() {
@@ skipping 239 matching lines @@
 
 HistoryUI::HistoryUI(TabContents* contents) : DOMUI(contents) {
   AddMessageHandler((new BrowsingHistoryHandler())->Attach(this));
 
   HistoryUIHTMLSource* html_source = new HistoryUIHTMLSource();
 
   // Set up the chrome://history/ source.
   ChromeThread::PostTask(
       ChromeThread::IO, FROM_HERE,
       NewRunnableMethod(
-          &chrome_url_data_manager,
+          Singleton<ChromeURLDataManager>().get(),
           &ChromeURLDataManager::AddDataSource,
           html_source));
 }
 
 // static
 const GURL HistoryUI::GetHistoryURLWithSearchText(const std::wstring& text) {
   return GURL(std::string(chrome::kChromeUIHistoryURL) + "#q=" +
               EscapeQueryParamValue(WideToUTF8(text)));
 }
 
 // static
 RefCountedMemory* HistoryUI::GetFaviconResourceBytes() {
   return ResourceBundle::GetSharedInstance().
       LoadImageResourceBytes(IDR_HISTORY_FAVICON);
 }