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

chrome/browser/sync/glue/autofill_profile_model_associator.cc

Index: chrome/browser/sync/glue/autofill_profile_model_associator.cc
===================================================================
--- chrome/browser/sync/glue/autofill_profile_model_associator.cc	(revision 94142)
+++ chrome/browser/sync/glue/autofill_profile_model_associator.cc	(working copy)
@@ -6,7 +6,6 @@
 
 #include "base/tracked.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/sync/api/sync_error.h"
 #include "chrome/browser/sync/glue/autofill_profile_change_processor.h"
 #include "chrome/browser/sync/glue/do_optimistic_refresh_task.h"
 #include "chrome/browser/sync/profile_sync_service.h"
@@ -137,7 +136,7 @@
   return true;
 }
 
-bool AutofillProfileModelAssociator::AssociateModels(SyncError* error) {
+bool AutofillProfileModelAssociator::AssociateModels() {
   VLOG(1) << "Associating Autofill Models";
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
   {
@@ -148,9 +147,7 @@
   ScopedVector<AutofillProfile> profiles;
 
   if (!LoadAutofillData(&profiles.get())) {
-    error->Reset(FROM_HERE,
-                 "Could not get the autofill data from WebDatabase.",
-                 model_type());
+    LOG(ERROR) << "Could not get the autofill data from WebDatabase.";
     return false;
   }
 
@@ -165,10 +162,8 @@
 
     sync_api::ReadNode autofill_root(&trans);
     if (!autofill_root.InitByTagLookup(kAutofillProfileTag)) {
-      error->Reset(FROM_HERE,
-                   "Server did not create the top-level autofill node. We "
-                   "might be running against an out-of-date server.",
-                   model_type());
+      LOG(ERROR) << "Server did not create the top-level autofill node. We "
+                 << "might be running against an out-of-date server.";
       return false;
     }
 
@@ -178,15 +173,12 @@
             &bundle.new_profiles,
             &bundle.profiles_to_delete) ||
         !TraverseAndAssociateAllSyncNodes(&trans, autofill_root, &bundle)) {
-      error->Reset(FROM_HERE,
-                   "Failed to associate all sync nodes.",
-                   model_type());
       return false;
     }
   }
 
   if (!SaveChangesToWebData(bundle)) {
-    error->Reset(FROM_HERE, "Failed to update webdata.", model_type());
+    LOG(ERROR) << "Failed to update autofill entries.";
     return false;
   }
 
@@ -195,7 +187,7 @@
   return true;
 }
 
-bool AutofillProfileModelAssociator::DisassociateModels(SyncError* error) {
+bool AutofillProfileModelAssociator::DisassociateModels() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
   id_map_.clear();
   id_map_inverse_.clear();