| 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 a337a8f0c8edc059e247f9e7952ec94f73665d2f..2bdd6f2782ac78419e9f727e4eeba0c4567f2b7a 100644
|
| --- a/chrome/browser/sync/profile_sync_service_startup_unittest.cc
|
| +++ b/chrome/browser/sync/profile_sync_service_startup_unittest.cc
|
| @@ -298,8 +298,8 @@ TEST_F(ProfileSyncServiceStartupTest, SwitchManaged) {
|
| TEST_F(ProfileSyncServiceStartupTest, StartFailure) {
|
| DataTypeManagerMock* data_type_manager = SetUpDataTypeManager();
|
| DataTypeManager::ConfigureStatus status = DataTypeManager::ABORTED;
|
| - SyncError error(FROM_HERE, "Association failed.", syncable::BOOKMARKS);
|
| - std::list<SyncError> errors;
|
| + csync::SyncError error(FROM_HERE, "Association failed.", syncable::BOOKMARKS);
|
| + std::list<csync::SyncError> errors;
|
| errors.push_back(error);
|
| browser_sync::DataTypeManager::ConfigureResult result(
|
| status,
|
|
|