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

chrome/browser/sync/glue/frontend_data_type_controller.cc

Index: chrome/browser/sync/glue/frontend_data_type_controller.cc
===================================================================
--- chrome/browser/sync/glue/frontend_data_type_controller.cc	(revision 94142)
+++ chrome/browser/sync/glue/frontend_data_type_controller.cc	(working copy)
@@ -6,7 +6,6 @@
 
 #include "base/logging.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/sync/api/sync_error.h"
 #include "chrome/browser/sync/glue/change_processor.h"
 #include "chrome/browser/sync/glue/model_associator.h"
 #include "chrome/browser/sync/profile_sync_factory.h"
@@ -93,11 +92,10 @@
   }
 
   base::TimeTicks start_time = base::TimeTicks::Now();
-  SyncError error;
-  bool merge_success = model_associator()->AssociateModels(&error);
+  bool merge_success = model_associator()->AssociateModels();
   RecordAssociationTime(base::TimeTicks::Now() - start_time);
   if (!merge_success) {
-    StartFailed(ASSOCIATION_FAILED, error.location());
+    StartFailed(ASSOCIATION_FAILED, FROM_HERE);
     return false;
   }
 
@@ -107,8 +105,7 @@
   return true;
 }
 
-void FrontendDataTypeController::StartFailed(
-    StartResult result,
+void FrontendDataTypeController::StartFailed(StartResult result,
     const tracked_objects::Location& location) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   CleanUpState();
@@ -121,12 +118,10 @@
   // invoking the callback will trigger a call to STOP(), which will get
   // confused by the non-NULL start_callback_.
   scoped_ptr<StartCallback> callback(start_callback_.release());
-  // TODO(zea): Send the full SyncError on failure and handle it higher up.
   callback->Run(result, location);
 }
 
-void FrontendDataTypeController::FinishStart(
-    StartResult result,
+void FrontendDataTypeController::FinishStart(StartResult result,
     const tracked_objects::Location& location) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
@@ -154,10 +149,8 @@
   if (change_processor_.get())
     sync_service_->DeactivateDataType(this, change_processor_.get());
 
-  if (model_associator()) {
-    SyncError error;
-    model_associator()->DisassociateModels(&error);
-  }
+  if (model_associator())
+    model_associator()->DisassociateModels();
 
   set_model_associator(NULL);
   change_processor_.reset();