summaryrefslogtreecommitdiffstats
path: root/sync/internal_api/syncapi_internal.cc
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-28 22:43:58 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-28 22:43:58 +0000
commit65f173550226cb0dcf577183a462d48c47764ee3 (patch)
tree9d4451edfc037f39658b804f95a3fbdbc85a7bd5 /sync/internal_api/syncapi_internal.cc
parent7953ef8eea2001287dbd233421226ad3f0e16448 (diff)
downloadchromium_src-65f173550226cb0dcf577183a462d48c47764ee3.zip
chromium_src-65f173550226cb0dcf577183a462d48c47764ee3.tar.gz
chromium_src-65f173550226cb0dcf577183a462d48c47764ee3.tar.bz2
[Sync] Rename csync namespace to syncer
Everyone was confused by 'csync'. 'syncer' seems more understandable. (Note that we can't use the 'sync' namespace since sync() is a function from unistd.h.) BUG=10662035 TEST= TBR=jhawkins@chromium.org,pkasting@chromium.org Review URL: https://chromiumcodereview.appspot.com/10698014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144820 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/internal_api/syncapi_internal.cc')
-rw-r--r--sync/internal_api/syncapi_internal.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/sync/internal_api/syncapi_internal.cc b/sync/internal_api/syncapi_internal.cc
index c6b1cad..282082b 100644
--- a/sync/internal_api/syncapi_internal.cc
+++ b/sync/internal_api/syncapi_internal.cc
@@ -9,9 +9,9 @@
#include "sync/protocol/sync.pb.h"
#include "sync/util/cryptographer.h"
-using csync::Cryptographer;
+using syncer::Cryptographer;
-namespace csync {
+namespace syncer {
sync_pb::PasswordSpecificsData* DecryptPasswordSpecifics(
const sync_pb::EntitySpecifics& specifics, Cryptographer* crypto) {
@@ -33,9 +33,9 @@ static const char* kForbiddenServerNames[] = { "", ".", ".." };
// When taking a name from the syncapi, append a space if it matches the
// pattern of a server-illegal name followed by zero or more spaces.
-void SyncAPINameToServerName(const std::string& csync_name,
+void SyncAPINameToServerName(const std::string& syncer_name,
std::string* out) {
- *out = csync_name;
+ *out = syncer_name;
if (IsNameServerIllegalAfterTrimming(*out))
out->append(" ");
}
@@ -54,7 +54,7 @@ bool IsNameServerIllegalAfterTrimming(const std::string& name) {
}
// Compare the values of two EntitySpecifics, accounting for encryption.
-bool AreSpecificsEqual(const csync::Cryptographer* cryptographer,
+bool AreSpecificsEqual(const syncer::Cryptographer* cryptographer,
const sync_pb::EntitySpecifics& left,
const sync_pb::EntitySpecifics& right) {
// Note that we can't compare encrypted strings directly as they are seeded
@@ -84,4 +84,4 @@ bool AreSpecificsEqual(const csync::Cryptographer* cryptographer,
return false;
}
-} // namespace csync
+} // namespace syncer