| Index: chrome/browser/sync/glue/data_type_manager_mock.h
|
| diff --git a/chrome/browser/sync/glue/data_type_manager_mock.h b/chrome/browser/sync/glue/data_type_manager_mock.h
|
| index 132216ffcdb3da76ff90b90449a7fa69fad3e557..e26dcc09ef368885ac18b023cc606354aa10f0e9 100644
|
| --- a/chrome/browser/sync/glue/data_type_manager_mock.h
|
| +++ b/chrome/browser/sync/glue/data_type_manager_mock.h
|
| @@ -16,19 +16,19 @@
|
|
|
| ACTION_P2(InvokeCallback, datatype, callback_result) {
|
| if (callback_result != browser_sync::DataTypeController::OK) {
|
| - SyncError error(FROM_HERE, "Error message", datatype);
|
| + csync::SyncError error(FROM_HERE, "Error message", datatype);
|
| arg0.Run(callback_result, error);
|
| } else {
|
| - arg0.Run(callback_result, SyncError());
|
| + arg0.Run(callback_result, csync::SyncError());
|
| }
|
| }
|
|
|
| ACTION_P3(InvokeCallbackPointer, callback, datatype, callback_result) {
|
| if (callback_result != browser_sync::DataTypeController::OK) {
|
| - SyncError error(FROM_HERE, "Error message", datatype);
|
| + csync::SyncError error(FROM_HERE, "Error message", datatype);
|
| callback.Run(callback_result, error);
|
| } else {
|
| - callback.Run(callback_result, SyncError());
|
| + callback.Run(callback_result, csync::SyncError());
|
| }
|
| }
|
|
|
|
|