| Index: components/sync/base/cryptographer.h
|
| diff --git a/sync/util/cryptographer.h b/components/sync/base/cryptographer.h
|
| similarity index 95%
|
| rename from sync/util/cryptographer.h
|
| rename to components/sync/base/cryptographer.h
|
| index 260f58dabca94bc29d8dfb7cee745ae2d0e66c70..9ddad9e803c17325e68477ef8fb5412d70989ddf 100644
|
| --- a/sync/util/cryptographer.h
|
| +++ b/components/sync/base/cryptographer.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 SYNC_UTIL_CRYPTOGRAPHER_H_
|
| -#define SYNC_UTIL_CRYPTOGRAPHER_H_
|
| +#ifndef COMPONENTS_SYNC_BASE_CRYPTOGRAPHER_H_
|
| +#define COMPONENTS_SYNC_BASE_CRYPTOGRAPHER_H_
|
|
|
| #include <map>
|
| #include <memory>
|
| @@ -11,9 +11,9 @@
|
|
|
| #include "base/macros.h"
|
| #include "base/memory/linked_ptr.h"
|
| -#include "sync/base/sync_export.h"
|
| -#include "sync/protocol/encryption.pb.h"
|
| -#include "sync/util/nigori.h"
|
| +#include "components/sync/base/nigori.h"
|
| +#include "components/sync/base/sync_export.h"
|
| +#include "components/sync/protocol/encryption.pb.h"
|
|
|
| namespace sync_pb {
|
| class NigoriKeyBag;
|
| @@ -159,9 +159,7 @@ class SYNC_EXPORT Cryptographer {
|
| }
|
|
|
| // Returns whether this Cryptographer is ready to encrypt and decrypt data.
|
| - bool is_ready() const {
|
| - return is_initialized() && !has_pending_keys();
|
| - }
|
| + bool is_ready() const { return is_initialized() && !has_pending_keys(); }
|
|
|
| // Returns whether there is a pending set of keys that needs to be decrypted.
|
| bool has_pending_keys() const { return NULL != pending_keys_.get(); }
|
| @@ -189,7 +187,7 @@ class SYNC_EXPORT Cryptographer {
|
| bool ImportNigoriKey(const std::string& serialized_nigori_key);
|
|
|
| private:
|
| - typedef std::map<std::string, linked_ptr<const Nigori> > NigoriMap;
|
| + typedef std::map<std::string, linked_ptr<const Nigori>> NigoriMap;
|
|
|
| // Helper method to instantiate Nigori instances for each set of key
|
| // parameters in |bag|.
|
| @@ -219,4 +217,4 @@ class SYNC_EXPORT Cryptographer {
|
|
|
| } // namespace syncer
|
|
|
| -#endif // SYNC_UTIL_CRYPTOGRAPHER_H_
|
| +#endif // COMPONENTS_SYNC_BASE_CRYPTOGRAPHER_H_
|
|
|