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

chrome/browser/dom_ui/slideshow_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/slideshow_ui.h"
 
 #include "base/callback.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/singleton.h"
@@ skipping 130 matching lines @@
 }
 
 SlideshowHandler::~SlideshowHandler() {
   if (lister_.get()) {
     lister_->Cancel();
     lister_->set_delegate(NULL);
   }
 }
 
 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);
 }
 
 void SlideshowHandler::Init() {
 }
 
 void SlideshowHandler::RegisterMessages() {
   dom_ui_->RegisterMessageCallback("getChildren",
       NewCallback(this, &SlideshowHandler::HandleGetChildren));
   dom_ui_->RegisterMessageCallback("refreshDirectory",
@@ skipping 108 matching lines @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 SlideshowUI::SlideshowUI(TabContents* contents) : DOMUI(contents) {
   SlideshowHandler* handler = new SlideshowHandler();
   AddMessageHandler((handler)->Attach(this));
   handler->Init();
   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)));
 }