diff options
| author | skym <skym@chromium.org> | 2015-12-10 16:27:53 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-11 00:28:35 +0000 |
| commit | 6344d79c2f94876e979d4760816090442c694845 (patch) | |
| tree | f9335bfe1593410b37ee62409de70ae6c24317ee /sync/util | |
| parent | 64e809d03a59d44e42960058371035866f8a1038 (diff) | |
| download | chromium_src-6344d79c2f94876e979d4760816090442c694845.zip chromium_src-6344d79c2f94876e979d4760816090442c694845.tar.gz chromium_src-6344d79c2f94876e979d4760816090442c694845.tar.bz2 | |
[Sync] Replacing SYNC_EXPORT_PRIVATE with SYNC_EXPORT for all usage, and fixing lint violations on all touched files.
Leaving the definition of the SYNC_EXPORT_PRIVATE macro because for some strange reason the iOS waterfall bot's incremental build doesn't re-generate the attachment's proto files. This causes a compile failure because the old versions of these generated files use the SYNC_EXPORT_MACRO. It has been difficult to reproduce this problem anywhere else, so it's unclear if something like a white-space change to the .proto definition would resolve this breakage.
BUG=554242, 567301
Review URL: https://codereview.chromium.org/1503343002
Cr-Commit-Position: refs/heads/master@{#364546}
Diffstat (limited to 'sync/util')
| -rw-r--r-- | sync/util/cryptographer.h | 2 | ||||
| -rw-r--r-- | sync/util/get_session_name.h | 2 | ||||
| -rw-r--r-- | sync/util/time.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sync/util/cryptographer.h b/sync/util/cryptographer.h index 6dbe70ef..2366409 100644 --- a/sync/util/cryptographer.h +++ b/sync/util/cryptographer.h @@ -23,7 +23,7 @@ namespace syncer { class Encryptor; -SYNC_EXPORT_PRIVATE extern const char kNigoriTag[]; +SYNC_EXPORT extern const char kNigoriTag[]; // The parameters used to initialize a Nigori instance. struct KeyParams { diff --git a/sync/util/get_session_name.h b/sync/util/get_session_name.h index 7ac34ad..4f56634 100644 --- a/sync/util/get_session_name.h +++ b/sync/util/get_session_name.h @@ -22,7 +22,7 @@ SYNC_EXPORT void GetSessionName( const scoped_refptr<base::TaskRunner>& task_runner, const base::Callback<void(const std::string&)>& done_callback); -SYNC_EXPORT_PRIVATE std::string GetSessionNameSynchronouslyForTesting(); +SYNC_EXPORT std::string GetSessionNameSynchronouslyForTesting(); } // namespace syncer diff --git a/sync/util/time.h b/sync/util/time.h index f28a6f0..f9b0cbc 100644 --- a/sync/util/time.h +++ b/sync/util/time.h @@ -20,7 +20,7 @@ namespace syncer { SYNC_EXPORT int64 TimeToProtoTime(const base::Time& t); // Converts a time field from sync protobufs to a time object. -SYNC_EXPORT_PRIVATE base::Time ProtoTimeToTime(int64 proto_t); +SYNC_EXPORT base::Time ProtoTimeToTime(int64 proto_t); SYNC_EXPORT std::string GetTimeDebugString(const base::Time& t); |