summaryrefslogtreecommitdiffstats
path: root/sync/protocol
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/protocol
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/protocol')
-rw-r--r--sync/protocol/proto_enum_conversions.cc4
-rw-r--r--sync/protocol/proto_enum_conversions.h4
-rw-r--r--sync/protocol/proto_enum_conversions_unittest.cc4
-rw-r--r--sync/protocol/proto_value_conversions.cc4
-rw-r--r--sync/protocol/proto_value_conversions.h4
-rw-r--r--sync/protocol/proto_value_conversions_unittest.cc4
-rw-r--r--sync/protocol/sync_protocol_error.cc4
-rw-r--r--sync/protocol/sync_protocol_error.h4
8 files changed, 16 insertions, 16 deletions
diff --git a/sync/protocol/proto_enum_conversions.cc b/sync/protocol/proto_enum_conversions.cc
index f8fc148..d80b4e3 100644
--- a/sync/protocol/proto_enum_conversions.cc
+++ b/sync/protocol/proto_enum_conversions.cc
@@ -9,7 +9,7 @@
#include "base/basictypes.h"
#include "base/logging.h"
-namespace csync {
+namespace syncer {
#define ASSERT_ENUM_BOUNDS(enum_parent, enum_type, enum_min, enum_max) \
COMPILE_ASSERT(enum_parent::enum_type##_MIN == enum_parent::enum_min, \
@@ -170,4 +170,4 @@ const char* GetFaviconTypeString(
#undef ASSERT_ENUM_BOUNDS
#undef ENUM_CASE
-} // namespace
+} // namespace syncer
diff --git a/sync/protocol/proto_enum_conversions.h b/sync/protocol/proto_enum_conversions.h
index f9c07da..377ec0d 100644
--- a/sync/protocol/proto_enum_conversions.h
+++ b/sync/protocol/proto_enum_conversions.h
@@ -14,7 +14,7 @@
// Utility functions to get the string equivalent for some sync proto
// enums.
-namespace csync {
+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.
@@ -45,6 +45,6 @@ const char* GetDeviceTypeString(
const char* GetFaviconTypeString(
sync_pb::SessionTab::FaviconType favicon_type);
-} // namespace csync
+} // namespace syncer
#endif // SYNC_PROTOCOL_PROTO_ENUM_CONVERSIONS_H_
diff --git a/sync/protocol/proto_enum_conversions_unittest.cc b/sync/protocol/proto_enum_conversions_unittest.cc
index eb69d5a..de208b9 100644
--- a/sync/protocol/proto_enum_conversions_unittest.cc
+++ b/sync/protocol/proto_enum_conversions_unittest.cc
@@ -10,7 +10,7 @@
#include "testing/gtest/include/gtest/gtest.h"
-namespace csync {
+namespace syncer {
namespace {
class ProtoEnumConversionsTest : public testing::Test {
@@ -90,4 +90,4 @@ TEST_F(ProtoEnumConversionsTest, GetActionString) {
}
} // namespace
-} // namespace csync
+} // namespace syncer
diff --git a/sync/protocol/proto_value_conversions.cc b/sync/protocol/proto_value_conversions.cc
index 8b2e819..cee2139 100644
--- a/sync/protocol/proto_value_conversions.cc
+++ b/sync/protocol/proto_value_conversions.cc
@@ -29,7 +29,7 @@
#include "sync/protocol/theme_specifics.pb.h"
#include "sync/protocol/typed_url_specifics.pb.h"
-namespace csync {
+namespace syncer {
namespace {
@@ -593,4 +593,4 @@ DictionaryValue* ClientToServerMessageToValue(
#undef SET_FIELD
-} // namespace csync
+} // namespace syncer
diff --git a/sync/protocol/proto_value_conversions.h b/sync/protocol/proto_value_conversions.h
index 6c61903..4ef2400 100644
--- a/sync/protocol/proto_value_conversions.h
+++ b/sync/protocol/proto_value_conversions.h
@@ -50,7 +50,7 @@ class TypedUrlSpecifics;
//
// TODO(akalin): Improve enum support.
-namespace csync {
+namespace syncer {
// Ownership of all returned DictionaryValues are transferred to the
// caller.
@@ -148,6 +148,6 @@ base::DictionaryValue* ClientToServerResponseToValue(
bool include_specifics);
-} // namespace csync
+} // namespace syncer
#endif // SYNC_PROTOCOL_PROTO_VALUE_CONVERSIONS_H_
diff --git a/sync/protocol/proto_value_conversions_unittest.cc b/sync/protocol/proto_value_conversions_unittest.cc
index 6363c736..304a33f 100644
--- a/sync/protocol/proto_value_conversions_unittest.cc
+++ b/sync/protocol/proto_value_conversions_unittest.cc
@@ -27,7 +27,7 @@
#include "sync/protocol/typed_url_specifics.pb.h"
#include "testing/gtest/include/gtest/gtest.h"
-namespace csync {
+namespace syncer {
namespace {
class ProtoValueConversionsTest : public testing::Test {
@@ -250,4 +250,4 @@ TEST_F(ProtoValueConversionsTest, ClientToServerResponseToValue) {
}
} // namespace
-} // namespace csync
+} // namespace syncer
diff --git a/sync/protocol/sync_protocol_error.cc b/sync/protocol/sync_protocol_error.cc
index 61c0351..52421cd 100644
--- a/sync/protocol/sync_protocol_error.cc
+++ b/sync/protocol/sync_protocol_error.cc
@@ -9,7 +9,7 @@
#include "base/logging.h"
#include "base/values.h"
-namespace csync {
+namespace syncer {
#define ENUM_CASE(x) case x: return #x; break;
const char* GetSyncErrorTypeString(SyncProtocolErrorType type) {
@@ -59,5 +59,5 @@ DictionaryValue* SyncProtocolError::ToValue() const {
return value;
}
-} // namespace csync
+} // namespace syncer
diff --git a/sync/protocol/sync_protocol_error.h b/sync/protocol/sync_protocol_error.h
index fc83de1..718cc2d 100644
--- a/sync/protocol/sync_protocol_error.h
+++ b/sync/protocol/sync_protocol_error.h
@@ -10,7 +10,7 @@
#include "base/values.h"
#include "sync/internal_api/public/syncable/model_type.h"
-namespace csync{
+namespace syncer{
enum SyncProtocolErrorType {
// Success case.
@@ -76,6 +76,6 @@ struct SyncProtocolError {
const char* GetSyncErrorTypeString(SyncProtocolErrorType type);
const char* GetClientActionString(ClientAction action);
-} // namespace csync
+} // namespace syncer
#endif // SYNC_PROTOCOL_SYNC_PROTOCOL_ERROR_H_