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

chrome/browser/dom_ui/filebrowse_ui.cc

 // Copyright (c) 2009 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/filebrowse_ui.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/logging.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 108 matching lines @@
     lister_->Cancel();
     lister_->set_delegate(NULL);
   }
 }
 
 DOMMessageHandler* FileBrowseHandler::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())));
 
   return DOMMessageHandler::Attach(dom_ui);
 }
 
 void FileBrowseHandler::RegisterMessages() {
   dom_ui_->RegisterMessageCallback("getRoots",
       NewCallback(this, &FileBrowseHandler::HandleGetRoots));
   dom_ui_->RegisterMessageCallback("getChildren",
@@ skipping 96 matching lines @@
 
 FileBrowseUI::FileBrowseUI(TabContents* contents) : DOMUI(contents) {
   AddMessageHandler((new FileBrowseHandler())->Attach(this));
   DLOG(ERROR) << "Got call to filebrowseUI";
   FileBrowseUIHTMLSource* html_source = new FileBrowseUIHTMLSource();
 
   // Set up the chrome://filebrowse/ source.
   ChromeThread::PostTask(
       ChromeThread::IO, FROM_HERE,
       NewRunnableMethod(
-          &chrome_url_data_manager,
+          Singleton<ChromeURLDataManager>().get(),
           &ChromeURLDataManager::AddDataSource,
           html_source));
 }