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

base/prefs/overlay_user_pref_store.h

Index: base/prefs/overlay_user_pref_store.h
diff --git a/chrome/browser/prefs/overlay_user_pref_store.h b/base/prefs/overlay_user_pref_store.h
similarity index 92%
rename from chrome/browser/prefs/overlay_user_pref_store.h
rename to base/prefs/overlay_user_pref_store.h
index d2acd68aec6a7d23fbdd14acd80ca8f798d7c799..5c33c796a2feb90aa7209ec97c69a472843d5e02 100644
--- a/chrome/browser/prefs/overlay_user_pref_store.h
+++ b/base/prefs/overlay_user_pref_store.h
@@ -2,8 +2,8 @@
 // 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>
@@ -11,8 +11,8 @@
 #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.
@@ -81,4 +81,4 @@ class OverlayUserPrefStore : public PersistentPrefStore,
   DISALLOW_COPY_AND_ASSIGN(OverlayUserPrefStore);
 };
 
-#endif  // CHROME_BROWSER_PREFS_OVERLAY_USER_PREF_STORE_H_
+#endif  // BASE_PREFS_OVERLAY_USER_PREF_STORE_H_