Propagate more information about ValueStore errors to callers, notably an

chrome/browser/value_store/value_store_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/value_store/value_store_unittest.h"
 
 #include "base/json/json_writer.h"
 #include "base/values.h"
 
 using content::BrowserThread;
@@ skipping 38 matching lines @@
 }
 
 // Returns whether the read result of a storage operation has the expected
 // settings.
 testing::AssertionResult SettingsEq(
     const char* _1, const char* _2,
     const DictionaryValue& expected,
     ValueStore::ReadResult actual_result) {
   if (actual_result->HasError()) {
     return testing::AssertionFailure() <<
-        "Result has error: " << actual_result->error();
+        "Result has error: " << actual_result->error().message;
   }
 
   std::string error;
-  if (!ValuesEqual(&expected, actual_result->settings().get(), &error)) {
+  if (!ValuesEqual(&expected, &actual_result->settings(), &error)) {
     return testing::AssertionFailure() << error;
   }
 
   return testing::AssertionSuccess();
 }
 
 // Returns whether the write result of a storage operation has the expected
 // changes.
 testing::AssertionResult ChangesEq(
     const char* _1, const char* _2,
     const ValueStoreChangeList& expected,
     ValueStore::WriteResult actual_result) {
   if (actual_result->HasError()) {
     return testing::AssertionFailure() <<
-        "Result has error: " << actual_result->error();
+        "Result has error: " << actual_result->error().message;
   }
 
   const ValueStoreChangeList& actual = actual_result->changes();
   if (expected.size() != actual.size()) {
     return testing::AssertionFailure() <<
         "Actual has wrong size, expecting " << expected.size() <<
         " but was " << actual.size();
   }
 
   std::map<std::string, linked_ptr<ValueStoreChange> > expected_as_map;
@@ skipping 381 matching lines @@
   }
   {
     ValueStoreChangeList changes;
     changes.push_back(ValueStoreChange(key3_, val3_->DeepCopy(), NULL));
     changes.push_back(
         ValueStoreChange("qwerty", val3_->DeepCopy(), NULL));
     EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Clear());
     EXPECT_PRED_FORMAT2(ChangesEq, ValueStoreChangeList(), storage_->Clear());
   }
 }