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

> Revert 288464 "[Sync] Cleanup datatype configuration error handl..."
> 
> Reason for revert: see crbug.com/403098
> 
> > [Sync] Cleanup datatype configuration error handling.
> > 
> > The FailedDataTypeHandler is now informed immediately of failures, including
> > datatype errors, and is therefore authoritative source for all errors. As such,
> > partial success is no longer tracked and the various ModelTypeSets for error
> > types in configure results are removed.
> > 
> > BUG=368834,403098
> > 
> > Review URL: https://codereview.chromium.org/420633002
> 
> TBR=zea@chromium.org
> 
> Review URL: https://codereview.chromium.org/468643002

TBR=oshima@chromium.org

Review URL: https://codereview.chromium.org/469803004

Cr-Commit-Position: refs/heads/master@{#289354}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289354 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 3 deletions

diff --git a/components/sync_driver/non_ui_data_type_controller_mock.h b/components/sync_driver/non_ui_data_type_controller_mock.h
index 68f889f..1369c33 100644
--- a/components/sync_driver/non_ui_data_type_controller_mock.h
+++ b/components/sync_driver/non_ui_data_type_controller_mock.h
@@ -37,16 +37,16 @@ class NonUIDataTypeControllerMock
                bool(const tracked_objects::Location&,
                     const base::Closure&));
   MOCK_METHOD3(StartDone,
-               void(DataTypeController::StartResult result,
+               void(DataTypeController::ConfigureResult result,
                     const syncer::SyncMergeResult& local_merge_result,
                     const syncer::SyncMergeResult& syncer_merge_result));
   MOCK_METHOD4(StartDoneImpl,
-               void(DataTypeController::StartResult result,
+               void(DataTypeController::ConfigureResult 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(StartResult result));
+  MOCK_METHOD1(RecordStartFailure, void(ConfigureResult result));
 
  protected:
   virtual ~NonUIDataTypeControllerMock();