Get rid of trivial IncognitoUserPrefStore and PerTabUserPrefStore.

chrome/browser/prefs/pref_service.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/prefs/pref_service.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/value_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_pref_store.h"
 #include "chrome/browser/policy/configuration_policy_pref_store.h"
 #include "chrome/browser/prefs/command_line_pref_store.h"
 #include "chrome/browser/prefs/default_pref_store.h"
-#include "chrome/browser/prefs/incognito_user_pref_store.h"
-#include "chrome/browser/prefs/per_tab_user_pref_store.h"
+#include "chrome/browser/prefs/overlay_user_pref_store.h"
 #include "chrome/browser/prefs/pref_model_associator.h"
 #include "chrome/browser/prefs/pref_notifier_impl.h"
 #include "chrome/browser/prefs/pref_value_store.h"
+#include "chrome/browser/ui/prefs/prefs_tab_helper.h"
 #include "chrome/browser/ui/profile_error_dialog.h"
 #include "chrome/common/json_pref_store.h"
+#include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::BrowserThread;
 
 namespace {
 
 // A helper function for RegisterLocalized*Pref that creates a Value* based on
@@ skipping 129 matching lines @@
           pref_notifier),
       user,
       default_pref_store,
       pref_sync_associator,
       async);
 }
 
 PrefService* PrefService::CreateIncognitoPrefService(
     PrefStore* incognito_extension_prefs) {
   PrefNotifierImpl* pref_notifier = new PrefNotifierImpl();
-  PersistentPrefStore* incognito_pref_store =
-      new IncognitoUserPrefStore(user_pref_store_.get());
+  OverlayUserPrefStore* incognito_pref_store =
+      new OverlayUserPrefStore(user_pref_store_.get());
+  PrefsTabHelper::InitIncognitoUserPrefStore(incognito_pref_store);
   return new PrefService(
       pref_notifier,
       pref_value_store_->CloneAndSpecialize(
           NULL, // managed_platform_prefs
           NULL, // managed_cloud_prefs
           incognito_extension_prefs,
           NULL, // command_line_prefs
           incognito_pref_store,
           NULL, // recommended_platform_prefs
           NULL, // recommended_cloud_prefs
           default_store_.get(),
           NULL, // pref_sync_associator
           pref_notifier),
       incognito_pref_store,
       default_store_.get(),
       NULL,
       false);
 }
 
 PrefService* PrefService::CreatePrefServiceWithPerTabPrefStore() {
   PrefNotifierImpl* pref_notifier = new PrefNotifierImpl();
-  PersistentPrefStore* per_tab_pref_store =
-      new PerTabUserPrefStore(user_pref_store_.get());
+  OverlayUserPrefStore* per_tab_pref_store =
+      new OverlayUserPrefStore(user_pref_store_.get());
+  PrefsTabHelper::InitPerTabUserPrefStore(per_tab_pref_store);
   DefaultPrefStore* default_store = new DefaultPrefStore();
   return new PrefService(
       pref_notifier,
       pref_value_store_->CloneAndSpecialize(
           NULL, // managed_platform_prefs
           NULL, // managed_cloud_prefs
           NULL, // extension_prefs
           NULL, // command_line_prefs
           per_tab_pref_store,
           NULL, // recommended_platform_prefs
@@ skipping 722 matching lines @@
   return pref_value_store()->PrefValueFromDefaultStore(name_.c_str());
 }
 
 bool PrefService::Preference::IsUserModifiable() const {
   return pref_value_store()->PrefValueUserModifiable(name_.c_str());
 }
 
 bool PrefService::Preference::IsExtensionModifiable() const {
   return pref_value_store()->PrefValueExtensionModifiable(name_.c_str());
 }