Revert of Delete base/prefs and update callers to use components.

components/prefs/pref_filter.h

Index: components/prefs/pref_filter.h
diff --git a/components/prefs/pref_filter.h b/components/prefs/pref_filter.h
index 8fa66273e67b03127947270d6c0e1f1c0dea3804..bb4847b4a37f23f1c75b3bf6d8821ea14d876e9d 100644
--- a/components/prefs/pref_filter.h
+++ b/components/prefs/pref_filter.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 COMPONENTS_PREFS_PREF_FILTER_H_
-#define COMPONENTS_PREFS_PREF_FILTER_H_
+#ifndef BASE_PREFS_PREF_FILTER_H_
+#define BASE_PREFS_PREF_FILTER_H_
 
 #include <string>
 
@@ -18,7 +18,7 @@
 
 // Filters preferences as they are loaded from disk or updated at runtime.
 // Currently supported only by JsonPrefStore.
-class COMPONENTS_PREFS_EXPORT PrefFilter {
+class BASE_PREFS_EXPORT PrefFilter {
  public:
   // A callback to be invoked when |prefs| have been read (and possibly
   // pre-modified) and are now ready to be handed back to this callback's
@@ -52,4 +52,4 @@
       base::DictionaryValue* pref_store_contents) = 0;
 };
 
-#endif  // COMPONENTS_PREFS_PREF_FILTER_H_
+#endif  // BASE_PREFS_PREF_FILTER_H_