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

chrome/browser/sync/glue/autofill_model_associator.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_SYNC_GLUE_AUTOFILL_MODEL_ASSOCIATOR_H_
 #define CHROME_BROWSER_SYNC_GLUE_AUTOFILL_MODEL_ASSOCIATOR_H_
 #pragma once
 
 #include <map>
 #include <set>
@@ skipping 36 matching lines @@
  public:
   static syncable::ModelType model_type() { return syncable::AUTOFILL; }
   AutofillModelAssociator(ProfileSyncService* sync_service,
                           WebDatabase* web_database,
                           PersonalDataManager* data_manager);
   virtual ~AutofillModelAssociator();
 
   // PerDataTypeAssociatorInterface implementation.
   //
   // Iterates through the sync model looking for matched pairs of items.
-  virtual bool AssociateModels(SyncError* error);
+  virtual bool AssociateModels();
 
   // Clears all associations.
-  virtual bool DisassociateModels(SyncError* error);
+  virtual bool DisassociateModels();
 
   // The has_nodes out param is true if the sync model has nodes other
   // than the permanent tagged nodes.
   virtual bool SyncModelHasUserCreatedNodes(bool* has_nodes);
 
   // See ModelAssociator interface.
   virtual void AbortAssociation();
 
   // See ModelAssociator interface.
   virtual bool CryptoReadyIfNecessary();
@@ skipping 108 matching lines @@
   // AssociateModels method as soon as possible.
   base::Lock abort_association_pending_lock_;
   bool abort_association_pending_;
 
   DISALLOW_COPY_AND_ASSIGN(AutofillModelAssociator);
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_GLUE_AUTOFILL_MODEL_ASSOCIATOR_H_