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

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

Index: trunk/src/chrome/browser/sync/glue/frontend_data_type_controller_unittest.cc
===================================================================
--- trunk/src/chrome/browser/sync/glue/frontend_data_type_controller_unittest.cc	(revision 289352)
+++ trunk/src/chrome/browser/sync/glue/frontend_data_type_controller_unittest.cc	(working copy)
@@ -75,7 +75,7 @@
     mock_->RecordAssociationTime(time);
   }
   virtual void RecordStartFailure(
-      DataTypeController::StartResult result) OVERRIDE {
+      DataTypeController::ConfigureResult result) OVERRIDE {
     mock_->RecordStartFailure(result);
   }
  private:
@@ -120,7 +120,7 @@
     EXPECT_CALL(*dtc_mock_.get(), RecordAssociationTime(_));
   }
 
-  void SetActivateExpectations(DataTypeController::StartResult result) {
+  void SetActivateExpectations(DataTypeController::ConfigureResult result) {
     EXPECT_CALL(start_callback_, Run(result, _, _));
   }
 
@@ -131,7 +131,7 @@
                 WillOnce(Return(syncer::SyncError()));
   }
 
-  void SetStartFailExpectations(DataTypeController::StartResult result) {
+  void SetStartFailExpectations(DataTypeController::ConfigureResult result) {
     if (DataTypeController::IsUnrecoverableResult(result))
       EXPECT_CALL(*dtc_mock_.get(), RecordUnrecoverableError(_, _));
     EXPECT_CALL(*dtc_mock_.get(), CleanUpState());