Revert 94128 - [Sync] Refactor sync datatype error handling.

chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc

Index: chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc
===================================================================
--- chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc	(revision 94142)
+++ chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc	(working copy)
@@ -124,7 +124,7 @@
         WillRepeatedly(Return(true));
     EXPECT_CALL(*model_associator_, SyncModelHasUserCreatedNodes(_)).
         WillRepeatedly(DoAll(SetArgumentPointee<0>(true), Return(true)));
-    EXPECT_CALL(*model_associator_, AssociateModels(_)).
+    EXPECT_CALL(*model_associator_, AssociateModels()).
         WillRepeatedly(Return(true));
     EXPECT_CALL(service_, ActivateDataType(_, _));
     EXPECT_CALL(*change_processor_, IsRunning()).WillRepeatedly(Return(true));
@@ -132,7 +132,7 @@
 
   void SetStopExpectations() {
     EXPECT_CALL(service_, DeactivateDataType(_, _));
-    EXPECT_CALL(*model_associator_, DisassociateModels(_));
+    EXPECT_CALL(*model_associator_, DisassociateModels());
   }
 
   void WaitForEmptyDBMessageLoop() {
@@ -259,7 +259,7 @@
       WillRepeatedly(Return(true));
   EXPECT_CALL(*model_associator_, SyncModelHasUserCreatedNodes(_)).
       WillRepeatedly(DoAll(SetArgumentPointee<0>(true), Return(true)));
-  EXPECT_CALL(*model_associator_, AssociateModels(_)).
+  EXPECT_CALL(*model_associator_, AssociateModels()).
       WillRepeatedly(Return(true));
   EXPECT_CALL(*change_processor_, IsRunning()).WillRepeatedly(Return(true));