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

chrome/browser/dom_ui/remoting_ui.cc

 // Copyright (c) 2010 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/remoting_ui.h"
 
 #include "base/singleton.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
-#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/url_constants.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace {
 
 ///////////////////////////////////////////////////////////////////////////////
 //
 // RemotingHTMLSource
 //
@@ skipping 37 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 //
 // RemotingUI
 //
 ///////////////////////////////////////////////////////////////////////////////
 
 RemotingUI::RemotingUI(TabContents* contents) : DOMUI(contents) {
   RemotingUIHTMLSource* html_source = new RemotingUIHTMLSource();
 
   // Set up the chrome://remoting source.
-  contents->profile()->GetChromeURLDataManager()->AddDataSource(html_source);
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
+      NewRunnableMethod(ChromeURLDataManager::GetInstance(),
+                        &ChromeURLDataManager::AddDataSource,
+                        make_scoped_refptr(html_source)));
 }
 
 
 // static
 RefCountedMemory* RemotingUI::GetFaviconResourceBytes() {
   return ResourceBundle::GetSharedInstance().
       // TODO(garykac): Have custom remoting icon created.
       LoadDataResourceBytes(IDR_PLUGIN);
 }
 
 // static
 void RemotingUI::RegisterUserPrefs(PrefService* prefs) {
   // TODO(garykac): Add remoting prefs (if needed).
 }