Propagate more information about ValueStore errors to callers, notably an

chrome/browser/sync/test/integration/extension_settings_helper.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/sync/test/integration/extension_settings_helper.h"
 
 #include "base/bind.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 18 matching lines @@
 namespace {
 
 std::string ToJson(const Value& value) {
   std::string json;
   base::JSONWriter::WriteWithOptions(&value,
                                      base::JSONWriter::OPTIONS_PRETTY_PRINT,
                                      &json);
   return json;
 }
 
-void GetAllSettingsOnFileThread(
-    scoped_ptr<DictionaryValue>* out,
-    base::WaitableEvent* signal,
-    ValueStore* storage) {
+void GetAllSettingsOnFileThread(DictionaryValue* out,
+                                base::WaitableEvent* signal,
+                                ValueStore* storage) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-  out->swap(storage->Get()->settings());
+  out->Swap(&storage->Get()->settings());
   signal->Signal();
 }
 
 scoped_ptr<DictionaryValue> GetAllSettings(
     Profile* profile, const std::string& id) {
   base::WaitableEvent signal(false, false);
-  scoped_ptr<DictionaryValue> settings;
+  scoped_ptr<DictionaryValue> settings(new DictionaryValue());
   profile->GetExtensionService()->settings_frontend()->RunWithStorage(
       id,
       extensions::settings_namespace::SYNC,
-      base::Bind(&GetAllSettingsOnFileThread, &settings, &signal));
+      base::Bind(&GetAllSettingsOnFileThread, settings.get(), &signal));
   signal.Wait();
   return settings.Pass();
 }
 
 bool AreSettingsSame(Profile* expected_profile, Profile* actual_profile) {
   const ExtensionSet* extensions =
       expected_profile->GetExtensionService()->extensions();
   if (extensions->size() !=
       actual_profile->GetExtensionService()->extensions()->size()) {
     ADD_FAILURE();
@@ skipping 47 matching lines @@
   bool all_profiles_same = true;
   for (int i = 0; i < test()->num_clients(); ++i) {
     // &= so that all profiles are tested; analogous to EXPECT over ASSERT.
     all_profiles_same &=
         AreSettingsSame(test()->verifier(), test()->GetProfile(i));
   }
   return all_profiles_same;
 }
 
 }  // namespace extension_settings_helper