Revert of [Sync] Move //components/sync to the syncer namespace. (patchset #5 id:40001 of https://co

components/sync/driver/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_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 11 matching lines @@
 #include "components/sync/base/model_type.h"
 #include "components/sync/core/sync_encryption_handler.h"
 
 class PrefService;
 class ProfileIOData;
 
 namespace user_prefs {
 class PrefRegistrySyncable;
 }
 
-namespace syncer {
+namespace sync_driver {
 
 class SyncPrefObserver {
  public:
   // Called whenever the pref that controls whether sync is managed
   // changes.
   virtual void OnSyncManagedPrefChange(bool is_sync_managed) = 0;
 
  protected:
   virtual ~SyncPrefObserver();
 };
@@ skipping 47 matching lines @@
 
   base::Time GetLastPollTime() const;
   void SetLastPollTime(base::Time time);
 
   bool HasKeepEverythingSynced() const;
   void SetKeepEverythingSynced(bool keep_everything_synced);
 
   // The returned set is guaranteed to be a subset of
   // |registered_types|.  Returns |registered_types| directly if
   // HasKeepEverythingSynced() is true.
-  ModelTypeSet GetPreferredDataTypes(ModelTypeSet registered_types) const;
+  syncer::ModelTypeSet GetPreferredDataTypes(
+      syncer::ModelTypeSet registered_types) const;
   // |preferred_types| should be a subset of |registered_types|.  All
   // types in |preferred_types| are marked preferred, and all types in
   // |registered_types| \ |preferred_types| are marked not preferred.
   // Changes are still made to the prefs even if
   // HasKeepEverythingSynced() is true, but won't be visible until
   // SetKeepEverythingSynced(false) is called.
-  void SetPreferredDataTypes(ModelTypeSet registered_types,
-                             ModelTypeSet preferred_types);
+  void SetPreferredDataTypes(syncer::ModelTypeSet registered_types,
+                             syncer::ModelTypeSet preferred_types);
 
   // This pref is set outside of sync.
   bool IsManaged() const;
 
   // Use this encryption bootstrap token if we're using an explicit passphrase.
   std::string GetEncryptionBootstrapToken() const;
   void SetEncryptionBootstrapToken(const std::string& token);
 
   // Use this keystore bootstrap token if we're not using an explicit
   // passphrase.
   std::string GetKeystoreEncryptionBootstrapToken() const;
   void SetKeystoreEncryptionBootstrapToken(const std::string& token);
 
   // Use this for the unique machine tag used for session sync.
   std::string GetSyncSessionsGUID() const;
   void SetSyncSessionsGUID(const std::string& guid);
 
   // Maps |data_type| to its corresponding preference name.
-  static const char* GetPrefNameForDataType(ModelType data_type);
+  static const char* GetPrefNameForDataType(syncer::ModelType data_type);
 
 #if defined(OS_CHROMEOS)
   // Use this spare bootstrap token only when setting up sync for the first
   // time.
   std::string GetSpareBootstrapToken() const;
   void SetSpareBootstrapToken(const std::string& token);
 #endif
 
   // Get/set/clear first sync time of current user. Used to roll back browsing
   // data later when user signs out.
@@ skipping 13 matching lines @@
   void SetMemoryPressureWarningCount(int value);
 
   // Check if the previous shutdown was clean.
   bool DidSyncShutdownCleanly() const;
 
   // Set whether the last shutdown was clean.
   void SetCleanShutdown(bool value);
 
   // Get/set for the last known sync invalidation versions.
   void GetInvalidationVersions(
-      std::map<ModelType, int64_t>* invalidation_versions) const;
+      std::map<syncer::ModelType, int64_t>* invalidation_versions) const;
   void UpdateInvalidationVersions(
-      const std::map<ModelType, int64_t>& invalidation_versions);
+      const std::map<syncer::ModelType, int64_t>& invalidation_versions);
 
   // Will return the contents of the LastRunVersion preference. This may be an
   // empty string if no version info was present, and is only valid at
   // 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
   // initialization after transition.
   void SetSavedNigoriStateForPassphraseEncryptionTransition(
-      const SyncEncryptionHandler::NigoriState& nigori_state);
-  std::unique_ptr<SyncEncryptionHandler::NigoriState>
+      const syncer::SyncEncryptionHandler::NigoriState& nigori_state);
+  std::unique_ptr<syncer::SyncEncryptionHandler::NigoriState>
   GetSavedNigoriStateForPassphraseEncryptionTransition() const;
 
  private:
   void RegisterPrefGroups();
 
   static void RegisterDataTypePreferredPref(
       user_prefs::PrefRegistrySyncable* prefs,
-      ModelType type,
+      syncer::ModelType type,
       bool is_preferred);
-  bool GetDataTypePreferred(ModelType type) const;
-  void SetDataTypePreferred(ModelType type, bool is_preferred);
+  bool GetDataTypePreferred(syncer::ModelType type) const;
+  void SetDataTypePreferred(syncer::ModelType type, bool is_preferred);
 
   // Returns a ModelTypeSet based on |types| expanded to include pref groups
   // (see |pref_groups_|), but as a subset of |registered_types|.
-  ModelTypeSet ResolvePrefGroups(ModelTypeSet registered_types,
-                                 ModelTypeSet types) const;
+  syncer::ModelTypeSet ResolvePrefGroups(syncer::ModelTypeSet registered_types,
+                                         syncer::ModelTypeSet types) const;
 
   void OnSyncManagedPrefChanged();
 
   // May be NULL.
   PrefService* const pref_service_;
 
   base::ObserverList<SyncPrefObserver> sync_pref_observers_;
 
   // The preference that controls whether sync is under control by
   // configuration management.
   BooleanPrefMember pref_sync_managed_;
 
   // Groups of prefs that always have the same value as a "master" pref.
   // For example, the APPS group has {APP_NOTIFICATIONS, APP_SETTINGS}
   // (as well as APPS, but that is implied), so
-  //   pref_groups_[APPS] =       { APP_NOTIFICATIONS,
-  //                                          APP_SETTINGS }
-  //   pref_groups_[EXTENSIONS] = { EXTENSION_SETTINGS }
+  //   pref_groups_[syncer::APPS] =       { syncer::APP_NOTIFICATIONS,
+  //                                          syncer::APP_SETTINGS }
+  //   pref_groups_[syncer::EXTENSIONS] = { syncer::EXTENSION_SETTINGS }
   // etc.
-  typedef std::map<ModelType, ModelTypeSet> PrefGroupsMap;
+  typedef std::map<syncer::ModelType, syncer::ModelTypeSet> PrefGroupsMap;
   PrefGroupsMap pref_groups_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncPrefs);
 };
 
-}  // namespace syncer
+}  // namespace sync_driver
 
 #endif  // COMPONENTS_SYNC_DRIVER_SYNC_PREFS_H_