Revert 74292 - Splits ChromeURLDataManager into 2 chunks:...

chrome/browser/dom_ui/most_visited_handler.cc

Index: chrome/browser/dom_ui/most_visited_handler.cc
===================================================================
--- chrome/browser/dom_ui/most_visited_handler.cc	(revision 74293)
+++ chrome/browser/dom_ui/most_visited_handler.cc	(working copy)
@@ -64,21 +64,30 @@
 }
 
 WebUIMessageHandler* MostVisitedHandler::Attach(DOMUI* dom_ui) {
-  Profile* profile = dom_ui->GetProfile();
-  url_blacklist_ = profile->GetPrefs()->GetMutableDictionary(
-      prefs::kNTPMostVisitedURLsBlacklist);
-  pinned_urls_ = profile->GetPrefs()->GetMutableDictionary(
-      prefs::kNTPMostVisitedPinnedURLs);
+  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.
-  WebUIThumbnailSource* thumbnail_src = new WebUIThumbnailSource(profile);
-  profile->GetChromeURLDataManager()->AddDataSource(thumbnail_src);
+  WebUIThumbnailSource* thumbnail_src =
+      new WebUIThumbnailSource(dom_ui->GetProfile());
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
+      NewRunnableMethod(ChromeURLDataManager::GetInstance(),
+                        &ChromeURLDataManager::AddDataSource,
+                        make_scoped_refptr(thumbnail_src)));
 
-  WebUIFavIconSource* favicon_src = new WebUIFavIconSource(profile);
-  profile->GetChromeURLDataManager()->AddDataSource(favicon_src);
+  WebUIFavIconSource* favicon_src =
+      new WebUIFavIconSource(dom_ui->GetProfile());
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
+      NewRunnableMethod(ChromeURLDataManager::GetInstance(),
+                        &ChromeURLDataManager::AddDataSource,
+                        make_scoped_refptr(favicon_src)));
 
   // Get notifications when history is cleared.
   registrar_.Add(this, NotificationType::HISTORY_URLS_DELETED,
-                 Source<Profile>(profile));
+      Source<Profile>(dom_ui->GetProfile()));
 
   WebUIMessageHandler* result = WebUIMessageHandler::Attach(dom_ui);