diff options
| author | battre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-14 19:22:29 +0000 |
|---|---|---|
| committer | battre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-14 19:22:29 +0000 |
| commit | a78e948d0165924e55d35f3c8a01e3b387df4d6e (patch) | |
| tree | 8801ee7a17626a6598ae16b130f0136b84f137b1 /chrome/browser/content_settings | |
| parent | 3cfade1e6853ab12c5c13c4d783717df32fce5a4 (diff) | |
| download | chromium_src-a78e948d0165924e55d35f3c8a01e3b387df4d6e.zip chromium_src-a78e948d0165924e55d35f3c8a01e3b387df4d6e.tar.gz chromium_src-a78e948d0165924e55d35f3c8a01e3b387df4d6e.tar.bz2 | |
Fixed regression: various preferences were not persisted when changed from incognito window
This CL renames the OverlayPrefStore to an IncognitoPrefStore. This IncognitoPrefStore stores write operations in memory and prevents persisting them to the user prefs file. The CL also blacklists two preferences from being stored in the in-memory IncognitoPrefStore to fix the regressions mentioned in the bugs.
BUG=87191,84472
TEST=see bug descriptions
Review URL: http://codereview.chromium.org/7342043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92581 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/content_settings')
| -rw-r--r-- | chrome/browser/content_settings/content_settings_pref_provider_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc index e54d721..181afac 100644 --- a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc +++ b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc @@ -10,7 +10,7 @@ #include "chrome/browser/content_settings/mock_settings_observer.h" #include "chrome/browser/prefs/browser_prefs.h" #include "chrome/browser/prefs/default_pref_store.h" -#include "chrome/browser/prefs/overlay_persistent_pref_store.h" +#include "chrome/browser/prefs/incognito_user_pref_store.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/pref_service_mock_builder.h" #include "chrome/browser/prefs/testing_pref_store.h" @@ -187,8 +187,8 @@ TEST_F(PrefProviderTest, Observer) { // of the OTR unintentionally: http://crbug.com/74466. TEST_F(PrefProviderTest, Incognito) { PersistentPrefStore* user_prefs = new TestingPrefStore(); - OverlayPersistentPrefStore* otr_user_prefs = - new OverlayPersistentPrefStore(user_prefs); + IncognitoUserPrefStore* otr_user_prefs = + new IncognitoUserPrefStore(user_prefs); PrefServiceMockBuilder builder; PrefService* regular_prefs = builder.WithUserPrefs(user_prefs).Create(); |