Revert 74340 - Attempt 2 at: Splits ChromeURLDataManager into 2 chunks:

. ChromeURLDataManager is no longer a singleton and is always used on
  the UI thread. ChromeURLDataManager is now profile specific (you get
  from the profile).
. ChromeURLDataManagerBackend handles the URLRequests and the
  DataSources. ChromeURLDataManagerBackend is created by
  ChromeURLRequestContext.

All DataSources are now profile specific. There were two that wanted
to be global, but have been converted.

This differs from the version I landed in that there is now a NULL
check in ChromeURLDataManager::DeleteDataSources.

BUG=52022 71868
TEST=none
TBR=willchan, evan, ahendrickson
Review URL: http://codereview.chromium.org/6462036

TBR=sky@chromium.org
Review URL: http://codereview.chromium.org/6478010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74384 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 4 deletions

diff --git a/chrome/browser/remoting/setup_flow.cc b/chrome/browser/remoting/setup_flow.cc
index 29052f2..8c50ec4 100644
--- a/chrome/browser/remoting/setup_flow.cc
+++ b/chrome/browser/remoting/setup_flow.cc
@@ -116,16 +116,18 @@ void SetupFlowDoneStep::DoStart() {
 SetupFlowContext::SetupFlowContext() { }
 SetupFlowContext::~SetupFlowContext() { }
 
-SetupFlow::SetupFlow(const std::string& args,
-                     Profile* profile,
+SetupFlow::SetupFlow(const std::string& args, Profile* profile,
                      SetupFlowStep* first_step)
     : dom_ui_(NULL),
       dialog_start_args_(args),
       profile_(profile),
       current_step_(first_step) {
   // TODO(hclam): The data source should be added once.
-  profile->GetChromeURLDataManager()->AddDataSource(
-      new RemotingResourcesSource());
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
+      NewRunnableMethod(ChromeURLDataManager::GetInstance(),
+                        &ChromeURLDataManager::AddDataSource,
+                        make_scoped_refptr(new RemotingResourcesSource())));
 }
 
 SetupFlow::~SetupFlow() { }