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

chrome/browser/dom_ui/slideshow_ui.cc

Index: chrome/browser/dom_ui/slideshow_ui.cc
===================================================================
--- chrome/browser/dom_ui/slideshow_ui.cc	(revision 74293)
+++ chrome/browser/dom_ui/slideshow_ui.cc	(working copy)
@@ -148,10 +148,14 @@
 }
 
 WebUIMessageHandler* SlideshowHandler::Attach(DOMUI* dom_ui) {
+  // Create our favicon data source.
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
+      NewRunnableMethod(
+          ChromeURLDataManager::GetInstance(),
+          &ChromeURLDataManager::AddDataSource,
+          make_scoped_refptr(new WebUIFavIconSource(dom_ui->GetProfile()))));
   profile_ = dom_ui->GetProfile();
-  // Create our favicon data source.
-  profile_->GetChromeURLDataManager()->AddDataSource(
-      new WebUIFavIconSource(profile_));
   return WebUIMessageHandler::Attach(dom_ui);
 }
 
@@ -280,5 +284,10 @@
   SlideshowUIHTMLSource* html_source = new SlideshowUIHTMLSource();
 
   // Set up the chrome://slideshow/ source.
-  contents->profile()->GetChromeURLDataManager()->AddDataSource(html_source);
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
+      NewRunnableMethod(
+          ChromeURLDataManager::GetInstance(),
+          &ChromeURLDataManager::AddDataSource,
+          make_scoped_refptr(html_source)));
 }