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

chrome/browser/sync/sync_setup_wizard.cc

Index: chrome/browser/sync/sync_setup_wizard.cc
===================================================================
--- chrome/browser/sync/sync_setup_wizard.cc	(revision 74293)
+++ chrome/browser/sync/sync_setup_wizard.cc	(working copy)
@@ -260,14 +260,19 @@
     : service_(service),
       flow_container_(new SyncSetupFlowContainer()),
       parent_window_(NULL) {
-  // If we're in a unit test, we may not have an IO thread or profile.  Avoid
+  // If we're in a unit test, we may not have an IO thread.  Avoid
   // creating a SyncResourcesSource since we may leak it (since it's
   // DeleteOnUIThread).
-  if (BrowserThread::IsMessageLoopValid(BrowserThread::IO) &&
-      service_->profile()) {
+  if (BrowserThread::IsMessageLoopValid(BrowserThread::IO)) {
     // Add our network layer data source for 'cloudy' URLs.
     SyncResourcesSource* sync_source = new SyncResourcesSource();
-    service_->profile()->GetChromeURLDataManager()->AddDataSource(sync_source);
+    bool posted =
+        BrowserThread::PostTask(
+            BrowserThread::IO, FROM_HERE,
+            NewRunnableMethod(ChromeURLDataManager::GetInstance(),
+                              &ChromeURLDataManager::AddDataSource,
+                              make_scoped_refptr(sync_source)));
+    DCHECK(posted);
   }
 }