Index: trunk/src/chrome/browser/sync/glue/non_frontend_data_type_controller.cc |
=================================================================== |
--- trunk/src/chrome/browser/sync/glue/non_frontend_data_type_controller.cc (revision 289114) |
+++ trunk/src/chrome/browser/sync/glue/non_frontend_data_type_controller.cc (working copy) |
@@ -340,7 +340,7 @@ |
} |
void NonFrontendDataTypeController::StartDone( |
- DataTypeController::ConfigureResult start_result, |
+ DataTypeController::StartResult start_result, |
const syncer::SyncMergeResult& local_merge_result, |
const syncer::SyncMergeResult& syncer_merge_result) { |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
@@ -359,7 +359,7 @@ |
} |
void NonFrontendDataTypeController::StartDoneImpl( |
- DataTypeController::ConfigureResult start_result, |
+ DataTypeController::StartResult start_result, |
DataTypeController::State new_state, |
const syncer::SyncMergeResult& local_merge_result, |
const syncer::SyncMergeResult& syncer_merge_result) { |
@@ -398,7 +398,7 @@ |
#undef PER_DATA_TYPE_MACRO |
} |
-void NonFrontendDataTypeController::RecordStartFailure(ConfigureResult result) { |
+void NonFrontendDataTypeController::RecordStartFailure(StartResult result) { |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
UMA_HISTOGRAM_ENUMERATION("Sync.DataTypeStartFailures", |
ModelTypeToHistogramInt(type()), |