Index: chrome/browser/sync/glue/theme_model_associator.cc |
diff --git a/chrome/browser/sync/glue/theme_model_associator.cc b/chrome/browser/sync/glue/theme_model_associator.cc |
index e53b021620db3224d18f59d807d6dd5d099efcc9..10eda60da79343b23628b634351f724ee803ea5d 100644 |
--- a/chrome/browser/sync/glue/theme_model_associator.cc |
+++ b/chrome/browser/sync/glue/theme_model_associator.cc |
@@ -8,6 +8,7 @@ |
#include "base/logging.h" |
#include "base/tracked.h" |
#include "base/utf_string_conversions.h" |
+#include "chrome/browser/sync/api/sync_error.h" |
#include "chrome/browser/sync/engine/syncapi.h" |
#include "chrome/browser/sync/glue/sync_backend_host.h" |
#include "chrome/browser/sync/glue/theme_util.h" |
@@ -35,11 +36,11 @@ ThemeModelAssociator::ThemeModelAssociator( |
ThemeModelAssociator::~ThemeModelAssociator() {} |
-bool ThemeModelAssociator::AssociateModels() { |
+bool ThemeModelAssociator::AssociateModels(SyncError* error) { |
sync_api::WriteTransaction trans(FROM_HERE, sync_service_->GetUserShare()); |
sync_api::ReadNode root(&trans); |
if (!root.InitByTagLookup(kThemesTag)) { |
- LOG(ERROR) << kNoThemesFolderError; |
+ error->reset(FROM_HERE, kNoThemesFolderError, model_type()); |
return false; |
} |
@@ -62,7 +63,9 @@ bool ThemeModelAssociator::AssociateModels() { |
sync_api::WriteNode node(&trans); |
if (!node.InitUniqueByCreation(syncable::THEMES, root, |
kCurrentThemeClientTag)) { |
- LOG(ERROR) << "Could not create current theme node."; |
+ error->reset(FROM_HERE, |
+ "Could not create current theme node.", |
+ model_type()); |
return false; |
} |
node.SetIsFolder(false); |
@@ -74,7 +77,7 @@ bool ThemeModelAssociator::AssociateModels() { |
return true; |
} |
-bool ThemeModelAssociator::DisassociateModels() { |
+bool ThemeModelAssociator::DisassociateModels(SyncError* error) { |
// We don't maintain any association state, so nothing to do. |
return true; |
} |