Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4671)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/sync/profile_sync_service_startup_unittest.cc

Issue 7453014: [Sync] Refactor sync datatype error handling. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix unit test Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/sync/api/sync_error.cc ('K') | « chrome/browser/sync/profile_sync_service_bookmark_unittest.cc ('k') | chrome/browser/sync/syncable/model_type.cc » ('j') | chrome/browser/sync/syncable/model_type.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/profile_sync_service_startup_unittest.cc
diff --git a/chrome/browser/sync/profile_sync_service_startup_unittest.cc b/chrome/browser/sync/profile_sync_service_startup_unittest.cc
index ce5feec2f0793372c22ec1babdc4ca76c19a3c5c..718743d7323e02e70a2dbd0cbc58f057c824d5d0 100644
--- a/chrome/browser/sync/profile_sync_service_startup_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_startup_unittest.cc
@@ -245,10 +245,13 @@ TEST_F(ProfileSyncServiceStartupTest, ClearServerData) {
TEST_F(ProfileSyncServiceStartupTest, SKIP_MACOSX(StartFailure)) {
DataTypeManagerMock* data_type_manager = SetUpDataTypeManager();
- DataTypeManager::ConfigureResult configure_result =
+ DataTypeManager::ConfigureStatus status =
DataTypeManager::ASSOCIATION_FAILED;
- browser_sync::DataTypeManager::ConfigureResultWithErrorLocation result(
- configure_result, FROM_HERE, syncable::ModelTypeSet());
+ browser_sync::DataTypeManager::ConfigureResult result(
+ status,
+ syncable::ModelTypeSet(),
+ syncable::ModelTypeSet(),
+ FROM_HERE);
EXPECT_CALL(*data_type_manager, Configure(_, _)).
WillRepeatedly(
DoAll(
« chrome/browser/sync/api/sync_error.cc ('K') | « chrome/browser/sync/profile_sync_service_bookmark_unittest.cc ('k') | chrome/browser/sync/syncable/model_type.cc » ('j') | chrome/browser/sync/syncable/model_type.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698