Fixed regression: various preferences were not persisted when changed from incognito window

chrome/browser/prefs/overlay_persistent_pref_store.cc

Index: chrome/browser/prefs/overlay_persistent_pref_store.cc
diff --git a/chrome/browser/prefs/overlay_persistent_pref_store.cc b/chrome/browser/prefs/overlay_persistent_pref_store.cc
deleted file mode 100644
index 13c51bb30fddce4cf898a662f91b246d16f6ce16..0000000000000000000000000000000000000000
--- a/chrome/browser/prefs/overlay_persistent_pref_store.cc
+++ /dev/null
@@ -1,120 +0,0 @@
-// 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/prefs/overlay_persistent_pref_store.h"
-
-#include "base/memory/scoped_ptr.h"
-#include "base/values.h"
-
-OverlayPersistentPrefStore::OverlayPersistentPrefStore(
-    PersistentPrefStore* underlay)
-    : underlay_(underlay) {
-  underlay_->AddObserver(this);
-}
-OverlayPersistentPrefStore::~OverlayPersistentPrefStore() {
-  underlay_->RemoveObserver(this);
-}
-
-bool OverlayPersistentPrefStore::IsSetInOverlay(const std::string& key) const {
-  return overlay_.GetValue(key, NULL);
-}
-
-void OverlayPersistentPrefStore::AddObserver(PrefStore::Observer* observer) {
-  observers_.AddObserver(observer);
-}
-
-void OverlayPersistentPrefStore::RemoveObserver(PrefStore::Observer* observer) {
-  observers_.RemoveObserver(observer);
-}
-
-bool OverlayPersistentPrefStore::IsInitializationComplete() const {
-  return underlay_->IsInitializationComplete();
-}
-
-PrefStore::ReadResult OverlayPersistentPrefStore::GetValue(
-    const std::string& key,
-    const Value** result) const {
-  if (overlay_.GetValue(key, result))
-    return READ_OK;
-  return underlay_->GetValue(key, result);
-}
-
-PrefStore::ReadResult OverlayPersistentPrefStore::GetMutableValue(
-    const std::string& key,
-    Value** result) {
-  if (overlay_.GetValue(key, result))
-    return READ_OK;
-
-  // Try to create copy of underlay if the overlay does not contain a value.
-  Value* underlay_value = NULL;
-  PrefStore::ReadResult read_result =
-      underlay_->GetMutableValue(key, &underlay_value);
-  if (read_result == READ_OK) {
-    *result = underlay_value->DeepCopy();
-    overlay_.SetValue(key, *result);
-    return READ_OK;
-  }
-  // Return read failure if underlay stores no value for |key|.
-  return read_result;
-}
-
-void OverlayPersistentPrefStore::SetValue(const std::string& key,
-                                          Value* value) {
-  if (overlay_.SetValue(key, value))
-    FOR_EACH_OBSERVER(PrefStore::Observer, observers_, OnPrefValueChanged(key));
-}
-
-void OverlayPersistentPrefStore::SetValueSilently(const std::string& key,
-                                                  Value* value) {
-  overlay_.SetValue(key, value);
-}
-
-void OverlayPersistentPrefStore::RemoveValue(const std::string& key) {
-  if (overlay_.RemoveValue(key))
-    FOR_EACH_OBSERVER(PrefStore::Observer, observers_, OnPrefValueChanged(key));
-}
-
-bool OverlayPersistentPrefStore::ReadOnly() const {
-  return false;
-}
-
-PersistentPrefStore::PrefReadError OverlayPersistentPrefStore::ReadPrefs() {
-  // We do not read intentionally.
-  OnInitializationCompleted(true);
-  return PersistentPrefStore::PREF_READ_ERROR_NONE;
-}
-
-void OverlayPersistentPrefStore::ReadPrefsAsync(
-    ReadErrorDelegate* error_delegate_raw) {
-  scoped_ptr<ReadErrorDelegate> error_delegate(error_delegate_raw);
-  // We do not read intentionally.
-  OnInitializationCompleted(true);
-}
-
-bool OverlayPersistentPrefStore::WritePrefs() {
-  // We do not write intentionally.
-  return true;
-}
-
-void OverlayPersistentPrefStore::ScheduleWritePrefs() {
-  // We do not write intentionally.
-}
-
-void OverlayPersistentPrefStore::CommitPendingWrite() {
-  // We do not write intentionally.
-}
-
-void OverlayPersistentPrefStore::ReportValueChanged(const std::string& key) {
-  FOR_EACH_OBSERVER(PrefStore::Observer, observers_, OnPrefValueChanged(key));
-}
-
-void OverlayPersistentPrefStore::OnPrefValueChanged(const std::string& key) {
-  if (!overlay_.GetValue(key, NULL))
-    FOR_EACH_OBSERVER(PrefStore::Observer, observers_, OnPrefValueChanged(key));
-}
-
-void OverlayPersistentPrefStore::OnInitializationCompleted(bool succeeded) {
-  FOR_EACH_OBSERVER(PrefStore::Observer, observers_,
-                    OnInitializationCompleted(succeeded));
-}