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

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

Issue 7497014: Revert 94128 - [Sync] Refactor sync datatype error handling. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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
« no previous file with comments | « chrome/browser/sync/backend_migrator.cc ('k') | chrome/browser/sync/glue/app_model_associator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/backend_migrator_unittest.cc
===================================================================
--- chrome/browser/sync/backend_migrator_unittest.cc (revision 94142)
+++ chrome/browser/sync/backend_migrator_unittest.cc (working copy)
@@ -59,25 +59,15 @@
.WillOnce(Return(snap_.get()));
}
- void SendConfigureDone(DataTypeManager::ConfigureStatus status,
+ void SendConfigureDone(DataTypeManager::ConfigureResult result,
const syncable::ModelTypeSet& types) {
- if (status == DataTypeManager::OK) {
- DataTypeManager::ConfigureResult result(status, types);
- NotificationService::current()->Notify(
- chrome::NOTIFICATION_SYNC_CONFIGURE_DONE,
- Source<DataTypeManager>(&manager_),
- Details<const DataTypeManager::ConfigureResult>(&result));
- } else {
- DataTypeManager::ConfigureResult result(
- status,
- types,
- syncable::ModelTypeSet(),
- FROM_HERE);
- NotificationService::current()->Notify(
- chrome::NOTIFICATION_SYNC_CONFIGURE_DONE,
- Source<DataTypeManager>(&manager_),
- Details<const DataTypeManager::ConfigureResult>(&result));
- }
+ DataTypeManager::ConfigureResultWithErrorLocation result_with_location(
+ result, FROM_HERE, types);
+ NotificationService::current()->Notify(
+ chrome::NOTIFICATION_SYNC_CONFIGURE_DONE,
+ Source<DataTypeManager>(&manager_),
+ Details<DataTypeManager::ConfigureResultWithErrorLocation>(
+ &result_with_location));
}
ProfileSyncService* service() { return &service_; }
« no previous file with comments | « chrome/browser/sync/backend_migrator.cc ('k') | chrome/browser/sync/glue/app_model_associator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698