Attempt 3 at: Splits ChromeURLDataManager into 2 chunks:...

chrome/browser/remoting/setup_flow.cc

Index: chrome/browser/remoting/setup_flow.cc
===================================================================
--- chrome/browser/remoting/setup_flow.cc	(revision 74394)
+++ chrome/browser/remoting/setup_flow.cc	(working copy)
@@ -116,18 +116,16 @@
 SetupFlowContext::SetupFlowContext() { }
 SetupFlowContext::~SetupFlowContext() { }
 
-SetupFlow::SetupFlow(const std::string& args, Profile* profile,
+SetupFlow::SetupFlow(const std::string& args,
+                     Profile* profile,
                      SetupFlowStep* first_step)
     : web_ui_(NULL),
       dialog_start_args_(args),
       profile_(profile),
       current_step_(first_step) {
   // TODO(hclam): The data source should be added once.
-  BrowserThread::PostTask(
-      BrowserThread::IO, FROM_HERE,
-      NewRunnableMethod(ChromeURLDataManager::GetInstance(),
-                        &ChromeURLDataManager::AddDataSource,
-                        make_scoped_refptr(new RemotingResourcesSource())));
+  profile->GetChromeURLDataManager()->AddDataSource(
+      new RemotingResourcesSource());
 }
 
 SetupFlow::~SetupFlow() { }