Reland 87645 with clang fixes.

chrome/browser/sync/glue/extension_model_associator.cc

Index: chrome/browser/sync/glue/extension_model_associator.cc
diff --git a/chrome/browser/sync/glue/extension_model_associator.cc b/chrome/browser/sync/glue/extension_model_associator.cc
index 46594b6d5f0c2a23d80ad8fd0bcf26241cb04811..fbe0e0d1a8e4d686f61acde0a784eecf6daa55a9 100644
--- a/chrome/browser/sync/glue/extension_model_associator.cc
+++ b/chrome/browser/sync/glue/extension_model_associator.cc
@@ -32,22 +32,24 @@ ExtensionModelAssociator::~ExtensionModelAssociator() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
 
-bool ExtensionModelAssociator::AssociateModels() {
+bool ExtensionModelAssociator::AssociateModels(SyncError* error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   ExtensionDataMap extension_data_map;
   if (!SlurpExtensionData(
           traits_, *extension_service_, user_share_, &extension_data_map)) {
+    error->Reset(FROM_HERE, "Failed to get extension data.", model_type());
     return false;
   }
   if (!FlushExtensionData(
           traits_, extension_data_map, extension_service_, user_share_)) {
+    error->Reset(FROM_HERE, "Failed to flush extension data.", model_type());
     return false;
   }
 
   return true;
 }
 
-bool ExtensionModelAssociator::DisassociateModels() {
+bool ExtensionModelAssociator::DisassociateModels(SyncError* error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   // Nothing to do.
   return true;