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

chrome/browser/dom_ui/most_visited_handler.cc

 // Copyright (c) 2011 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 <set>
 
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 46 matching lines @@
 MostVisitedHandler::MostVisitedHandler()
     : url_blacklist_(NULL),
       pinned_urls_(NULL),
       got_first_most_visited_request_(false) {
 }
 
 MostVisitedHandler::~MostVisitedHandler() {
 }
 
 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);
 
   // We pre-emptively make a fetch for the most visited pages so we have the
   // results sooner.
   StartQueryForMostVisited();
   return result;
 }
 
 void MostVisitedHandler::RegisterMessages() {
@@ skipping 286 matching lines @@
 
 // static
 std::vector<GURL> MostVisitedHandler::GetPrePopulatedUrls() {
   const std::vector<MostVisitedPage> pages =
       MostVisitedHandler::GetPrePopulatedPages();
   std::vector<GURL> page_urls;
   for (size_t i = 0; i < pages.size(); ++i)
     page_urls.push_back(pages[i].url);
   return page_urls;
 }