| Index: google_apis/gcm/base/fake_encryptor.h
|
| diff --git a/sync/test/fake_encryptor.h b/google_apis/gcm/base/fake_encryptor.h
|
| similarity index 68%
|
| copy from sync/test/fake_encryptor.h
|
| copy to google_apis/gcm/base/fake_encryptor.h
|
| index a1117ef215d76b643bab9a3fdb8c1097a726a6bd..01ae67b0e858d7e3cdd62527dbb8e88ddd439d36 100644
|
| --- a/sync/test/fake_encryptor.h
|
| +++ b/google_apis/gcm/base/fake_encryptor.h
|
| @@ -1,14 +1,14 @@
|
| -// 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_TEST_FAKE_ENCRYPTOR_H_
|
| -#define SYNC_TEST_FAKE_ENCRYPTOR_H_
|
| +#ifndef GOOGLE_APIS_GCM_BASE_ENCRYPTOR_H_
|
| +#define GOOGLE_APIS_GCM_BASE_ENCRYPTOR_H_
|
|
|
| #include "base/compiler_specific.h"
|
| -#include "sync/util/encryptor.h"
|
| +#include "google_apis/gcm/base/encryptor.h"
|
|
|
| -namespace syncer {
|
| +namespace gcm {
|
|
|
| // Encryptor which simply base64-encodes the plaintext to get the
|
| // ciphertext. Obviously, this should be used only for testing.
|
| @@ -23,6 +23,6 @@ class FakeEncryptor : public Encryptor {
|
| std::string* plaintext) OVERRIDE;
|
| };
|
|
|
| -} // namespace syncer
|
| +} // namespace gcm
|
|
|
| -#endif // SYNC_TEST_FAKE_ENCRYPTOR_H_
|
| +#endif // GOOGLE_APIS_GCM_BASE_ENCRYPTOR_H_
|
|
|