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

chrome/browser/dom_ui/filebrowse_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/filebrowse_ui.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
@@ skipping 404 matching lines @@
     task->AddRef();
     BrowserThread::PostTask(
         BrowserThread::FILE, FROM_HERE,
         NewRunnableMethod(
             task, &TaskProxy::DeleteFetcher, fetch));
   }
 }
 
 WebUIMessageHandler* FilebrowseHandler::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();
-  profile_->GetChromeURLDataManager()->AddDataSource(
-      new WebUIFavIconSource(profile_));
   tab_contents_ = dom_ui->tab_contents();
   return WebUIMessageHandler::Attach(dom_ui);
 }
 
 void FilebrowseHandler::Init() {
   download_manager_ = profile_->GetDownloadManager();
   download_manager_->AddObserver(this);
   TaskProxy* task = new TaskProxy(AsWeakPtr(), currentpath_);
   task->AddRef();
   current_task_ = task;
@@ skipping 690 matching lines @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 FileBrowseUI::FileBrowseUI(TabContents* contents) : HtmlDialogUI(contents) {
   FilebrowseHandler* handler = new FilebrowseHandler();
   AddMessageHandler((handler)->Attach(this));
   handler->Init();
   FileBrowseUIHTMLSource* html_source = new FileBrowseUIHTMLSource();
 
   // Set up the chrome://filebrowse/ source.
-  contents->profile()->GetChromeURLDataManager()->AddDataSource(html_source);
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
+      NewRunnableMethod(
+          ChromeURLDataManager::GetInstance(),
+          &ChromeURLDataManager::AddDataSource,
+          make_scoped_refptr(html_source)));
 }
 
 // static
 Browser* FileBrowseUI::OpenPopup(Profile* profile,
                                  const std::string& hashArgument,
                                  int width,
                                  int height) {
   // Get existing pop up for given hashArgument.
   Browser* browser = GetPopupForPath(hashArgument, profile);
 
@@ skipping 59 matching lines @@
     }
   }
 
   return NULL;
 }
 
 const int FileBrowseUI::kPopupWidth = 250;
 const int FileBrowseUI::kPopupHeight = 300;
 const int FileBrowseUI::kSmallPopupWidth = 250;
 const int FileBrowseUI::kSmallPopupHeight = 50;