| Index: chrome/browser/sync/glue/model_association_manager_unittest.cc
|
| diff --git a/chrome/browser/sync/glue/model_association_manager_unittest.cc b/chrome/browser/sync/glue/model_association_manager_unittest.cc
|
| index a36596f6375ae2e1b178421605b7a932258f9f32..46b64facb2adedc8db88522c7d8140037d9459ba 100644
|
| --- a/chrome/browser/sync/glue/model_association_manager_unittest.cc
|
| +++ b/chrome/browser/sync/glue/model_association_manager_unittest.cc
|
| @@ -171,7 +171,10 @@ TEST_F(SyncModelAssociationManagerTest, TypeFailModelAssociation) {
|
| syncer::ModelTypeSet types;
|
| types.Put(syncer::BOOKMARKS);
|
| std::map<syncer::ModelType, syncer::SyncError> errors;
|
| - syncer::SyncError error(FROM_HERE, "Failed", syncer::BOOKMARKS);
|
| + syncer::SyncError error(FROM_HERE,
|
| + syncer::SyncError::DATATYPE_ERROR,
|
| + "Failed",
|
| + syncer::BOOKMARKS);
|
| errors[syncer::BOOKMARKS] = error;
|
| DataTypeManager::ConfigureResult expected_result(
|
| DataTypeManager::PARTIAL_SUCCESS,
|
| @@ -202,7 +205,10 @@ TEST_F(SyncModelAssociationManagerTest, TypeReturnUnrecoverableError) {
|
| syncer::ModelTypeSet types;
|
| types.Put(syncer::BOOKMARKS);
|
| std::map<syncer::ModelType, syncer::SyncError> errors;
|
| - syncer::SyncError error(FROM_HERE, "Failed", syncer::BOOKMARKS);
|
| + syncer::SyncError error(FROM_HERE,
|
| + syncer::SyncError::DATATYPE_ERROR,
|
| + "Failed",
|
| + syncer::BOOKMARKS);
|
| errors[syncer::BOOKMARKS] = error;
|
| DataTypeManager::ConfigureResult expected_result(
|
| DataTypeManager::UNRECOVERABLE_ERROR,
|
|
|