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

chrome/browser/content_settings/content_settings_pref_provider_unittest.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/content_settings/content_settings_pref_provider.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #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"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/testing_browser_process_test.h"
 #include "chrome/test/testing_pref_service.h"
 #include "chrome/test/testing_profile.h"
 #include "content/browser/browser_thread.h"
@@ skipping 166 matching lines @@
       "",
       CONTENT_SETTING_ALLOW);
 
   pref_content_settings_provider.ShutdownOnUIThread();
 }
 
 // Test for regression in which the PrefProvider modified the user pref store
 // 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();
 
   Profile::RegisterUserPrefs(regular_prefs);
   browser::RegisterUserPrefs(regular_prefs);
 
   PrefService* otr_prefs = builder.WithUserPrefs(otr_user_prefs).Create();
 
   Profile::RegisterUserPrefs(otr_prefs);
@@ skipping 175 matching lines @@
   EXPECT_EQ(CONTENT_SETTING_BLOCK,  provider.GetContentSetting(
       GURL("http://www.example.com"),
       GURL("http://www.example.com"),
       CONTENT_SETTINGS_TYPE_POPUPS,
       ""));
 
   provider.ShutdownOnUIThread();
 }
 
 }  // namespace content_settings