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

base/prefs/value_map_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_VALUE_MAP_PREF_STORE_H_
-#define CHROME_BROWSER_PREFS_VALUE_MAP_PREF_STORE_H_
+#ifndef BASE_PREFS_VALUE_MAP_PREF_STORE_H_
+#define BASE_PREFS_VALUE_MAP_PREF_STORE_H_
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/observer_list.h"
-#include "chrome/browser/prefs/pref_value_map.h"
-#include "chrome/common/pref_store.h"
+#include "base/prefs/pref_store.h"
+#include "base/prefs/pref_value_map.h"
 
 // A basic PrefStore implementation that uses a simple name-value map for
 // storing the preference values.
 class ValueMapPrefStore : public PrefStore {
  public:
   typedef std::map<std::string, base::Value*>::iterator iterator;
   typedef std::map<std::string, base::Value*>::const_iterator const_iterator;
 
   ValueMapPrefStore();
 
@@ skipping 24 matching lines @@
   void NotifyInitializationCompleted();
 
  private:
   PrefValueMap prefs_;
 
   ObserverList<PrefStore::Observer, true> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(ValueMapPrefStore);
 };
 
-#endif  // CHROME_BROWSER_PREFS_VALUE_MAP_PREF_STORE_H_
+#endif  // BASE_PREFS_VALUE_MAP_PREF_STORE_H_