Revert of [Sync] Removing SYNC_EXPORT_PRIVATE macro and fixing lint violations on (patchset #3 id:40001 of https://codereview.chromium.org/1509563002/ )

Reason for revert:
Fails to compile for IOS

https://build.chromium.org/p/chromium.mac/builders/iOS_Device/builds/30956/steps/compile/logs/stdio

CompileC /b/build/slave/iOS_Device/build/src/xcodebuild/sync.build/Release-iphoneos/attachment_store_proto.build/Objects-normal/armv7/attachment_store.pb.o /b/build/slave/iOS_Device/build/src/xcodebuild/DerivedSources/Release/protoc_out/sync/internal_api/attachments/proto/attachment_store.pb.cc normal armv7 c++ com.apple.compilers.llvm.clang.1_0.compiler
    cd /b/build/slave/iOS_Device/build/src/sync
    export LANG=en_US.US-ASCII
    export PATH="/Applications/Xcode7.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin:/Applications/Xcode7.0.app/Contents/Developer/usr/bin:/Users/chrome-bot/slavebin:/b/depot_tools:/usr/local/git/bin:/usr/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin"
    /b/build/slave/iOS_Device/build/src/sync/../third_party/llvm-build/Release+Asserts/bin/clang -x c++ -arch armv7 -fmessage-length=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit=0 -std=c++11 -stdlib=libc++ -Wno-trigraphs -fno-exceptions -fno-rtti -Os -Werror -Wno-missing-field-initializers -Wno-missing-prototypes -Wno-return-type -Wno-non-virtual-dtor -Wno-overloaded-virtual -Wno-exit-time-destructors -Wno-missing-braces -Wparentheses -Wswitch -Wno-unused-function -Wno-unused-label -Wno-unused-parameter -Wno-unused-variable -Wunused-value -Wno-empty-body -Wno-uninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wno-constant-conversion -Wno-int-conversion -Wno-bool-conversion -Wno-enum-conversion -Wno-shorten-64-to-32 -Wnewline-eof -Wno-c++11-extensions -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -DDISABLE_NACL -DCHROMIUM_BUILD -DCR_CLANG_REVISION=254049-1 -DUSE_LIBJPEG_TURBO=1 -DDONT_EMBED_BUILD_METADATA -DFIELDTRIAL_TESTING_ENABLED -DDISABLE_FTP_SUPPORT=1 -DV8_USE_EXTERNAL_STARTUP_DATA -DSYNC_IMPLEMENTATION -DPROTOBUF_USE_DLLS -DGOOGLE_PROTOBUF_NO_RTTI -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DUSE_LIBPCI=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -DNS_BLOCK_ASSERTIONS=1 -D_FORTIFY_SOURCE=2 -isysroot /Applications/Xcode7.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.0.sdk -fstrict-aliasing -Wdeprecated-declarations -Winvalid-offsetof -miphoneos-version-min=7.0 -g -fvisibility=hidden -fvisibility-inlines-hidden -fno-threadsafe-statics -Wno-sign-conversion -I/b/build/slave/iOS_Device/build/src/xcodebuild/Release-iphoneos/include -I/b/build/slave/iOS_Device/build/src/xcodebuild/DerivedSources/Release -I/b/build/slave/iOS_Device/build/src/xcodebuild/DerivedSources/Release/protoc_out -I.. -I../third_party/protobuf -I../third_party/protobuf/src -I/b/build/slave/iOS_Device/build/src/xcodebuild/sync.build/Release-iphoneos/attachment_store_proto.build/DerivedSources/armv7 -I/b/build/slave/iOS_Device/build/src/xcodebuild/sync.build/Release-iphoneos/attachment_store_proto.build/DerivedSources -Wall -Wendif-labels -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wno-selector-type-mismatch -Wheader-hygiene -Wno-char-subscripts -Wno-unneeded-internal-declaration -Wno-covered-switch-default -Wstring-conversion -Wno-c++11-narrowing -Wno-deprecated-register -Wno-inconsistent-missing-override -Wno-shift-negative-value -Wno-bitfield-width -Wexit-time-destructors -F/b/build/slave/iOS_Device/build/src/xcodebuild/Release-iphoneos -Xclang -load -Xclang /b/build/slave/iOS_Device/build/src/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib -Xclang -add-plugin -Xclang find-bad-constructs -Xclang -plugin-arg-find-bad-constructs -Xclang check-templates -Xclang -plugin-arg-find-bad-constructs -Xclang enforce-overriding-blink -MMD -MT dependencies -MF /b/build/slave/iOS_Device/build/src/xcodebuild/sync.build/Release-iphoneos/attachment_store_proto.build/Objects-normal/armv7/attachment_store.pb.d --serialize-diagnostics /b/build/slave/iOS_Device/build/src/xcodebuild/sync.build/Release-iphoneos/attachment_store_proto.build/Objects-normal/armv7/attachment_store.pb.dia -c /b/build/slave/iOS_Device/build/src/xcodebuild/DerivedSources/Release/protoc_out/sync/internal_api/attachments/proto/attachment_store.pb.cc -o /b/build/slave/iOS_Device/build/src/xcodebuild/sync.build/Release-iphoneos/attachment_store_proto.build/Objects-normal/armv7/attachment_store.pb.o
In file included from /b/build/slave/iOS_Device/build/src/xcodebuild/DerivedSources/Release/protoc_out/sync/internal_api/attachments/proto/attachment_store.pb.cc:5:
/b/build/slave/iOS_Device/build/src/xcodebuild/DerivedSources/Release/protoc_out/sync/internal_api/attachments/proto/attachment_store.pb.h:34:6: error: variable has incomplete type 'void'
void SYNC_EXPORT_PRIVATE protobuf_AddDesc_attachment_5fstore_2eproto();
     ^
/b/build/slave/iOS_Device/build/src/xcodebuild/DerivedSources/Release/protoc_out/sync/internal_api/attachments/proto/attachment_store.pb.h:34:25: error: expected ';' after top level declarator
void SYNC_EXPORT_PRIVATE protobuf_AddDesc_attachment_5fstore_2eproto();
                        ^
                        ;
/b/build/slave/iOS_Device/build/src/xcodebuild/DerivedSources/Release/protoc_out/sync/internal_api/attachments/proto/attachment_store.pb.h:46:1: error: unknown type name 'SYNC_EXPORT_PRIVATE'
SYNC_EXPORT_PRIVATE bool RecordMetadata_Component_IsValid(int value);
^
/b/build/slave/iOS_Device/build/src/xcodebuild/DerivedSources/Release/protoc_out/sync/internal_api/attachments/proto/attachment_store.pb.h:46:21: error: expected unqualified-id
SYNC_EXPORT_PRIVATE bool RecordMetadata_Component_IsValid(int value);
                    ^
/b/build/slave/iOS_Device/build/src/xcodebuild/DerivedSources/Release/protoc_out/sync/internal_api/attachments/proto/attachment_store.pb.h:53:27: error: variable has incomplete type 'class SYNC_EXPORT_PRIVATE'
class SYNC_EXPORT_PRIVATE StoreMetadata : public ::google::protobuf::MessageLite {
                          ^
/b/build/slave/iOS_Device/build/src/xcodebuild/DerivedSources/Release/protoc_out/sync/internal_api/attachments/proto/attachment_store.pb.h:53:7: note: forward declaration of 'attachment_store_pb::SYNC_EXPORT_PRIVATE'
class SYNC_EXPORT_PRIVATE StoreMetadata : public ::google::protobuf::MessageLite {
      ^
/b/build/slave/iOS_Device/build/src/xcodebuild/DerivedSources/Release/protoc_out/sync/internal_api/attachments/proto/attachment_store.pb.h:53:41: error: expected ';' after top level declarator
class SYNC_EXPORT_PRIVATE StoreMetadata : public ::google::protobuf::MessageLite {
                                        ^
                                        ;
/b/build/slave/iOS_Device/build/src/xcodebuild/DerivedSources/Release/protoc_out/sync/internal_api/attachments/proto/attachment_store.pb.h:53:43: error: expected unqualified-id
class SYNC_EXPORT_PRIVATE StoreMetadata : public ::google::protobuf::MessageLite {
                                          ^
/b/build/slave/iOS_Device/build/src/xcodebuild/DerivedSources/Release/protoc_out/sync/internal_api/attachments/proto/attachment_store.pb.h:146:27: error: variable has incomplete type 'class SYNC_EXPORT_PRIVATE'
class SYNC_EXPORT_PRIVATE RecordMetadata : public ::google::protobuf::MessageLite {
                          ^
/b/build/slave/iOS_Device/build/src/xcodebuild/DerivedSources/Release/protoc_out/sync/internal_api/attachments/proto/attachment_store.pb.h:53:7: note: forward declaration of 'attachment_store_pb::SYNC_EXPORT_PRIVATE'
class SYNC_EXPORT_PRIVATE StoreMetadata : public ::google::protobuf::MessageLite {
      ^
/b/build/slave/iOS_Device/build/src/xcodebuild/DerivedSources/Release/protoc_out/sync/internal_api/attachments/proto/attachment_store.pb.h:146:42: error: expected ';' after top level declarator
class SYNC_EXPORT_PRIVATE RecordMetadata : public ::google::protobuf::MessageLite {
                                         ^
                                         ;
/b/build/slave/iOS_Device/build/src/xcodebuild/DerivedSources/Release/protoc_out/sync/internal_api/attachments/proto/attachment_store.pb.h:146:44: error: expected unqualified-id
class SYNC_EXPORT_PRIVATE RecordMetadata : public ::google::protobuf::MessageLite {
                                           ^
/b/build/slave/iOS_Device/build/src/xcodebuild/DerivedSources/Release/protoc_out/sync/internal_api/attachments/proto/attachment_store.pb.h:280:13: error: incomplete type 'attachment_store_pb::StoreMetadata' named in nested name specifier
inline bool StoreMetadata::has_schema_version() const {
            ^~~~~~~~~~~~~~~
/b/build/slave/iOS_Device/build/src/xcodebuild/DerivedSources/Release/protoc_out/sync/internal_api/attachments/proto/attachment_store.pb.h:38:7: note: forward declaration of 'attachment_store_pb::StoreMetadata'
class StoreMetadata;
      ^
/b/build/slave/iOS_Device/build/src/xcodebuild/DerivedSources/Release/protoc_out/sync/internal_api/attachments/proto/attachment_store.pb.h:283:13: error: incomplete type 'attachment_store_pb::StoreMetadata' named in nested name specifier
inline void StoreMetadata::set_has_schema_version() {
            ^~~~~~~~~~~~~~~
/b/build/slave/iOS_Device/build/src/xcodebuild/DerivedSources/Release/protoc_out/sync/internal_api/attachments/proto/attachment_store.pb.h:38:7: note: forward declaration of 'attachment_store_pb::StoreMetadata'
class StoreMetadata;
      ^
/b/build/slave/iOS_Device/build/src/xcodebuild/DerivedSources/Release/protoc_out/sync/internal_api/attachments/proto/attachment_store.pb.h:286:13: error: incomplete type 'attachment_store_pb::StoreMetadata' named in nested name specifier
inline void StoreMetadata::clear_has_schema_version() {
            ^~~~~~~~~~~~~~~
/b/build/slave/iOS_Device/build/src/xcodebuild/DerivedSources/Release/protoc_out/sync/internal_api/attachments/proto/attachment_store.pb.h:38:7: note: forward declaration of 'attachment_store_pb::StoreMetadata'
class StoreMetadata;
      ^
/b/build/slave/iOS_Device/build/src/xcodebuild/DerivedSources/Release/protoc_out/sync/internal_api/attachments/proto/attachment_store.pb.h:289:13: error: incomplete type 'attachment_store_pb::StoreMetadata' named in nested name specifier
inline void StoreMetadata::clear_schema_version() {
            ^~~~~~~~~~~~~~~
/b/build/slave/iOS_Device/build/src/xcodebuild/DerivedSources/Release/protoc_out/sync/internal_api/attachments/proto/attachment_store.pb.h:38:7: note: forward declaration of 'attachment_store_pb::StoreMetadata'
class StoreMetadata;
      ^
/b/build/slave/iOS_Device/build/src/xcodebuild/DerivedSources/Release/protoc_out/sync/internal_api/attachments/proto/attachment_store.pb.h:293:34: error: incomplete type 'attachment_store_pb::StoreMetadata' named in nested name specifier
inline ::google::protobuf::int32 StoreMetadata::schema_version() const {
                                 ^~~~~~~~~~~~~~~
/b/build/slave/iOS_Device/build/src/xcodebuild/DerivedSources/Release/protoc_out/sync/internal_api/attachments/proto/attachment_store.pb.h:38:7: note: forward declaration of 'attachment_store_pb::StoreMetadata'
class StoreMetadata;
      ^
/b/build/slave/iOS_Device/build/src/xcodebuild/DerivedSources/Release/protoc_out/sync/internal_api/attachments/proto/attachment_store.pb.h:296:13: error: incomplete type 'attachment_store_pb::StoreMetadata' named in nested name specifier
inline void StoreMetadata::set_schema_version(::google::protobuf::int32 value) {
            ^~~~~~~~~~~~~~~
/b/build/slave/iOS_Device/build/src/xcodebuild/DerivedSources/Release/protoc_out/sync/internal_api/attachments/proto/attachment_store.pb.h:38:7: note: forward declaration of 'attachment_store_pb::StoreMetadata'
class StoreMetadata;
      ^
/b/build/slave/iOS_Device/build/src/xcodebuild/DerivedSources/Release/protoc_out/sync/internal_api/attachments/proto/attachment_store.pb.h:306:13: error: incomplete type 'attachment_store_pb::RecordMetadata' named in nested name specifier
inline bool RecordMetadata::has_attachment_size() const {
            ^~~~~~~~~~~~~~~~
/b/build/slave/iOS_Device/build/src/xcodebuild/DerivedSources/Release/protoc_out/sync/internal_api/attachments/proto/attachment_store.pb.h:39:7: note: forward declaration of 'attachment_store_pb::RecordMetadata'
class RecordMetadata;
      ^
/b/build/slave/iOS_Device/build/src/xcodebuild/DerivedSources/Release/protoc_out/sync/internal_api/attachments/proto/attachment_store.pb.h:309:13: error: incomplete type 'attachment_store_pb::RecordMetadata' named in nested name specifier
inline void RecordMetadata::set_has_attachment_size() {
            ^~~~~~~~~~~~~~~~
/b/build/slave/iOS_Device/build/src/xcodebuild/DerivedSources/Release/protoc_out/sync/internal_api/attachments/proto/attachment_store.pb.h:39:7: note: forward declaration of 'attachment_store_pb::RecordMetadata'
class RecordMetadata;
      ^
/b/build/slave/iOS_Device/build/src/xcodebuild/DerivedSources/Release/protoc_out/sync/internal_api/attachments/proto/attachment_store.pb.h:312:13: error: incomplete type 'attachment_store_pb::RecordMetadata' named in nested name specifier
inline void RecordMetadata::clear_has_attachment_size() {
            ^~~~~~~~~~~~~~~~
/b/build/slave/iOS_Device/build/src/xcodebuild/DerivedSources/Release/protoc_out/sync/internal_api/attachments/proto/attachment_store.pb.h:39:7: note: forward declaration of 'attachment_store_pb::RecordMetadata'
class RecordMetadata;
      ^
fatal error: too many errors emitted, stopping now [-ferror-limit=]
20 errors generated.

Original issue's description:
> [Sync] Removing SYNC_EXPORT_PRIVATE macro and fixing lint violations on
> all touched files.
>
> BUG=554242,567301
>
> Committed: https://crrev.com/1621aa930169650b0c4c371e743f3be58a70abae
> Cr-Commit-Position: refs/heads/master@{#363603}

TBR=zea@chromium.org,skym@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=554242,567301

Review URL: https://codereview.chromium.org/1503253004

Cr-Commit-Position: refs/heads/master@{#363609}

2 files changed, 84 insertions, 67 deletions

diff --git a/sync/protocol/proto_enum_conversions.h b/sync/protocol/proto_enum_conversions.h
index c379d01..e19fe6b 100644
--- a/sync/protocol/proto_enum_conversions.h
+++ b/sync/protocol/proto_enum_conversions.h
@@ -22,19 +22,20 @@ namespace syncer {
 // The returned strings (which don't have to be freed) are in ASCII.
 // The result of passing in an invalid enum value is undefined.
 
-SYNC_EXPORT const char* GetAppListItemTypeString(
+SYNC_EXPORT_PRIVATE const char* GetAppListItemTypeString(
     sync_pb::AppListSpecifics::AppListItemType item_type);
 
-SYNC_EXPORT const char* GetBrowserTypeString(
+SYNC_EXPORT_PRIVATE const char* GetBrowserTypeString(
     sync_pb::SessionWindow::BrowserType browser_type);
 
-SYNC_EXPORT const char* GetPageTransitionString(
+SYNC_EXPORT_PRIVATE const char* GetPageTransitionString(
     sync_pb::SyncEnums::PageTransition page_transition);
 
-SYNC_EXPORT const char* GetPageTransitionRedirectTypeString(
-    sync_pb::SyncEnums::PageTransitionRedirectType redirect_type);
+SYNC_EXPORT_PRIVATE const char* GetPageTransitionRedirectTypeString(
+    sync_pb::SyncEnums::PageTransitionRedirectType
+        redirect_type);
 
-SYNC_EXPORT const char* GetWifiCredentialSecurityClassString(
+SYNC_EXPORT_PRIVATE const char* GetWifiCredentialSecurityClassString(
     sync_pb::WifiCredentialSpecifics::SecurityClass security_class);
 
 SYNC_EXPORT const char* GetUpdatesSourceString(
@@ -43,27 +44,28 @@ SYNC_EXPORT const char* GetUpdatesSourceString(
 SYNC_EXPORT const char* GetUpdatesOriginString(
     sync_pb::SyncEnums::GetUpdatesOrigin origin);
 
-SYNC_EXPORT const char* GetResponseTypeString(
+SYNC_EXPORT_PRIVATE const char* GetResponseTypeString(
     sync_pb::CommitResponse::ResponseType response_type);
 
-SYNC_EXPORT const char* GetErrorTypeString(
+SYNC_EXPORT_PRIVATE const char* GetErrorTypeString(
     sync_pb::SyncEnums::ErrorType error_type);
 
-SYNC_EXPORT const char* GetActionString(sync_pb::SyncEnums::Action action);
+SYNC_EXPORT_PRIVATE const char* GetActionString(
+    sync_pb::SyncEnums::Action action);
 
-SYNC_EXPORT const char* GetLaunchTypeString(
+SYNC_EXPORT_PRIVATE const char* GetLaunchTypeString(
     sync_pb::AppSpecifics::LaunchType launch_type);
 
-SYNC_EXPORT const char* GetWalletInfoTypeString(
+SYNC_EXPORT_PRIVATE const char* GetWalletInfoTypeString(
     sync_pb::AutofillWalletSpecifics::WalletInfoType wallet_info_type);
 
-SYNC_EXPORT const char* GetWalletMetadataTypeString(
+SYNC_EXPORT_PRIVATE const char* GetWalletMetadataTypeString(
     sync_pb::WalletMetadataSpecifics::Type wallet_metadata_type);
 
-SYNC_EXPORT const char* GetWalletCardStatusString(
+SYNC_EXPORT_PRIVATE const char* GetWalletCardStatusString(
     sync_pb::WalletMaskedCreditCard::WalletCardStatus wallet_card_status);
 
-SYNC_EXPORT const char* GetWalletCardTypeString(
+SYNC_EXPORT_PRIVATE const char* GetWalletCardTypeString(
     sync_pb::WalletMaskedCreditCard::WalletCardType wallet_card_type);
 
 const char* GetDeviceTypeString(sync_pb::SyncEnums::DeviceType device_type);
diff --git a/sync/protocol/proto_value_conversions.h b/sync/protocol/proto_value_conversions.h
index 7a831bd..9ba4563 100644
--- a/sync/protocol/proto_value_conversions.h
+++ b/sync/protocol/proto_value_conversions.h
@@ -95,40 +95,41 @@ namespace syncer {
 // caller.
 
 // TODO(akalin): Perhaps extend this to decrypt?
-SYNC_EXPORT scoped_ptr<base::DictionaryValue> EncryptedDataToValue(
+SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> EncryptedDataToValue(
     const sync_pb::EncryptedData& encrypted_data);
 
 // Sub-protocol of AppListSpecifics.
-SYNC_EXPORT scoped_ptr<base::DictionaryValue> AppListSpecificsToValue(
+SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> AppListSpecificsToValue(
     const sync_pb::AppListSpecifics& proto);
 
 // Sub-protocols of AppSpecifics.
-SYNC_EXPORT scoped_ptr<base::DictionaryValue> AppSettingsToValue(
+SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> AppSettingsToValue(
     const sync_pb::AppNotificationSettings& app_notification_settings);
 
-SYNC_EXPORT scoped_ptr<base::DictionaryValue> LinkedAppIconInfoToValue(
+SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> LinkedAppIconInfoToValue(
     const sync_pb::LinkedAppIconInfo& linked_app_icon_info);
 
 // Sub-protocols of SessionSpecifics.
 
-SYNC_EXPORT scoped_ptr<base::DictionaryValue> SessionHeaderToValue(
+SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> SessionHeaderToValue(
     const sync_pb::SessionHeader& session_header);
 
-SYNC_EXPORT scoped_ptr<base::DictionaryValue> SessionTabToValue(
+SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> SessionTabToValue(
     const sync_pb::SessionTab& session_tab);
 
-SYNC_EXPORT scoped_ptr<base::DictionaryValue> SessionWindowToValue(
+SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> SessionWindowToValue(
     const sync_pb::SessionWindow& session_window);
 
-SYNC_EXPORT scoped_ptr<base::DictionaryValue> TabNavigationToValue(
+SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> TabNavigationToValue(
     const sync_pb::TabNavigation& tab_navigation);
 
-SYNC_EXPORT scoped_ptr<base::DictionaryValue> NavigationRedirectToValue(
+SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> NavigationRedirectToValue(
     const sync_pb::NavigationRedirect& navigation_redirect);
 
 // Sub-protocol of PasswordSpecifics.
 
-SYNC_EXPORT scoped_ptr<base::DictionaryValue> PasswordSpecificsDataToValue(
+SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue>
+PasswordSpecificsDataToValue(
     const sync_pb::PasswordSpecificsData& password_specifics_data);
 
 // Sub-protocol of NigoriSpecifics.
@@ -149,61 +150,69 @@ scoped_ptr<base::DictionaryValue> TimeRangeDirectiveToValue(
 scoped_ptr<base::DictionaryValue> KeystoreEncryptionToValue(
     const sync_pb::KeystoreEncryptionFlagsSpecifics& proto);
 
-SYNC_EXPORT scoped_ptr<base::DictionaryValue> SessionSpecificsToValue(
+SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> SessionSpecificsToValue(
     const sync_pb::SessionSpecifics& session_specifics);
 
 // Main *SpecificsToValue functions.
 
-SYNC_EXPORT scoped_ptr<base::DictionaryValue> AppNotificationToValue(
+SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> AppNotificationToValue(
     const sync_pb::AppNotification& app_notification_specifics);
 
 scoped_ptr<base::DictionaryValue> AppSettingSpecificsToValue(
     const sync_pb::AppSettingSpecifics& app_setting_specifics);
 
-SYNC_EXPORT scoped_ptr<base::DictionaryValue> AppSpecificsToValue(
+SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> AppSpecificsToValue(
     const sync_pb::AppSpecifics& app_specifics);
 
-SYNC_EXPORT scoped_ptr<base::DictionaryValue> ArticleSpecificsToValue(
+SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> ArticleSpecificsToValue(
     const sync_pb::ArticleSpecifics& article_specifics);
 
-SYNC_EXPORT scoped_ptr<base::DictionaryValue> AutofillSpecificsToValue(
+SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> AutofillSpecificsToValue(
     const sync_pb::AutofillSpecifics& autofill_specifics);
 
-SYNC_EXPORT scoped_ptr<base::DictionaryValue> AutofillProfileSpecificsToValue(
+SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue>
+AutofillProfileSpecificsToValue(
     const sync_pb::AutofillProfileSpecifics& autofill_profile_specifics);
 
-SYNC_EXPORT scoped_ptr<base::DictionaryValue> WalletMetadataSpecificsToValue(
+SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue>
+WalletMetadataSpecificsToValue(
     const sync_pb::WalletMetadataSpecifics& wallet_metadata_specifics);
 
-SYNC_EXPORT scoped_ptr<base::DictionaryValue> AutofillWalletSpecificsToValue(
+SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue>
+AutofillWalletSpecificsToValue(
     const sync_pb::AutofillWalletSpecifics& autofill_wallet_specifics);
 
-SYNC_EXPORT scoped_ptr<base::DictionaryValue> BookmarkSpecificsToValue(
+SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> BookmarkSpecificsToValue(
     const sync_pb::BookmarkSpecifics& bookmark_specifics);
 
-SYNC_EXPORT scoped_ptr<base::DictionaryValue> DeviceInfoSpecificsToValue(
+SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue>
+DeviceInfoSpecificsToValue(
     const sync_pb::DeviceInfoSpecifics& device_info_specifics);
 
-SYNC_EXPORT scoped_ptr<base::DictionaryValue> DictionarySpecificsToValue(
+SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue>
+DictionarySpecificsToValue(
     const sync_pb::DictionarySpecifics& dictionary_specifics);
 
-SYNC_EXPORT scoped_ptr<base::DictionaryValue> ExperimentsSpecificsToValue(
-    const sync_pb::ExperimentsSpecifics& proto);
+SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue>
+ExperimentsSpecificsToValue(const sync_pb::ExperimentsSpecifics& proto);
 
-SYNC_EXPORT scoped_ptr<base::DictionaryValue>
+SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue>
 PriorityPreferenceSpecificsToValue(
     const sync_pb::PriorityPreferenceSpecifics& proto);
 
-SYNC_EXPORT scoped_ptr<base::DictionaryValue> ExtensionSettingSpecificsToValue(
+SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue>
+ExtensionSettingSpecificsToValue(
     const sync_pb::ExtensionSettingSpecifics& extension_setting_specifics);
 
-SYNC_EXPORT scoped_ptr<base::DictionaryValue> ExtensionSpecificsToValue(
+SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> ExtensionSpecificsToValue(
     const sync_pb::ExtensionSpecifics& extension_specifics);
 
-SYNC_EXPORT scoped_ptr<base::DictionaryValue> FaviconImageSpecificsToValue(
+SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue>
+FaviconImageSpecificsToValue(
     const sync_pb::FaviconImageSpecifics& favicon_image_specifics);
 
-SYNC_EXPORT scoped_ptr<base::DictionaryValue> FaviconTrackingSpecificsToValue(
+SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue>
+FaviconTrackingSpecificsToValue(
     const sync_pb::FaviconTrackingSpecifics& favicon_tracking_specifics);
 
 SYNC_EXPORT scoped_ptr<base::DictionaryValue>
@@ -211,78 +220,84 @@ HistoryDeleteDirectiveSpecificsToValue(
     const sync_pb::HistoryDeleteDirectiveSpecifics&
         history_delete_directive_specifics);
 
-SYNC_EXPORT scoped_ptr<base::DictionaryValue>
+SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue>
 ManagedUserSettingSpecificsToValue(
     const sync_pb::ManagedUserSettingSpecifics& managed_user_setting_specifics);
 
-SYNC_EXPORT scoped_ptr<base::DictionaryValue> ManagedUserSpecificsToValue(
+SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue>
+ManagedUserSpecificsToValue(
     const sync_pb::ManagedUserSpecifics& managed_user_specifics);
 
-SYNC_EXPORT scoped_ptr<base::DictionaryValue>
+SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue>
 ManagedUserSharedSettingSpecificsToValue(
     const sync_pb::ManagedUserSharedSettingSpecifics&
         managed_user_shared_setting_specifics);
 
-SYNC_EXPORT scoped_ptr<base::DictionaryValue>
+SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue>
 ManagedUserWhitelistSpecificsToValue(
     const sync_pb::ManagedUserWhitelistSpecifics&
         managed_user_whitelist_specifics);
 
-SYNC_EXPORT scoped_ptr<base::DictionaryValue> MediaToValue(
+SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> MediaToValue(
     const sync_pb::Media& media);
 
-SYNC_EXPORT scoped_ptr<base::DictionaryValue> NigoriSpecificsToValue(
+SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> NigoriSpecificsToValue(
     const sync_pb::NigoriSpecifics& nigori_specifics);
 
-SYNC_EXPORT scoped_ptr<base::DictionaryValue> PasswordSpecificsToValue(
+SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> PasswordSpecificsToValue(
     const sync_pb::PasswordSpecifics& password_specifics);
 
-SYNC_EXPORT scoped_ptr<base::DictionaryValue> PreferenceSpecificsToValue(
+SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue>
+PreferenceSpecificsToValue(
     const sync_pb::PreferenceSpecifics& password_specifics);
 
-SYNC_EXPORT scoped_ptr<base::DictionaryValue>
+SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue>
 SyncedNotificationAppInfoSpecificsToValue(
     const sync_pb::SyncedNotificationAppInfoSpecifics&
         synced_notification_specifics);
 
-SYNC_EXPORT scoped_ptr<base::DictionaryValue>
+SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue>
 SyncedNotificationSpecificsToValue(
     const sync_pb::SyncedNotificationSpecifics& synced_notification_specifics);
 
-SYNC_EXPORT scoped_ptr<base::DictionaryValue> SearchEngineSpecificsToValue(
+SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue>
+SearchEngineSpecificsToValue(
     const sync_pb::SearchEngineSpecifics& search_engine_specifics);
 
-SYNC_EXPORT scoped_ptr<base::DictionaryValue> ThemeSpecificsToValue(
+SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> ThemeSpecificsToValue(
     const sync_pb::ThemeSpecifics& theme_specifics);
 
-SYNC_EXPORT scoped_ptr<base::DictionaryValue> TypedUrlSpecificsToValue(
+SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> TypedUrlSpecificsToValue(
     const sync_pb::TypedUrlSpecifics& typed_url_specifics);
 
-SYNC_EXPORT scoped_ptr<base::DictionaryValue> WalletMaskedCreditCardToValue(
+SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue>
+WalletMaskedCreditCardToValue(
     const sync_pb::WalletMaskedCreditCard& wallet_masked_card);
 
-SYNC_EXPORT scoped_ptr<base::DictionaryValue> WalletPostalAddressToValue(
+SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue>
+WalletPostalAddressToValue(
     const sync_pb::WalletPostalAddress& wallet_postal_address);
 
-SYNC_EXPORT scoped_ptr<base::DictionaryValue> WifiCredentialSpecificsToValue(
+SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue>
+WifiCredentialSpecificsToValue(
     const sync_pb::WifiCredentialSpecifics& wifi_credential_specifics);
 
 // Any present extensions are mapped to sub-dictionary values with the
 // key equal to the extension name.
-SYNC_EXPORT scoped_ptr<base::DictionaryValue> EntitySpecificsToValue(
+SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> EntitySpecificsToValue(
     const sync_pb::EntitySpecifics& specifics);
 
-SYNC_EXPORT scoped_ptr<base::DictionaryValue> SyncEntityToValue(
+SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> SyncEntityToValue(
     const sync_pb::SyncEntity& entity,
     bool include_specifics);
 
-SYNC_EXPORT scoped_ptr<base::DictionaryValue> ClientToServerMessageToValue(
-    const sync_pb::ClientToServerMessage& proto,
-    bool include_specifics);
+SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue>
+ClientToServerMessageToValue(const sync_pb::ClientToServerMessage& proto,
+                             bool include_specifics);
 
-SYNC_EXPORT scoped_ptr<base::DictionaryValue> ClientToServerResponseToValue(
-    const sync_pb::ClientToServerResponse& proto,
-    bool include_specifics);
+SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue>
+ClientToServerResponseToValue(const sync_pb::ClientToServerResponse& proto,
+                              bool include_specifics);
 
 scoped_ptr<base::DictionaryValue> DatatypeAssociationStatsToValue(
     const sync_pb::DatatypeAssociationStats& proto);
@@ -299,7 +314,7 @@ scoped_ptr<base::DictionaryValue> SyncCycleCompletedEventInfoToValue(
 scoped_ptr<base::DictionaryValue> ClientConfigParamsToValue(
     const sync_pb::ClientConfigParams& proto);
 
-SYNC_EXPORT scoped_ptr<base::DictionaryValue> AttachmentIdProtoToValue(
+SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> AttachmentIdProtoToValue(
     const sync_pb::AttachmentIdProto& proto);
 
 }  // namespace syncer