diff options
author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-21 20:48:36 +0000 |
---|---|---|
committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-21 20:48:36 +0000 |
commit | d78354a5e74c5208dd9ebe83717b22223c1e1272 (patch) | |
tree | 4c616bbbfbf1776055d250644e1a47d435b11c8a /sync/protocol | |
parent | 41fed979ae412d2475a2860ea1ec95531bebb5af (diff) | |
download | chromium_src-d78354a5e74c5208dd9ebe83717b22223c1e1272.zip chromium_src-d78354a5e74c5208dd9ebe83717b22223c1e1272.tar.gz chromium_src-d78354a5e74c5208dd9ebe83717b22223c1e1272.tar.bz2 |
[Sync] Rename browser_sync to csync in sync/
Update all references from chrome.
Leave possibly-extraneous csync:: qualifications in sync/ for now.
(This will be cleaned up once everything in sync/ is in csync::.)
BUG=128060
TEST=
TBR=jhawkins@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10600002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143449 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/protocol')
-rw-r--r-- | sync/protocol/proto_enum_conversions.cc | 2 | ||||
-rw-r--r-- | sync/protocol/proto_enum_conversions.h | 4 | ||||
-rw-r--r-- | sync/protocol/proto_enum_conversions_unittest.cc | 4 | ||||
-rw-r--r-- | sync/protocol/proto_value_conversions.cc | 4 | ||||
-rw-r--r-- | sync/protocol/proto_value_conversions.h | 4 | ||||
-rw-r--r-- | sync/protocol/proto_value_conversions_unittest.cc | 4 | ||||
-rw-r--r-- | sync/protocol/sync_protocol_error.cc | 4 | ||||
-rw-r--r-- | sync/protocol/sync_protocol_error.h | 4 |
8 files changed, 15 insertions, 15 deletions
diff --git a/sync/protocol/proto_enum_conversions.cc b/sync/protocol/proto_enum_conversions.cc index 7c6433e..f8fc148 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 browser_sync { +namespace csync { #define ASSERT_ENUM_BOUNDS(enum_parent, enum_type, enum_min, enum_max) \ COMPILE_ASSERT(enum_parent::enum_type##_MIN == enum_parent::enum_min, \ diff --git a/sync/protocol/proto_enum_conversions.h b/sync/protocol/proto_enum_conversions.h index abb65ed1..f9c07da 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 browser_sync { +namespace csync { // 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 browser_sync +} // namespace csync #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 5fa53b2..eb69d5a 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 browser_sync { +namespace csync { namespace { class ProtoEnumConversionsTest : public testing::Test { @@ -90,4 +90,4 @@ TEST_F(ProtoEnumConversionsTest, GetActionString) { } } // namespace -} // namespace browser_sync +} // namespace csync diff --git a/sync/protocol/proto_value_conversions.cc b/sync/protocol/proto_value_conversions.cc index 4f31b8e..8b2e819 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 browser_sync { +namespace csync { namespace { @@ -593,4 +593,4 @@ DictionaryValue* ClientToServerMessageToValue( #undef SET_FIELD -} // namespace browser_sync +} // namespace csync diff --git a/sync/protocol/proto_value_conversions.h b/sync/protocol/proto_value_conversions.h index 4fa8ca5..6c61903 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 browser_sync { +namespace csync { // Ownership of all returned DictionaryValues are transferred to the // caller. @@ -148,6 +148,6 @@ base::DictionaryValue* ClientToServerResponseToValue( bool include_specifics); -} // namespace browser_sync +} // namespace csync #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 4c4c6a7..6363c736 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 browser_sync { +namespace csync { namespace { class ProtoValueConversionsTest : public testing::Test { @@ -250,4 +250,4 @@ TEST_F(ProtoValueConversionsTest, ClientToServerResponseToValue) { } } // namespace -} // namespace browser_sync +} // namespace csync diff --git a/sync/protocol/sync_protocol_error.cc b/sync/protocol/sync_protocol_error.cc index 544d98a..61c0351 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 browser_sync { +namespace csync { #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 browser_sync +} // namespace csync diff --git a/sync/protocol/sync_protocol_error.h b/sync/protocol/sync_protocol_error.h index be43980..fc83de1 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 browser_sync{ +namespace csync{ enum SyncProtocolErrorType { // Success case. @@ -76,6 +76,6 @@ struct SyncProtocolError { const char* GetSyncErrorTypeString(SyncProtocolErrorType type); const char* GetClientActionString(ClientAction action); -} // namespace browser_sync +} // namespace csync #endif // SYNC_PROTOCOL_SYNC_PROTOCOL_ERROR_H_ |