Propagate more information about ValueStore errors to callers, notably an

chrome/browser/value_store/value_store.cc

Index: chrome/browser/value_store/value_store.cc
diff --git a/chrome/browser/value_store/value_store.cc b/chrome/browser/value_store/value_store.cc
index 9d7c796ef92ac3f65951dc581b6890051756ea4f..380dc8494206cd25fbacf4ed831dbb555a9954f6 100644
--- a/chrome/browser/value_store/value_store.cc
+++ b/chrome/browser/value_store/value_store.cc
@@ -6,58 +6,40 @@
 
 #include "base/logging.h"
 
-// Implementation of ReadResultType.
+// Implementation of Error.
 
-ValueStore::ReadResultType::ReadResultType(DictionaryValue* settings)
-    : settings_(settings) {
-  DCHECK(settings);
-}
+ValueStore::Error::Error(ErrorCode code,
+                         const std::string& message,
+                         scoped_ptr<std::string> key)
+    : code(code), message(message), key(key.Pass()) {}
 
-ValueStore::ReadResultType::ReadResultType(const std::string& error)
-    : error_(error) {
-  DCHECK(!error.empty());
-}
+ValueStore::Error::~Error() {}
 
-ValueStore::ReadResultType::~ReadResultType() {}
+// Implementation of ReadResultType.
 
-bool ValueStore::ReadResultType::HasError() const {
-  return !error_.empty();
+ValueStore::ReadResultType::ReadResultType(scoped_ptr<DictionaryValue> settings)
+    : settings_(settings.Pass()) {
+  CHECK(settings_);
 }
 
-scoped_ptr<DictionaryValue>& ValueStore::ReadResultType::settings() {
-  DCHECK(!HasError());
-  return settings_;
+ValueStore::ReadResultType::ReadResultType(scoped_ptr<Error> error)
+    : error_(error.Pass()) {
+  CHECK(error_);
 }
 
-const std::string& ValueStore::ReadResultType::error() const {
-  DCHECK(HasError());
-  return error_;
-}
+ValueStore::ReadResultType::~ReadResultType() {}
 
 // Implementation of WriteResultType.
 
-ValueStore::WriteResultType::WriteResultType(ValueStoreChangeList* changes)
-    : changes_(changes) {
-  DCHECK(changes);
+ValueStore::WriteResultType::WriteResultType(
+    scoped_ptr<ValueStoreChangeList> changes)
+    : changes_(changes.Pass()) {
+  CHECK(changes_);
 }
 
-ValueStore::WriteResultType::WriteResultType(const std::string& error)
-    : error_(error) {
-  DCHECK(!error.empty());
+ValueStore::WriteResultType::WriteResultType(scoped_ptr<Error> error)
+    : error_(error.Pass()) {
+  CHECK(error_);
 }
 
 ValueStore::WriteResultType::~WriteResultType() {}
-
-bool ValueStore::WriteResultType::HasError() const {
-  return !error_.empty();
-}
-
-const ValueStoreChangeList& ValueStore::WriteResultType::changes() const {
-  DCHECK(!HasError());
-  return *changes_;
-}
-
-const std::string& ValueStore::WriteResultType::error() const {
-  DCHECK(HasError());
-  return error_;
-}