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

chrome/browser/dom_ui/history2_ui.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/history2_ui.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/callback.h"
@@ skipping 111 matching lines @@
     : search_text_() {
 }
 
 BrowsingHistoryHandler2::~BrowsingHistoryHandler2() {
   cancelable_search_consumer_.CancelAllRequests();
   cancelable_delete_consumer_.CancelAllRequests();
 }
 
 WebUIMessageHandler* BrowsingHistoryHandler2::Attach(DOMUI* dom_ui) {
   // Create our favicon data source.
-  Profile* profile = dom_ui->GetProfile();
-  profile->GetChromeURLDataManager()->AddDataSource(
-      new WebUIFavIconSource(profile));
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
+      NewRunnableMethod(
+          ChromeURLDataManager::GetInstance(),
+          &ChromeURLDataManager::AddDataSource,
+          make_scoped_refptr(new WebUIFavIconSource(dom_ui->GetProfile()))));
 
   // Get notifications when history is cleared.
   registrar_.Add(this, NotificationType::HISTORY_URLS_DELETED,
       Source<Profile>(dom_ui->GetProfile()->GetOriginalProfile()));
   return WebUIMessageHandler::Attach(dom_ui);
 }
 
 void BrowsingHistoryHandler2::RegisterMessages() {
   dom_ui_->RegisterMessageCallback("getHistory",
       NewCallback(this, &BrowsingHistoryHandler2::HandleGetHistory));
@@ skipping 245 matching lines @@
 // HistoryUIContents
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 HistoryUI2::HistoryUI2(TabContents* contents) : DOMUI(contents) {
   AddMessageHandler((new BrowsingHistoryHandler2())->Attach(this));
 
   HistoryUIHTMLSource2* html_source = new HistoryUIHTMLSource2();
 
   // Set up the chrome://history2/ source.
-  contents->profile()->GetChromeURLDataManager()->AddDataSource(html_source);
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
+      NewRunnableMethod(
+          ChromeURLDataManager::GetInstance(),
+          &ChromeURLDataManager::AddDataSource,
+          make_scoped_refptr(html_source)));
 }
 
 // static
 const GURL HistoryUI2::GetHistoryURLWithSearchText(const string16& text) {
   return GURL(std::string(chrome::kChromeUIHistory2URL) + "#q=" +
               EscapeQueryParamValue(UTF16ToUTF8(text), true));
 }
 
 // static
 RefCountedMemory* HistoryUI2::GetFaviconResourceBytes() {
   return ResourceBundle::GetSharedInstance().
       LoadDataResourceBytes(IDR_HISTORY_FAVICON);
 }