Revert 289115 "Revert 288464 "[Sync] Cleanup datatype configurat..."

trunk/src/chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc

Index: trunk/src/chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc
===================================================================
--- trunk/src/chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc	(revision 289352)
+++ trunk/src/chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc	(working copy)
@@ -158,7 +158,7 @@
   }
 
   // Passed to AutofillDTC::Start().
-  void OnStartFinished(sync_driver::DataTypeController::StartResult result,
+  void OnStartFinished(sync_driver::DataTypeController::ConfigureResult result,
                        const syncer::SyncMergeResult& local_merge_result,
                        const syncer::SyncMergeResult& syncer_merge_result) {
     last_start_result_ = result;
@@ -189,7 +189,7 @@
   scoped_refptr<AutofillDataTypeController> autofill_dtc_;
 
   // Stores arguments of most recent call of OnStartFinished().
-  sync_driver::DataTypeController::StartResult last_start_result_;
+  sync_driver::DataTypeController::ConfigureResult last_start_result_;
   syncer::SyncError last_start_error_;
   base::WeakPtrFactory<SyncAutofillDataTypeControllerTest> weak_ptr_factory_;
 };