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

chrome/browser/sync/glue/session_model_associator.cc

Index: chrome/browser/sync/glue/session_model_associator.cc
===================================================================
--- chrome/browser/sync/glue/session_model_associator.cc	(revision 94142)
+++ chrome/browser/sync/glue/session_model_associator.cc	(working copy)
@@ -14,7 +14,6 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/restore_tab_helper.h"
 #include "chrome/browser/sessions/session_service_factory.h"
-#include "chrome/browser/sync/api/sync_error.h"
 #include "chrome/browser/sync/glue/synced_window_delegate.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/syncable/syncable.h"
@@ -408,7 +407,7 @@
   // TODO(zea): we will need this once we support deleting foreign sessions.
 }
 
-bool SessionModelAssociator::AssociateModels(SyncError* error) {
+bool SessionModelAssociator::AssociateModels() {
   DCHECK(CalledOnValidThread());
 
   // Ensure that we disassociated properly, otherwise memory might leak.
@@ -424,7 +423,7 @@
 
     sync_api::ReadNode root(&trans);
     if (!root.InitByTagLookup(kSessionsTag)) {
-      error->Reset(FROM_HERE, kNoSessionsFolderError, model_type());
+      LOG(ERROR) << kNoSessionsFolderError;
       return false;
     }
 
@@ -439,9 +438,7 @@
       sync_api::WriteNode write_node(&trans);
       if (!write_node.InitUniqueByCreation(syncable::SESSIONS, root,
           current_machine_tag_)) {
-        error->Reset(FROM_HERE,
-                     "Failed to create sessions header sync node.",
-                     model_type());
+        LOG(ERROR) << "Failed to create sessions header sync node.";
         return false;
       }
       write_node.SetTitle(UTF8ToWide(current_machine_tag_));
@@ -457,7 +454,7 @@
   return true;
 }
 
-bool SessionModelAssociator::DisassociateModels(SyncError* error) {
+bool SessionModelAssociator::DisassociateModels() {
   DCHECK(CalledOnValidThread());
   synced_session_tracker_.clear();
   tab_map_.clear();