Get rid of trivial IncognitoUserPrefStore and PerTabUserPrefStore.

chrome/browser/prefs/overlay_user_pref_store.h

 // 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.
 
 #ifndef CHROME_BROWSER_PREFS_OVERLAY_USER_PREF_STORE_H_
 #define CHROME_BROWSER_PREFS_OVERLAY_USER_PREF_STORE_H_
 #pragma once
 
 #include <map>
 #include <string>
@@ skipping 32 matching lines @@
   virtual void SetValue(const std::string& key, base::Value* value) OVERRIDE;
   virtual void SetValueSilently(const std::string& key,
                                 base::Value* value) OVERRIDE;
   virtual void RemoveValue(const std::string& key) OVERRIDE;
   virtual bool ReadOnly() const OVERRIDE;
   virtual PrefReadError ReadPrefs() OVERRIDE;
   virtual void ReadPrefsAsync(ReadErrorDelegate* delegate) OVERRIDE;
   virtual void CommitPendingWrite() OVERRIDE;
   virtual void ReportValueChanged(const std::string& key) OVERRIDE;
 
- protected:
-  void RegisterOverlayProperty(const std::string& key);
-  void RegisterOverlayProperty(const std::string& overlay_key,
-                               const std::string& underlay_key);
+  void RegisterOverlayPref(const std::string& key);
+  void RegisterOverlayPref(const std::string& overlay_key,
+                           const std::string& underlay_key);
 
  private:
-  friend class OverlayUserPrefStoreTest;
-
   typedef std::map<std::string, std::string> NamesMap;
 
   // Methods of PrefStore::Observer.
   virtual void OnPrefValueChanged(const std::string& key) OVERRIDE;
   virtual void OnInitializationCompleted(bool succeeded) OVERRIDE;
 
   const std::string& GetOverlayKey(const std::string& underlay_key) const;
   const std::string& GetUnderlayKey(const std::string& overlay_key) const;
 
   // Returns true if |key| corresponds to a preference that shall be stored in
   // an in-memory PrefStore that is not persisted to disk.
   bool ShallBeStoredInOverlay(const std::string& key) const;
 
   ObserverList<PrefStore::Observer, true> observers_;
   PrefValueMap overlay_;
   scoped_refptr<PersistentPrefStore> underlay_;
   NamesMap overlay_to_underlay_names_map_;
   NamesMap underlay_to_overlay_names_map_;
 
   DISALLOW_COPY_AND_ASSIGN(OverlayUserPrefStore);
 };
 
 #endif  // CHROME_BROWSER_PREFS_OVERLAY_USER_PREF_STORE_H_