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

base/prefs/persistent_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_COMMON_PERSISTENT_PREF_STORE_H_
-#define CHROME_COMMON_PERSISTENT_PREF_STORE_H_
+#ifndef BASE_PREFS_PERSISTENT_PREF_STORE_H_
+#define BASE_PREFS_PERSISTENT_PREF_STORE_H_
 
 #include <string>
 
-#include "chrome/common/pref_store.h"
+#include "base/prefs/pref_store.h"
 
 // This interface is complementary to the PrefStore interface, declaring
 // additional functionality that adds support for setting values and persisting
 // the data to some backing store.
 class PersistentPrefStore : public PrefStore {
  public:
   // Unique integer code for each type of error so we can report them
   // distinctly in a histogram.
   // NOTE: Don't change the order here as it will change the server's meaning
   // of the histogram.
@@ skipping 63 matching lines @@
   // Owns |error_delegate|.
   virtual void ReadPrefsAsync(ReadErrorDelegate* error_delegate) = 0;
 
   // Lands any pending writes to disk.
   virtual void CommitPendingWrite() = 0;
 
  protected:
   virtual ~PersistentPrefStore() {}
 };
 
-#endif  // CHROME_COMMON_PERSISTENT_PREF_STORE_H_
+#endif  // BASE_PREFS_PERSISTENT_PREF_STORE_H_