| Index: sync/internal_api/syncapi_internal.h
|
| diff --git a/sync/internal_api/syncapi_internal.h b/sync/internal_api/syncapi_internal.h
|
| index da8de7833ff1389f37e73903539a4d36adb03312..afc9c0a09cb77839d83507516b7160d72a02e1f0 100644
|
| --- a/sync/internal_api/syncapi_internal.h
|
| +++ b/sync/internal_api/syncapi_internal.h
|
| @@ -6,32 +6,31 @@
|
| #define SYNC_INTERNAL_API_SYNCAPI_INTERNAL_H_
|
|
|
| // The functions defined are shared among some of the classes that implement
|
| -// the internal csync. They are not to be used by clients of the API.
|
| +// the internal sync API. They are not to be used by clients of the API.
|
|
|
| #include <string>
|
|
|
| -namespace csync {
|
| -class Cryptographer;
|
| -}
|
| -
|
| namespace sync_pb {
|
| class EntitySpecifics;
|
| class PasswordSpecificsData;
|
| }
|
|
|
| -namespace csync {
|
| +namespace syncer {
|
| +
|
| +class Cryptographer;
|
| +
|
| sync_pb::PasswordSpecificsData* DecryptPasswordSpecifics(
|
| const sync_pb::EntitySpecifics& specifics,
|
| - csync::Cryptographer* crypto);
|
| + syncer::Cryptographer* crypto);
|
|
|
| -void SyncAPINameToServerName(const std::string& csync_name,
|
| +void SyncAPINameToServerName(const std::string& syncer_name,
|
| std::string* out);
|
|
|
| bool IsNameServerIllegalAfterTrimming(const std::string& name);
|
|
|
| -bool AreSpecificsEqual(const csync::Cryptographer* cryptographer,
|
| +bool AreSpecificsEqual(const syncer::Cryptographer* cryptographer,
|
| const sync_pb::EntitySpecifics& left,
|
| const sync_pb::EntitySpecifics& right);
|
| -}
|
| +} // namespace syncer
|
|
|
| #endif // SYNC_INTERNAL_API_SYNCAPI_INTERNAL_H_
|
|
|