Get rid of trivial IncognitoUserPrefStore and PerTabUserPrefStore.

chrome/browser/prefs/overlay_user_pref_store.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/incognito_user_pref_store.h"
+#include "chrome/browser/prefs/overlay_user_pref_store.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 
 OverlayUserPrefStore::OverlayUserPrefStore(
     PersistentPrefStore* underlay)
     : underlay_(underlay) {
   underlay_->AddObserver(this);
 }
 
@@ skipping 100 matching lines @@
 
 void OverlayUserPrefStore::CommitPendingWrite() {
   underlay_->CommitPendingWrite();
   // We do not write our content intentionally.
 }
 
 void OverlayUserPrefStore::ReportValueChanged(const std::string& key) {
   FOR_EACH_OBSERVER(PrefStore::Observer, observers_, OnPrefValueChanged(key));
 }
 
-void OverlayUserPrefStore::RegisterOverlayProperty(const std::string& key) {
-  RegisterOverlayProperty(key, key);
+void OverlayUserPrefStore::RegisterOverlayPref(const std::string& key) {
+  RegisterOverlayPref(key, key);
 }
 
-void OverlayUserPrefStore::RegisterOverlayProperty(
+void OverlayUserPrefStore::RegisterOverlayPref(
     const std::string& overlay_key,
     const std::string& underlay_key) {
   DCHECK(!overlay_key.empty()) << "Overlay key is empty";
   DCHECK(overlay_to_underlay_names_map_.find(overlay_key) ==
          overlay_to_underlay_names_map_.end()) <<
       "Overlay key already registered";
   DCHECK(!underlay_key.empty()) << "Underlay key is empty";
   DCHECK(underlay_to_overlay_names_map_.find(underlay_key) ==
          underlay_to_overlay_names_map_.end()) <<
       "Underlay key already registered";
@@ skipping 23 matching lines @@
   NamesMap::const_iterator i =
       overlay_to_underlay_names_map_.find(overlay_key);
   return i != overlay_to_underlay_names_map_.end() ? i->second : overlay_key;
 }
 
 bool OverlayUserPrefStore::ShallBeStoredInOverlay(
     const std::string& key) const {
   return overlay_to_underlay_names_map_.find(key) !=
       overlay_to_underlay_names_map_.end();
 }