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

components/prefs/json_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 COMPONENTS_PREFS_JSON_PREF_STORE_H_
-#define COMPONENTS_PREFS_JSON_PREF_STORE_H_
+#ifndef BASE_PREFS_JSON_PREF_STORE_H_
+#define BASE_PREFS_JSON_PREF_STORE_H_
 
 #include <stdint.h>
 
 #include <set>
 #include <string>
 
 #include "base/callback_forward.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/files/important_file_writer.h"
@@ skipping 17 matching lines @@
 class SequencedTaskRunner;
 class SequencedWorkerPool;
 class Value;
 FORWARD_DECLARE_TEST(JsonPrefStoreTest, WriteCountHistogramTestBasic);
 FORWARD_DECLARE_TEST(JsonPrefStoreTest, WriteCountHistogramTestSinglePeriod);
 FORWARD_DECLARE_TEST(JsonPrefStoreTest, WriteCountHistogramTestMultiplePeriods);
 FORWARD_DECLARE_TEST(JsonPrefStoreTest, WriteCountHistogramTestPeriodWithGaps);
 }
 
 // A writable PrefStore implementation that is used for user preferences.
-class COMPONENTS_PREFS_EXPORT JsonPrefStore
+class BASE_PREFS_EXPORT JsonPrefStore
     : public PersistentPrefStore,
       public base::ImportantFileWriter::DataSerializer,
       public base::SupportsWeakPtr<JsonPrefStore>,
       public base::NonThreadSafe {
  public:
   struct ReadResult;
 
   // Returns instance of SequencedTaskRunner which guarantees that file
   // operations on the same file will be executed in sequenced order.
   static scoped_refptr<base::SequencedTaskRunner> GetTaskRunnerForFile(
@@ skipping 52 matching lines @@
   void RemoveValueSilently(const std::string& key, uint32_t flags);
 
   // Registers |on_next_successful_write| to be called once, on the next
   // successful write event of |writer_|.
   void RegisterOnNextSuccessfulWriteCallback(
       const base::Closure& on_next_successful_write);
 
  private:
   // Represents a histogram for recording the number of writes to the pref file
   // that occur every kHistogramWriteReportIntervalInMins minutes.
-  class COMPONENTS_PREFS_EXPORT WriteCountHistogram {
+  class BASE_PREFS_EXPORT WriteCountHistogram {
    public:
     static const int32_t kHistogramWriteReportIntervalMins;
 
     WriteCountHistogram(const base::TimeDelta& commit_interval,
                         const base::FilePath& path);
     // Constructor for testing. |clock| is a test Clock that is used to retrieve
     // the time.
     WriteCountHistogram(const base::TimeDelta& commit_interval,
                         const base::FilePath& path,
                         scoped_ptr<base::Clock> clock);
@@ skipping 91 matching lines @@
   bool pending_lossy_write_;
   PrefReadError read_error_;
 
   std::set<std::string> keys_need_empty_value_;
 
   WriteCountHistogram write_count_histogram_;
 
   DISALLOW_COPY_AND_ASSIGN(JsonPrefStore);
 };
 
-#endif  // COMPONENTS_PREFS_JSON_PREF_STORE_H_
+#endif  // BASE_PREFS_JSON_PREF_STORE_H_