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

chrome/browser/dom_ui/options/options_ui.cc

Index: chrome/browser/dom_ui/options/options_ui.cc
===================================================================
--- chrome/browser/dom_ui/options/options_ui.cc	(revision 74293)
+++ chrome/browser/dom_ui/options/options_ui.cc	(working copy)
@@ -193,15 +193,25 @@
       new OptionsUIHTMLSource(localized_strings);
 
   // Set up the chrome://settings/ source.
-  contents->profile()->GetChromeURLDataManager()->AddDataSource(html_source);
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
+      NewRunnableMethod(
+          ChromeURLDataManager::GetInstance(),
+          &ChromeURLDataManager::AddDataSource,
+          make_scoped_refptr(html_source)));
 
   // Set up the chrome://theme/ source.
-  WebUIThemeSource* theme = new WebUIThemeSource(contents->profile());
-  contents->profile()->GetChromeURLDataManager()->AddDataSource(theme);
+  WebUIThemeSource* theme = new WebUIThemeSource(GetProfile());
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
+      NewRunnableMethod(
+          ChromeURLDataManager::GetInstance(),
+          &ChromeURLDataManager::AddDataSource,
+          make_scoped_refptr(theme)));
 
   // Initialize the chrome://about/ source in case the user clicks the credits
   // link.
-  InitializeAboutDataSource(contents->profile());
+  InitializeAboutDataSource();
 }
 
 OptionsUI::~OptionsUI() {