| Index: google_apis/gcm/base/encryptor.h
|
| diff --git a/sync/util/encryptor.h b/google_apis/gcm/base/encryptor.h
|
| similarity index 61%
|
| copy from sync/util/encryptor.h
|
| copy to google_apis/gcm/base/encryptor.h
|
| index d188a0139f93b8cb1d55bdbdf38552cbfe3247b2..898e7dba77e38d6a33fb50d4ada975bf74507d46 100644
|
| --- a/sync/util/encryptor.h
|
| +++ b/google_apis/gcm/base/encryptor.h
|
| @@ -1,15 +1,16 @@
|
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2014 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 SYNC_UTIL_ENCRYPTOR_H_
|
| -#define SYNC_UTIL_ENCRYPTOR_H_
|
| +#ifndef GOOGLE_APIS_GCM_ENCRYPTOR_H_
|
| +#define GOOGLE_APIS_GCM_ENCRYPTOR_H_
|
|
|
| #include <string>
|
| +#include "google_apis/gcm/base/gcm_export.h"
|
|
|
| -namespace syncer {
|
| +namespace gcm {
|
|
|
| -class Encryptor {
|
| +class GCM_EXPORT Encryptor {
|
| public:
|
| // All methods below should be thread-safe.
|
| virtual bool EncryptString(const std::string& plaintext,
|
| @@ -18,10 +19,9 @@ class Encryptor {
|
| virtual bool DecryptString(const std::string& ciphertext,
|
| std::string* plaintext) = 0;
|
|
|
| - protected:
|
| virtual ~Encryptor() {}
|
| };
|
|
|
| -} // namespace syncer
|
| +} // namespace gcm
|
|
|
| -#endif // SYNC_UTIL_ENCRYPTOR_H_
|
| +#endif // GOOGLE_APIS_GCM_ENCRYPTOR_H_
|
|
|