Move the bits of Prefs where production code has only trivially easy

base/prefs/overlay_user_pref_store.h

 // Copyright (c) 2012 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_
+#ifndef BASE_PREFS_OVERLAY_USER_PREF_STORE_H_
+#define BASE_PREFS_OVERLAY_USER_PREF_STORE_H_
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/observer_list.h"
-#include "chrome/browser/prefs/pref_value_map.h"
-#include "chrome/common/persistent_pref_store.h"
+#include "base/prefs/persistent_pref_store.h"
+#include "base/prefs/pref_value_map.h"
 
 // PersistentPrefStore that directs all write operations into an in-memory
 // PrefValueMap. Read operations are first answered by the PrefValueMap.
 // If the PrefValueMap does not contain a value for the requested key,
 // the look-up is passed on to an underlying PersistentPrefStore |underlay_|.
 class OverlayUserPrefStore : public PersistentPrefStore,
                              public PrefStore::Observer {
  public:
   explicit OverlayUserPrefStore(PersistentPrefStore* underlay);
 
@@ skipping 48 matching lines @@
 
   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_
+#endif  // BASE_PREFS_OVERLAY_USER_PREF_STORE_H_