Convert chrome_url_data_manager (previously a global) into a

chrome/browser/dom_ui/most_visited_handler.cc

 // Copyright (c) 2006-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/most_visited_handler.h"
 
 #include "app/l10n_util.h"
 #include "base/md5.h"
+#include "base/singleton.h"
 #include "base/string_util.h"
 #include "base/thread.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/dom_ui/dom_ui_favicon_source.h"
 #include "chrome/browser/dom_ui/dom_ui_thumbnail_source.h"
 #include "chrome/browser/dom_ui/new_tab_ui.h"
 #include "chrome/browser/history/page_usage_data.h"
 #include "chrome/browser/history/history.h"
@@ skipping 34 matching lines @@
 DOMMessageHandler* MostVisitedHandler::Attach(DOMUI* dom_ui) {
   url_blacklist_ = dom_ui->GetProfile()->GetPrefs()->
       GetMutableDictionary(prefs::kNTPMostVisitedURLsBlacklist);
   pinned_urls_ = dom_ui->GetProfile()->GetPrefs()->
       GetMutableDictionary(prefs::kNTPMostVisitedPinnedURLs);
   // Set up our sources for thumbnail and favicon data.
   DOMUIThumbnailSource* thumbnail_src =
       new DOMUIThumbnailSource(dom_ui->GetProfile());
   bool posted = ChromeThread::PostTask(
       ChromeThread::IO, FROM_HERE,
-      NewRunnableMethod(&chrome_url_data_manager,
+      NewRunnableMethod(Singleton<ChromeURLDataManager>().get(),
                         &ChromeURLDataManager::AddDataSource, thumbnail_src));
   if (!posted) {
     thumbnail_src->AddRef();
     thumbnail_src->Release();  // Keep Valgrind happy in unit tests.
   }
 
   DOMUIFavIconSource* favicon_src = new DOMUIFavIconSource(dom_ui->GetProfile());
   posted = ChromeThread::PostTask(
       ChromeThread::IO, FROM_HERE,
-      NewRunnableMethod(&chrome_url_data_manager,
+      NewRunnableMethod(Singleton<ChromeURLDataManager>().get(),
                         &ChromeURLDataManager::AddDataSource, favicon_src));
   if (!posted) {
     favicon_src->AddRef();
     favicon_src->Release();  // Keep Valgrind happy in unit tests.
   }
 
   // Get notifications when history is cleared.
   registrar_.Add(this, NotificationType::HISTORY_URLS_DELETED,
       Source<Profile>(dom_ui->GetProfile()));
 
@@ skipping 363 matching lines @@
 std::wstring MostVisitedHandler::GetDictionaryKeyForURL(
     const std::string& url) {
   return ASCIIToWide(MD5String(url));
 }
 
 // static
 void MostVisitedHandler::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterDictionaryPref(prefs::kNTPMostVisitedURLsBlacklist);
   prefs->RegisterDictionaryPref(prefs::kNTPMostVisitedPinnedURLs);
 }