| 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 32e6ce7618b183d14a4f2f58b58bfdc1a5348830..9be241aabe6d6d896a25b3b4ac95b72e0a155ff4 100644
|
| --- a/chrome/browser/sync/glue/data_type_manager_impl_unittest.cc
|
| +++ b/chrome/browser/sync/glue/data_type_manager_impl_unittest.cc
|
| @@ -54,12 +54,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 {
|
| @@ -150,11 +150,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_;
|
|
|