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

Unified Diff: chrome/browser/sync/glue/data_type_manager_impl_unittest.cc

Issue 7453014: [Sync] Refactor sync datatype error handling. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase and fix final unit test <3 c++ 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
diff --git a/chrome/browser/sync/glue/data_type_manager_impl_unittest.cc b/chrome/browser/sync/glue/data_type_manager_impl_unittest.cc
index 24dbe9c0551dce0cb956d379a1b30fb13fde4632..e21e6801ee9f31ff6ba05a2e0eac9bc27798fdfa 100644
--- a/chrome/browser/sync/glue/data_type_manager_impl_unittest.cc
+++ b/chrome/browser/sync/glue/data_type_manager_impl_unittest.cc
@@ -53,12 +53,12 @@ ACTION_P2(InvokeCallbackPointer, callback, argument) {
delete callback;
}
-DataTypeManager::ConfigureResult GetResult(
+DataTypeManager::ConfigureStatus GetStatus(
const NotificationDetails& details) {
- DataTypeManager::ConfigureResultWithErrorLocation* result_with_location =
- Details<DataTypeManager::ConfigureResultWithErrorLocation>(
+ const DataTypeManager::ConfigureResult* result =
+ Details<const DataTypeManager::ConfigureResult>(
details).ptr();
- return result_with_location->result;
+ return result->status;
}
class DataTypeManagerImplTest : public testing::Test {
@@ -149,11 +149,11 @@ class DataTypeManagerImplTest : public testing::Test {
}
- void SetConfigureDoneExpectation(DataTypeManager::ConfigureResult result) {
+ void SetConfigureDoneExpectation(DataTypeManager::ConfigureStatus status) {
EXPECT_CALL(
observer_,
Observe(int(chrome::NOTIFICATION_SYNC_CONFIGURE_DONE), _,
- ::testing::ResultOf(&GetResult, result)));
+ ::testing::ResultOf(&GetStatus, status)));
}
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