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

chrome/browser/dom_ui/bug_report_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/bug_report_ui.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/singleton.h"
 #include "base/string_number_conversions.h"
 #include "base/string_piece.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "base/weak_ptr.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/bug_report_data.h"
 #include "chrome/browser/bug_report_util.h"
 #include "chrome/browser/dom_ui/web_ui_screenshot_source.h"
-#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/window_snapshot/window_snapshot.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/url_constants.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
@@ skipping 391 matching lines @@
   delete this;
 }
 
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // BugReportHandler
 //
 ////////////////////////////////////////////////////////////////////////////////
 BugReportHandler::BugReportHandler(TabContents* tab)
-    : tab_(tab),
-      screenshot_source_(NULL),
-      bug_report_(NULL)
+    : tab_(tab)
+    , screenshot_source_(NULL)
+    , bug_report_(NULL)
 #if defined(OS_CHROMEOS)
     , syslogs_handle_(0)
 #endif
 {
 }
 
 BugReportHandler::~BugReportHandler() {
   // Just in case we didn't send off bug_report_ to SendReport
   if (bug_report_) {
     // If we're deleting the report object, cancel feedback collection first
     CancelFeedbackCollection();
     delete bug_report_;
   }
 }
 
 void BugReportHandler::ClobberScreenshotsSource() {
   // Re-create our screenshots data source (this clobbers the last source)
   // setting the screenshot to NULL, effectively disabling the source
   // TODO(rkc): Once there is a method to 'remove' a source, change this code
-  tab_->profile()->GetChromeURLDataManager()->AddDataSource(
-      new WebUIScreenshotSource(NULL));
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
+      NewRunnableMethod(
+          ChromeURLDataManager::GetInstance(),
+          &ChromeURLDataManager::AddDataSource,
+          make_scoped_refptr(new WebUIScreenshotSource(NULL))));
 
   // clobber last screenshot
   if (browser::last_screenshot_png)
     browser::last_screenshot_png->clear();
 }
 
 void BugReportHandler::SetupScreenshotsSource() {
   // If we don't already have a screenshot source object created, create one.
   if (!screenshot_source_)
     screenshot_source_ = new WebUIScreenshotSource(
         browser::last_screenshot_png);
 
   // Add the source to the data manager.
-  tab_->profile()->GetChromeURLDataManager()->AddDataSource(screenshot_source_);
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
+      NewRunnableMethod(
+          ChromeURLDataManager::GetInstance(),
+          &ChromeURLDataManager::AddDataSource,
+          make_scoped_refptr(screenshot_source_)));
 }
 
 WebUIMessageHandler* BugReportHandler::Attach(DOMUI* dom_ui) {
   SetupScreenshotsSource();
   return WebUIMessageHandler::Attach(dom_ui);
 }
 
 base::StringPiece BugReportHandler::Init() {
   std::string page_url;
   if (tab_->controller().GetActiveEntry()) {
@@ skipping 250 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 BugReportUI::BugReportUI(TabContents* tab) : HtmlDialogUI(tab) {
   BugReportHandler* handler = new BugReportHandler(tab);
   AddMessageHandler((handler)->Attach(this));
 
   // The handler's init will specify which html
   // resource we'll display to the user
   BugReportUIHTMLSource* html_source =
       new BugReportUIHTMLSource(handler->Init());
   // Set up the chrome://bugreport/ source.
-  tab->profile()->GetChromeURLDataManager()->AddDataSource(html_source);
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
+      NewRunnableMethod(
+          ChromeURLDataManager::GetInstance(),
+          &ChromeURLDataManager::AddDataSource,
+          make_scoped_refptr(html_source)));
 }