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

chrome/browser/dom_ui/mediaplayer_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/mediaplayer_ui.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
@@ skipping 191 matching lines @@
 MediaplayerHandler::MediaplayerHandler(bool is_playlist)
     : current_offset_(0),
       is_playlist_(is_playlist) {
 }
 
 MediaplayerHandler::~MediaplayerHandler() {
 }
 
 WebUIMessageHandler* MediaplayerHandler::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()))));
 
   return WebUIMessageHandler::Attach(dom_ui);
 }
 
 void MediaplayerHandler::Init(bool is_playlist, TabContents* contents) {
   MediaPlayer* player = MediaPlayer::GetInstance();
   if (!is_playlist) {
     player->SetNewHandler(this, contents);
   } else {
     player->RegisterNewPlaylistHandler(this, contents);
@@ skipping 377 matching lines @@
   if (is_playlist) {
     handler->Init(true, contents);
   } else {
     handler->Init(false, contents);
   }
 
   MediaplayerUIHTMLSource* html_source =
       new MediaplayerUIHTMLSource(is_playlist);
 
   // Set up the chrome://mediaplayer/ source.
-  contents->profile()->GetChromeURLDataManager()->AddDataSource(html_source);
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
+      NewRunnableMethod(
+          ChromeURLDataManager::GetInstance(),
+          &ChromeURLDataManager::AddDataSource,
+          make_scoped_refptr(html_source)));
 }