[Sync] Move some things from driver to base.

components/sync/base/sync_prefs.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_SYNC_DRIVER_SYNC_PREFS_H_
-#define COMPONENTS_SYNC_DRIVER_SYNC_PREFS_H_
+#ifndef COMPONENTS_SYNC_BASE_SYNC_PREFS_H_
+#define COMPONENTS_SYNC_BASE_SYNC_PREFS_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <memory>
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "components/prefs/pref_member.h"
 #include "components/sync/base/model_type.h"
-#include "components/sync/core/sync_encryption_handler.h"
+#include "components/sync/protocol/sync.pb.h"
 
 class PrefService;
 class ProfileIOData;
 
 namespace user_prefs {
 class PrefRegistrySyncable;
 }
 
 namespace syncer {
 
@@ skipping 133 matching lines @@
   // Sync startup time (after which the LastRunVersion preference will have been
   // updated to the current version).
   std::string GetLastRunVersion() const;
   void SetLastRunVersion(const std::string& current_version);
 
   // Get/set for flag indicating that passphrase encryption transition is in
   // progress.
   void SetPassphraseEncryptionTransitionInProgress(bool value);
   bool GetPassphraseEncryptionTransitionInProgress() const;
 
-  // Get/set for saved Nigori state that needs to be passed to backend
+  // Get/set for saved Nigori specifics that must be passed to backend
   // initialization after transition.
-  void SetSavedNigoriStateForPassphraseEncryptionTransition(
-      const SyncEncryptionHandler::NigoriState& nigori_state);
-  std::unique_ptr<SyncEncryptionHandler::NigoriState>
-  GetSavedNigoriStateForPassphraseEncryptionTransition() const;
+  void SetNigoriSpecificsForPassphraseTransition(
+      const sync_pb::NigoriSpecifics& nigori_specifics);
+  void GetNigoriSpecificsForPassphraseTransition(
+      sync_pb::NigoriSpecifics* nigori_specifics) const;
 
  private:
   void RegisterPrefGroups();
 
   static void RegisterDataTypePreferredPref(
       user_prefs::PrefRegistrySyncable* prefs,
       ModelType type,
       bool is_preferred);
   bool GetDataTypePreferred(ModelType type) const;
   void SetDataTypePreferred(ModelType type, bool is_preferred);
@@ skipping 22 matching lines @@
   //   pref_groups_[EXTENSIONS] = { EXTENSION_SETTINGS }
   // etc.
   typedef std::map<ModelType, ModelTypeSet> PrefGroupsMap;
   PrefGroupsMap pref_groups_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncPrefs);
 };
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_SYNC_DRIVER_SYNC_PREFS_H_
+#endif  // COMPONENTS_SYNC_BASE_SYNC_PREFS_H_