3 files changed, 7 insertions, 11 deletions
diff --git a/chrome/browser/sync/profile_sync_service_mock.cc b/chrome/browser/sync/profile_sync_service_mock.cc
index f843159..99e9ede 100644
--- a/chrome/browser/sync/profile_sync_service_mock.cc
+++ b/chrome/browser/sync/profile_sync_service_mock.cc
@@ -9,6 +9,4 @@
 ProfileSyncServiceMock::ProfileSyncServiceMock() {}
 
 ProfileSyncServiceMock::~ProfileSyncServiceMock() {
-  ChromeURLDataManager::GetInstance()->RemoveDataSourceForTest(
-      chrome::kChromeUISyncResourcesHost);
 }
diff --git a/chrome/browser/sync/sync_setup_wizard.cc b/chrome/browser/sync/sync_setup_wizard.cc
index 2cb6b7e..632d60d 100644
--- a/chrome/browser/sync/sync_setup_wizard.cc
+++ b/chrome/browser/sync/sync_setup_wizard.cc
@@ -260,19 +260,14 @@ 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.  Avoid
+  // If we're in a unit test, we may not have an IO thread or profile.  Avoid
   // creating a SyncResourcesSource since we may leak it (since it's
   // DeleteOnUIThread).
-  if (BrowserThread::IsMessageLoopValid(BrowserThread::IO)) {
+  if (BrowserThread::IsMessageLoopValid(BrowserThread::IO) &&
+      service_->profile()) {
     // Add our network layer data source for 'cloudy' URLs.
     SyncResourcesSource* sync_source = new SyncResourcesSource();
-    bool posted =
-        BrowserThread::PostTask(
-            BrowserThread::IO, FROM_HERE,
-            NewRunnableMethod(ChromeURLDataManager::GetInstance(),
-                              &ChromeURLDataManager::AddDataSource,
-                              make_scoped_refptr(sync_source)));
-    DCHECK(posted);
+    service_->profile()->GetChromeURLDataManager()->AddDataSource(sync_source);
   }
 }
 
diff --git a/chrome/browser/sync/sync_ui_util_unittest.cc b/chrome/browser/sync/sync_ui_util_unittest.cc
index 7122170..96dd2c909 100644
--- a/chrome/browser/sync/sync_ui_util_unittest.cc
+++ b/chrome/browser/sync/sync_ui_util_unittest.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/basictypes.h"
+#include "chrome/browser/browser_thread.h"
 #include "chrome/browser/sync/sync_ui_util.h"
 #include "chrome/browser/sync/profile_sync_service_mock.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ -12,6 +13,8 @@
 using ::testing::Return;
 using ::testing::NiceMock;
 TEST(SyncUIUtilTest, ConstructAboutInformationWithUnrecoverableErrorTest) {
+  MessageLoopForUI message_loop;
+  BrowserThread ui_thread(BrowserThread::UI, &message_loop);
   NiceMock<ProfileSyncServiceMock> service;
   DictionaryValue strings;