| Index: chrome/browser/sync/glue/frontend_data_type_controller.cc
|
| diff --git a/chrome/browser/sync/glue/frontend_data_type_controller.cc b/chrome/browser/sync/glue/frontend_data_type_controller.cc
|
| index b7f31ac6476b1f4a825082f9f4eba1368a470cff..89ae6ad0f581e63ca921edefc11d325a848a0b72 100644
|
| --- a/chrome/browser/sync/glue/frontend_data_type_controller.cc
|
| +++ b/chrome/browser/sync/glue/frontend_data_type_controller.cc
|
| @@ -165,6 +165,21 @@ bool FrontendDataTypeController::StartModels() {
|
| return true;
|
| }
|
|
|
| +void FrontendDataTypeController::RecordUnrecoverableError(
|
| + const tracked_objects::Location& from_here,
|
| + const std::string& message) {
|
| + DVLOG(1) << "Datatype Controller failed for type "
|
| + << ModelTypeToString(type()) << " "
|
| + << message << " at location "
|
| + << from_here.ToString();
|
| + UMA_HISTOGRAM_ENUMERATION("Sync.DataTypeRunFailures",
|
| + ModelTypeToHistogramInt(type()),
|
| + syncer::MODEL_TYPE_COUNT);
|
| +
|
| + if (!error_callback_.is_null())
|
| + error_callback_.Run();
|
| +}
|
| +
|
| bool FrontendDataTypeController::Associate() {
|
| DCHECK_EQ(state_, ASSOCIATING);
|
| syncer::SyncMergeResult local_merge_result(type());
|
|
|