summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync/profile_sync_service_startup_unittest.cc
diff options
context:
space:
mode:
authorlipalani@chromium.org <lipalani@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-30 20:25:19 +0000
committerlipalani@chromium.org <lipalani@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-30 20:25:19 +0000
commit6f00f7e6d4f18af869d89cf669bf95b8d21e67f0 (patch)
tree59f95821396b8f0a70b1402a9f7a3b292f51d45a /chrome/browser/sync/profile_sync_service_startup_unittest.cc
parentf08ea296bf058b47bba7f5afd756467318cefda9 (diff)
downloadchromium_src-6f00f7e6d4f18af869d89cf669bf95b8d21e67f0.zip
chromium_src-6f00f7e6d4f18af869d89cf669bf95b8d21e67f0.tar.gz
chromium_src-6f00f7e6d4f18af869d89cf669bf95b8d21e67f0.tar.bz2
Making sync configure errors more descriptive.
BUG=77006 TEST= Review URL: http://codereview.chromium.org/6769002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79885 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/profile_sync_service_startup_unittest.cc')
-rw-r--r--chrome/browser/sync/profile_sync_service_startup_unittest.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/sync/profile_sync_service_startup_unittest.cc b/chrome/browser/sync/profile_sync_service_startup_unittest.cc
index f9493f5..bdc7897 100644
--- a/chrome/browser/sync/profile_sync_service_startup_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_startup_unittest.cc
@@ -236,8 +236,10 @@ TEST_F(ProfileSyncServiceStartupTest, ClearServerData) {
TEST_F(ProfileSyncServiceStartupTest, SKIP_MACOSX(StartFailure)) {
DataTypeManagerMock* data_type_manager = SetUpDataTypeManager();
- DataTypeManager::ConfigureResult result =
+ DataTypeManager::ConfigureResult configure_result =
DataTypeManager::ASSOCIATION_FAILED;
+ browser_sync::DataTypeManager::ConfigureResultWithErrorLocation result(
+ configure_result, FROM_HERE);
EXPECT_CALL(*data_type_manager, Configure(_)).
WillRepeatedly(DoAll(NotifyFromDataTypeManager(data_type_manager,
NotificationType::SYNC_CONFIGURE_START),