Re-commit 106660 with the crashing test disabled.

chrome/browser/extensions/in_memory_extension_settings_storage.cc

 // Copyright (c) 2011 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/extensions/in_memory_extension_settings_storage.h"
 
 namespace {
 
 std::vector<std::string> CreateVector(const std::string& string) {
   std::vector<std::string> strings;
@@ skipping 11 matching lines @@
 ExtensionSettingsStorage::Result InMemoryExtensionSettingsStorage::Get(
     const std::vector<std::string>& keys) {
   DictionaryValue* settings = new DictionaryValue();
   for (std::vector<std::string>::const_iterator it = keys.begin();
       it != keys.end(); ++it) {
     Value* value = NULL;
     if (storage_.GetWithoutPathExpansion(*it, &value)) {
       settings->SetWithoutPathExpansion(*it, value->DeepCopy());
     }
   }
-  return Result(settings, NULL);
+  return Result(settings, NULL, NULL);
 }
 
 ExtensionSettingsStorage::Result InMemoryExtensionSettingsStorage::Get() {
-  return Result(storage_.DeepCopy(), NULL);
+  return Result(storage_.DeepCopy(), NULL, NULL);
 }
 
 ExtensionSettingsStorage::Result InMemoryExtensionSettingsStorage::Set(
     const std::string& key, const Value& value) {
   DictionaryValue settings;
   settings.SetWithoutPathExpansion(key, value.DeepCopy());
   return Set(settings);
 }
 
 ExtensionSettingsStorage::Result InMemoryExtensionSettingsStorage::Set(
     const DictionaryValue& settings) {
+  DictionaryValue* old_settings = new DictionaryValue();
   std::set<std::string>* changed_keys = new std::set<std::string>();
   for (DictionaryValue::key_iterator it = settings.begin_keys();
       it != settings.end_keys(); ++it) {
     Value* old_value = NULL;
-    storage_.GetWithoutPathExpansion(*it, &old_value);
+    if (storage_.GetWithoutPathExpansion(*it, &old_value)) {
+      old_settings->SetWithoutPathExpansion(*it, old_value->DeepCopy());
+    }
     Value* new_value = NULL;
     settings.GetWithoutPathExpansion(*it, &new_value);
     if (old_value == NULL || !old_value->Equals(new_value)) {
       changed_keys->insert(*it);
       storage_.SetWithoutPathExpansion(*it, new_value->DeepCopy());
     }
   }
-  return Result(settings.DeepCopy(), changed_keys);
+  return Result(settings.DeepCopy(), old_settings, changed_keys);
 }
 
 ExtensionSettingsStorage::Result InMemoryExtensionSettingsStorage::Remove(
     const std::string& key) {
   return Remove(CreateVector(key));
 }
 
 ExtensionSettingsStorage::Result InMemoryExtensionSettingsStorage::Remove(
     const std::vector<std::string>& keys) {
+  DictionaryValue* old_settings = new DictionaryValue();
   std::set<std::string>* changed_keys = new std::set<std::string>();
   for (std::vector<std::string>::const_iterator it = keys.begin();
       it != keys.end(); ++it) {
-    if (storage_.RemoveWithoutPathExpansion(*it, NULL)) {
+    Value* old_value = NULL;
+    if (storage_.RemoveWithoutPathExpansion(*it, &old_value)) {
+      old_settings->SetWithoutPathExpansion(*it, old_value);
       changed_keys->insert(*it);
     }
   }
-  return Result(NULL, changed_keys);
+  return Result(NULL, old_settings, changed_keys);
 }
 
 ExtensionSettingsStorage::Result InMemoryExtensionSettingsStorage::Clear() {
   std::set<std::string>* changed_keys = new std::set<std::string>();
   for (DictionaryValue::key_iterator it = storage_.begin_keys();
       it != storage_.end_keys(); ++it) {
     changed_keys->insert(*it);
   }
-  storage_.Clear();
-  return Result(NULL, changed_keys);
+  DictionaryValue* old_settings = new DictionaryValue();
+  storage_.Swap(old_settings);
+  return Result(NULL, old_settings, changed_keys);
 }