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

chrome/browser/sync/sync_setup_wizard.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/sync/sync_setup_wizard.h"
 
 #include "base/message_loop.h"
 #include "base/singleton.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
@@ skipping 242 matching lines @@
   GURL original_url(url);
   DCHECK(original_url.is_valid());
   GURL localized_url = google_util::AppendGoogleLocaleParam(original_url);
   return localized_url.spec();
 }
 
 SyncSetupWizard::SyncSetupWizard(ProfileSyncService* service)
     : 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);
   }
 }
 
 SyncSetupWizard::~SyncSetupWizard() {
   delete flow_container_;
 }
 
 void SyncSetupWizard::Step(State advance_state) {
   SyncSetupFlow* flow = flow_container_->get_flow();
   if (flow) {
@@ skipping 51 matching lines @@
     result = GAIA_SUCCESS;
   } else if (start_state == ENTER_PASSPHRASE ||
              start_state == CONFIGURE ||
              start_state == PASSPHRASE_MIGRATION) {
     result = DONE;
   }
   DCHECK_NE(FATAL_ERROR, result) <<
       "Invalid start state for discrete run: " << start_state;
   return result;
 }