Index: chrome/browser/sync/profile_sync_service.cc |
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc |
index 466832e6612c3e6cb02ee4ebccbcc1440278a71a..d2d8b3cf1264ec4efe61b37d63911f67507023fa 100644 |
--- a/chrome/browser/sync/profile_sync_service.cc |
+++ b/chrome/browser/sync/profile_sync_service.cc |
@@ -621,9 +621,9 @@ void ProfileSyncService::DisableBrokenDatatype( |
// passed onto the change processor. |
DeactivateDataType(type); |
- SyncError error(from_here, message, type); |
+ csync::SyncError error(from_here, message, type); |
- std::list<SyncError> errors; |
+ std::list<csync::SyncError> errors; |
errors.push_back(error); |
// Update this before posting a task. So if a configure happens before |
@@ -1418,7 +1418,7 @@ void ProfileSyncService::Observe(int type, |
// error representing it. |
DCHECK_EQ(result->failed_data_types.size(), |
static_cast<unsigned int>(1)); |
- SyncError error = result->failed_data_types.front(); |
+ csync::SyncError error = result->failed_data_types.front(); |
DCHECK(error.IsSet()); |
std::string message = |
"Sync configuration failed with status " + |