Revert 288464 "[Sync] Cleanup datatype configuration error handl..."

trunk/src/components/sync_driver/non_ui_data_type_controller_mock.h

Index: trunk/src/components/sync_driver/non_ui_data_type_controller_mock.h
===================================================================
--- trunk/src/components/sync_driver/non_ui_data_type_controller_mock.h	(revision 289114)
+++ trunk/src/components/sync_driver/non_ui_data_type_controller_mock.h	(working copy)
@@ -37,16 +37,16 @@
                bool(const tracked_objects::Location&,
                     const base::Closure&));
   MOCK_METHOD3(StartDone,
-               void(DataTypeController::ConfigureResult result,
+               void(DataTypeController::StartResult result,
                     const syncer::SyncMergeResult& local_merge_result,
                     const syncer::SyncMergeResult& syncer_merge_result));
   MOCK_METHOD4(StartDoneImpl,
-               void(DataTypeController::ConfigureResult result,
+               void(DataTypeController::StartResult result,
                     DataTypeController::State new_state,
                     const syncer::SyncMergeResult& local_merge_result,
                     const syncer::SyncMergeResult& syncer_merge_result));
   MOCK_METHOD1(RecordAssociationTime, void(base::TimeDelta time));
-  MOCK_METHOD1(RecordStartFailure, void(ConfigureResult result));
+  MOCK_METHOD1(RecordStartFailure, void(StartResult result));
 
  protected:
   virtual ~NonUIDataTypeControllerMock();