Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1012)

Unified Diff: chrome/browser/content_settings/content_settings_pref_provider_unittest.cc

Issue 7342043: Fixed regression: various preferences were not persisted when changed from incognito window (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
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 9ff4e386d1d6744d30568aed6d72e4573433172f..e447b918e1645b858055f4c765b97d0fa64c9e90 100644
--- a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
+++ b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
@@ -9,7 +9,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"
@@ -196,8 +196,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();
« no previous file with comments | « no previous file | chrome/browser/prefs/incognito_user_pref_store.h » ('j') | chrome/browser/prefs/incognito_user_pref_store.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698