Get rid of trivial IncognitoUserPrefStore and PerTabUserPrefStore.

chrome/browser/prefs/overlay_user_pref_store.cc

Index: chrome/browser/prefs/overlay_user_pref_store.cc
diff --git a/chrome/browser/prefs/overlay_user_pref_store.cc b/chrome/browser/prefs/overlay_user_pref_store.cc
index 65369bb08f06b303ce86bec6fa65209021d2442e..cae743efa180da37f2f6bc6109b7b2063f7b11aa 100644
--- a/chrome/browser/prefs/overlay_user_pref_store.cc
+++ b/chrome/browser/prefs/overlay_user_pref_store.cc
@@ -2,7 +2,7 @@
 // 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"
@@ -123,11 +123,11 @@ 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";