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

Unified Diff: chrome/browser/sync/glue/data_type_manager_impl_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
Index: chrome/browser/sync/glue/data_type_manager_impl_unittest.cc
===================================================================
--- chrome/browser/sync/glue/data_type_manager_impl_unittest.cc (revision 94142)
+++ chrome/browser/sync/glue/data_type_manager_impl_unittest.cc (working copy)
@@ -53,12 +53,12 @@
delete callback;
}
-DataTypeManager::ConfigureStatus GetStatus(
+DataTypeManager::ConfigureResult GetResult(
const NotificationDetails& details) {
- const DataTypeManager::ConfigureResult* result =
- Details<const DataTypeManager::ConfigureResult>(
+ DataTypeManager::ConfigureResultWithErrorLocation* result_with_location =
+ Details<DataTypeManager::ConfigureResultWithErrorLocation>(
details).ptr();
- return result->status;
+ return result_with_location->result;
}
class DataTypeManagerImplTest : public testing::Test {
@@ -149,11 +149,11 @@
}
- void SetConfigureDoneExpectation(DataTypeManager::ConfigureStatus status) {
+ void SetConfigureDoneExpectation(DataTypeManager::ConfigureResult result) {
EXPECT_CALL(
observer_,
Observe(int(chrome::NOTIFICATION_SYNC_CONFIGURE_DONE), _,
- ::testing::ResultOf(&GetStatus, status)));
+ ::testing::ResultOf(&GetResult, result)));
}
MessageLoopForUI message_loop_;
« no previous file with comments | « chrome/browser/sync/glue/data_type_manager_impl.cc ('k') | chrome/browser/sync/glue/data_type_manager_mock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698