diff options
Diffstat (limited to 'sync/engine')
74 files changed, 234 insertions, 235 deletions
diff --git a/sync/engine/all_status.cc b/sync/engine/all_status.cc index e9e1a20..b5a0025 100644 --- a/sync/engine/all_status.cc +++ b/sync/engine/all_status.cc @@ -12,7 +12,7 @@ #include "sync/internal_api/public/syncable/model_type.h" #include "sync/sessions/session_state.h" -namespace csync { +namespace syncer { AllStatus::AllStatus() { status_.initial_sync_ended = true; @@ -24,11 +24,11 @@ AllStatus::AllStatus() { AllStatus::~AllStatus() { } -csync::SyncStatus AllStatus::CreateBlankStatus() const { +syncer::SyncStatus AllStatus::CreateBlankStatus() const { // Status is initialized with the previous status value. Variables // whose values accumulate (e.g. lifetime counters like updates_received) // are not to be cleared here. - csync::SyncStatus status = status_; + syncer::SyncStatus status = status_; status.encryption_conflicts = 0; status.hierarchy_conflicts = 0; status.simple_conflicts = 0; @@ -39,9 +39,9 @@ csync::SyncStatus AllStatus::CreateBlankStatus() const { return status; } -csync::SyncStatus AllStatus::CalcSyncing( +syncer::SyncStatus AllStatus::CalcSyncing( const SyncEngineEvent &event) const { - csync::SyncStatus status = CreateBlankStatus(); + syncer::SyncStatus status = CreateBlankStatus(); const sessions::SyncSessionSnapshot& snapshot = event.snapshot; status.encryption_conflicts = snapshot.num_encryption_conflicts(); status.hierarchy_conflicts = snapshot.num_hierarchy_conflicts(); @@ -120,7 +120,7 @@ void AllStatus::OnSyncEngineEvent(const SyncEngineEvent& event) { } } -csync::SyncStatus AllStatus::status() const { +syncer::SyncStatus AllStatus::status() const { base::AutoLock lock(mutex_); return status_; } @@ -169,4 +169,4 @@ ScopedStatusLock::~ScopedStatusLock() { allstatus_->mutex_.Release(); } -} // namespace csync +} // namespace syncer diff --git a/sync/engine/all_status.h b/sync/engine/all_status.h index 4e19ef6..bb4a943 100644 --- a/sync/engine/all_status.h +++ b/sync/engine/all_status.h @@ -19,7 +19,7 @@ #include "sync/internal_api/public/engine/sync_status.h" #include "sync/internal_api/public/syncable/model_type.h" -namespace csync { +namespace syncer { class ScopedStatusLock; struct ServerConnectionEvent; @@ -41,7 +41,7 @@ class AllStatus : public SyncEngineEventListener { virtual void OnSyncEngineEvent(const SyncEngineEvent& event) OVERRIDE; - csync::SyncStatus status() const; + syncer::SyncStatus status() const; void SetNotificationsEnabled(bool notifications_enabled); @@ -60,10 +60,10 @@ class AllStatus : public SyncEngineEventListener { protected: // Examines syncer to calculate syncing and the unsynced count, // and returns a Status with new values. - csync::SyncStatus CalcSyncing(const SyncEngineEvent& event) const; - csync::SyncStatus CreateBlankStatus() const; + syncer::SyncStatus CalcSyncing(const SyncEngineEvent& event) const; + syncer::SyncStatus CreateBlankStatus() const; - csync::SyncStatus status_; + syncer::SyncStatus status_; mutable base::Lock mutex_; // Protects all data members. DISALLOW_COPY_AND_ASSIGN(AllStatus); @@ -77,6 +77,6 @@ class ScopedStatusLock { AllStatus* allstatus_; }; -} // namespace csync +} // namespace syncer #endif // SYNC_INTERNAL_API_ALL_STATUS_H_ diff --git a/sync/engine/apply_updates_command.cc b/sync/engine/apply_updates_command.cc index fd18ff2..c23241c 100644 --- a/sync/engine/apply_updates_command.cc +++ b/sync/engine/apply_updates_command.cc @@ -11,7 +11,7 @@ #include "sync/syncable/read_transaction.h" #include "sync/syncable/write_transaction.h" -namespace csync { +namespace syncer { using sessions::SyncSession; @@ -85,4 +85,4 @@ SyncerError ApplyUpdatesCommand::ModelChangingExecuteImpl( return SYNCER_OK; } -} // namespace csync +} // namespace syncer diff --git a/sync/engine/apply_updates_command.h b/sync/engine/apply_updates_command.h index b6885c3..bea1a7f 100644 --- a/sync/engine/apply_updates_command.h +++ b/sync/engine/apply_updates_command.h @@ -9,7 +9,7 @@ #include "base/compiler_specific.h" #include "sync/engine/model_changing_syncer_command.h" -namespace csync { +namespace syncer { class ApplyUpdatesCommand : public ModelChangingSyncerCommand { public: @@ -27,6 +27,6 @@ class ApplyUpdatesCommand : public ModelChangingSyncerCommand { DISALLOW_COPY_AND_ASSIGN(ApplyUpdatesCommand); }; -} // namespace csync +} // namespace syncer #endif // SYNC_ENGINE_APPLY_UPDATES_COMMAND_H_ diff --git a/sync/engine/apply_updates_command_unittest.cc b/sync/engine/apply_updates_command_unittest.cc index 5e43d0a..7f9e475 100644 --- a/sync/engine/apply_updates_command_unittest.cc +++ b/sync/engine/apply_updates_command_unittest.cc @@ -27,7 +27,7 @@ #include "sync/util/cryptographer.h" #include "testing/gtest/include/gtest/gtest.h" -namespace csync { +namespace syncer { using sessions::SyncSession; using std::string; @@ -380,7 +380,7 @@ TEST_F(ApplyUpdatesCommandTest, DecryptablePassword) { cryptographer = directory()->GetCryptographer(&trans); } - csync::KeyParams params = {"localhost", "dummy", "foobar"}; + syncer::KeyParams params = {"localhost", "dummy", "foobar"}; cryptographer->AddKey(params); sync_pb::EntitySpecifics specifics; @@ -856,4 +856,4 @@ TEST_F(ApplyUpdatesCommandTest, CannotEncryptUnsyncedChanges) { } } -} // namespace csync +} // namespace syncer diff --git a/sync/engine/build_commit_command.cc b/sync/engine/build_commit_command.cc index c83bd69..f3c0a9f 100644 --- a/sync/engine/build_commit_command.cc +++ b/sync/engine/build_commit_command.cc @@ -33,7 +33,7 @@ using syncable::MutableEntry; using syncable::SPECIFICS; using syncable::UNSPECIFIED; -namespace csync { +namespace syncer { using sessions::SyncSession; @@ -261,4 +261,4 @@ int64 BuildCommitCommand::InterpolatePosition(const int64 lo, } -} // namespace csync +} // namespace syncer diff --git a/sync/engine/build_commit_command.h b/sync/engine/build_commit_command.h index 53bafd7..d72765b 100644 --- a/sync/engine/build_commit_command.h +++ b/sync/engine/build_commit_command.h @@ -17,7 +17,7 @@ namespace syncable { class Entry; } -namespace csync { +namespace syncer { namespace sessions { class OrderedCommitSet; @@ -74,6 +74,6 @@ class BuildCommitCommand : public SyncerCommand { ClientToServerMessage* commit_message_; }; -} // namespace csync +} // namespace syncer #endif // SYNC_ENGINE_BUILD_COMMIT_COMMAND_H_ diff --git a/sync/engine/build_commit_command_unittest.cc b/sync/engine/build_commit_command_unittest.cc index f92bcd0..59e98ea 100644 --- a/sync/engine/build_commit_command_unittest.cc +++ b/sync/engine/build_commit_command_unittest.cc @@ -5,7 +5,7 @@ #include "sync/engine/build_commit_command.h" #include "sync/test/engine/syncer_command_test.h" -namespace csync { +namespace syncer { // A test fixture for tests exercising ClearDataCommandTest. class BuildCommitCommandTest : public SyncerCommandTest { @@ -102,6 +102,6 @@ TEST_F(BuildCommitCommandTest, InterpolatePosition) { command_.InterpolatePosition(0, BuildCommitCommand::GetGap()*2 + 1)); } -} // namespace csync +} // namespace syncer diff --git a/sync/engine/cleanup_disabled_types_command.cc b/sync/engine/cleanup_disabled_types_command.cc index 953dc6c..233f11c 100644 --- a/sync/engine/cleanup_disabled_types_command.cc +++ b/sync/engine/cleanup_disabled_types_command.cc @@ -11,7 +11,7 @@ #include "sync/sessions/sync_session_context.h" #include "sync/syncable/directory.h" -namespace csync { +namespace syncer { CleanupDisabledTypesCommand::CleanupDisabledTypesCommand() {} CleanupDisabledTypesCommand::~CleanupDisabledTypesCommand() {} @@ -66,5 +66,5 @@ SyncerError CleanupDisabledTypesCommand::ExecuteImpl( return SYNCER_OK; } -} // namespace csync +} // namespace syncer diff --git a/sync/engine/cleanup_disabled_types_command.h b/sync/engine/cleanup_disabled_types_command.h index 45ec01d..5d2ec38 100644 --- a/sync/engine/cleanup_disabled_types_command.h +++ b/sync/engine/cleanup_disabled_types_command.h @@ -9,7 +9,7 @@ #include "base/compiler_specific.h" #include "sync/engine/syncer_command.h" -namespace csync { +namespace syncer { // A syncer command that purges (from memory and disk) entries belonging to // a ModelType or ServerModelType that the user has not elected to sync. @@ -40,7 +40,7 @@ class CleanupDisabledTypesCommand : public SyncerCommand { DISALLOW_COPY_AND_ASSIGN(CleanupDisabledTypesCommand); }; -} // namespace csync +} // namespace syncer #endif // SYNC_ENGINE_CLEANUP_DISABLED_TYPES_COMMAND_H_ diff --git a/sync/engine/cleanup_disabled_types_command_unittest.cc b/sync/engine/cleanup_disabled_types_command_unittest.cc index d386136..d16d0b9 100644 --- a/sync/engine/cleanup_disabled_types_command_unittest.cc +++ b/sync/engine/cleanup_disabled_types_command_unittest.cc @@ -12,7 +12,7 @@ #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -namespace csync { +namespace syncer { namespace { @@ -74,4 +74,4 @@ TEST_F(CleanupDisabledTypesCommandTest, TypeDisabled) { } // namespace -} // namespace csync +} // namespace syncer diff --git a/sync/engine/commit.cc b/sync/engine/commit.cc index 4da658d..734cd6c 100644 --- a/sync/engine/commit.cc +++ b/sync/engine/commit.cc @@ -16,7 +16,7 @@ using syncable::SYNCER; using syncable::WriteTransaction; -namespace csync { +namespace syncer { using sessions::SyncSession; using sessions::StatusController; @@ -156,4 +156,4 @@ SyncerError BuildAndPostCommits(Syncer* syncer, return result; } -} // namespace csync +} // namespace syncer diff --git a/sync/engine/commit.h b/sync/engine/commit.h index 5e8e0fa..2169adf 100644 --- a/sync/engine/commit.h +++ b/sync/engine/commit.h @@ -8,7 +8,7 @@ #include "sync/internal_api/public/util/syncer_error.h" -namespace csync { +namespace syncer { namespace sessions { class SyncSession; @@ -32,6 +32,6 @@ SyncerError BuildAndPostCommits( Syncer* syncer, sessions::SyncSession* session); -} // namespace csync +} // namespace syncer #endif // SYNC_ENGINE_COMMIT_H_ diff --git a/sync/engine/conflict_resolver.cc b/sync/engine/conflict_resolver.cc index 156bc90..e708f45 100644 --- a/sync/engine/conflict_resolver.cc +++ b/sync/engine/conflict_resolver.cc @@ -32,7 +32,7 @@ using syncable::IsRealDataType; using syncable::MutableEntry; using syncable::WriteTransaction; -namespace csync { +namespace syncer { using sessions::ConflictProgress; using sessions::StatusController; @@ -417,4 +417,4 @@ bool ConflictResolver::ResolveConflicts(syncable::WriteTransaction* trans, return forward_progress; } -} // namespace csync +} // namespace syncer diff --git a/sync/engine/conflict_resolver.h b/sync/engine/conflict_resolver.h index fedaa45..733348c 100644 --- a/sync/engine/conflict_resolver.h +++ b/sync/engine/conflict_resolver.h @@ -24,7 +24,7 @@ class MutableEntry; class WriteTransaction; } // namespace syncable -namespace csync { +namespace syncer { class Cryptographer; @@ -84,6 +84,6 @@ class ConflictResolver { DISALLOW_COPY_AND_ASSIGN(ConflictResolver); }; -} // namespace csync +} // namespace syncer #endif // SYNC_ENGINE_CONFLICT_RESOLVER_H_ diff --git a/sync/engine/download_updates_command.cc b/sync/engine/download_updates_command.cc index fb74f3d..f73c350 100644 --- a/sync/engine/download_updates_command.cc +++ b/sync/engine/download_updates_command.cc @@ -15,7 +15,7 @@ using sync_pb::DebugInfo; -namespace csync { +namespace syncer { using sessions::StatusController; using sessions::SyncSession; using std::string; @@ -127,4 +127,4 @@ void DownloadUpdatesCommand::AppendClientDebugInfoIfNeeded( } -} // namespace csync +} // namespace syncer diff --git a/sync/engine/download_updates_command.h b/sync/engine/download_updates_command.h index 527844e..56b73c8 100644 --- a/sync/engine/download_updates_command.h +++ b/sync/engine/download_updates_command.h @@ -18,7 +18,7 @@ namespace sync_pb { class EntitySpecifics; } -namespace csync { +namespace syncer { // Determine the enabled datatypes, download a batch of updates for them // from the server, place the result in the SyncSession for further processing. @@ -59,7 +59,7 @@ class DownloadUpdatesCommand : public SyncerCommand { DISALLOW_COPY_AND_ASSIGN(DownloadUpdatesCommand); }; -} // namespace csync +} // namespace syncer #endif // SYNC_ENGINE_DOWNLOAD_UPDATES_COMMAND_H_ diff --git a/sync/engine/download_updates_command_unittest.cc b/sync/engine/download_updates_command_unittest.cc index 9a9739f..ed0d6bb 100644 --- a/sync/engine/download_updates_command_unittest.cc +++ b/sync/engine/download_updates_command_unittest.cc @@ -11,7 +11,7 @@ #include "sync/test/engine/syncer_command_test.h" using ::testing::_; -namespace csync { +namespace syncer { using syncable::FIRST_REAL_MODEL_TYPE; using syncable::MODEL_TYPE_COUNT; @@ -71,4 +71,4 @@ TEST_F(DownloadUpdatesCommandTest, VerifyAppendDebugInfo) { command_.AppendClientDebugInfoIfNeeded(session(), &debug_info); } -} // namespace csync +} // namespace syncer diff --git a/sync/engine/get_commit_ids_command.cc b/sync/engine/get_commit_ids_command.cc index d3264f2..4b70d88 100644 --- a/sync/engine/get_commit_ids_command.cc +++ b/sync/engine/get_commit_ids_command.cc @@ -19,7 +19,7 @@ using std::set; using std::vector; -namespace csync { +namespace syncer { using sessions::OrderedCommitSet; using sessions::SyncSession; @@ -432,4 +432,4 @@ void GetCommitIdsCommand::BuildCommitIds( AddDeletes(write_transaction, ready_unsynced_set); } -} // namespace csync +} // namespace syncer diff --git a/sync/engine/get_commit_ids_command.h b/sync/engine/get_commit_ids_command.h index 5d9117f..f6b8a66 100644 --- a/sync/engine/get_commit_ids_command.h +++ b/sync/engine/get_commit_ids_command.h @@ -19,7 +19,7 @@ using std::pair; using std::vector; -namespace csync { +namespace syncer { // A class that contains the code used to search the syncable::Directory for // locally modified items that are ready to be committed to the server. @@ -135,6 +135,6 @@ class GetCommitIdsCommand : public SyncerCommand { DISALLOW_COPY_AND_ASSIGN(GetCommitIdsCommand); }; -} // namespace csync +} // namespace syncer #endif // SYNC_ENGINE_GET_COMMIT_IDS_COMMAND_H_ diff --git a/sync/engine/model_changing_syncer_command.cc b/sync/engine/model_changing_syncer_command.cc index 08340a4..3fe6b2d 100644 --- a/sync/engine/model_changing_syncer_command.cc +++ b/sync/engine/model_changing_syncer_command.cc @@ -10,7 +10,7 @@ #include "sync/sessions/status_controller.h" #include "sync/sessions/sync_session.h" -namespace csync { +namespace syncer { SyncerError ModelChangingSyncerCommand::ExecuteImpl( sessions::SyncSession* session) { @@ -48,4 +48,4 @@ SyncerError ModelChangingSyncerCommand::ExecuteImpl( return result; } -} // namespace csync +} // namespace syncer diff --git a/sync/engine/model_changing_syncer_command.h b/sync/engine/model_changing_syncer_command.h index 44f045a..ad6dc63 100644 --- a/sync/engine/model_changing_syncer_command.h +++ b/sync/engine/model_changing_syncer_command.h @@ -10,7 +10,7 @@ #include "sync/engine/syncer_command.h" #include "sync/internal_api/public/engine/model_safe_worker.h" -namespace csync { +namespace syncer { namespace sessions { class SyncSession; } @@ -31,7 +31,7 @@ class ModelChangingSyncerCommand : public SyncerCommand { virtual ~ModelChangingSyncerCommand() { } // SyncerCommand implementation. Sets work_session to session. - virtual csync::SyncerError ExecuteImpl( + virtual syncer::SyncerError ExecuteImpl( sessions::SyncSession* session) OVERRIDE; // Wrapper so implementations don't worry about storing work_session. @@ -72,6 +72,6 @@ class ModelChangingSyncerCommand : public SyncerCommand { DISALLOW_COPY_AND_ASSIGN(ModelChangingSyncerCommand); }; -} // namespace csync +} // namespace syncer #endif // SYNC_ENGINE_MODEL_CHANGING_SYNCER_COMMAND_H_ diff --git a/sync/engine/model_changing_syncer_command_unittest.cc b/sync/engine/model_changing_syncer_command_unittest.cc index 16e8dab..ac898c5 100644 --- a/sync/engine/model_changing_syncer_command_unittest.cc +++ b/sync/engine/model_changing_syncer_command_unittest.cc @@ -12,7 +12,7 @@ #include "sync/test/engine/syncer_command_test.h" #include "testing/gtest/include/gtest/gtest.h" -namespace csync { +namespace syncer { namespace { @@ -74,4 +74,4 @@ TEST_F(ModelChangingSyncerCommandTest, Basic) { } // namespace -} // namespace csync +} // namespace syncer diff --git a/sync/engine/net/server_connection_manager.cc b/sync/engine/net/server_connection_manager.cc index 152223a..ff85d10 100644 --- a/sync/engine/net/server_connection_manager.cc +++ b/sync/engine/net/server_connection_manager.cc @@ -20,7 +20,7 @@ #include "sync/protocol/sync.pb.h" #include "sync/syncable/directory.h" -namespace csync { +namespace syncer { using std::ostream; using std::string; @@ -330,4 +330,4 @@ std::ostream& operator << (std::ostream& s, const struct HttpResponse& hr) { return s; } -} // namespace csync +} // namespace syncer diff --git a/sync/engine/net/server_connection_manager.h b/sync/engine/net/server_connection_manager.h index c61352e..a94582b 100644 --- a/sync/engine/net/server_connection_manager.h +++ b/sync/engine/net/server_connection_manager.h @@ -26,7 +26,7 @@ namespace sync_pb { class ClientToServerMessage; } -namespace csync { +namespace syncer { static const int32 kUnsetResponseCode = -1; static const int32 kUnsetContentLength = -1; @@ -348,6 +348,6 @@ bool FillMessageWithShareDetails(sync_pb::ClientToServerMessage* csm, std::ostream& operator<<(std::ostream& s, const struct HttpResponse& hr); -} // namespace csync +} // namespace syncer #endif // SYNC_ENGINE_NET_SERVER_CONNECTION_MANAGER_H_ diff --git a/sync/engine/net/url_translator.cc b/sync/engine/net/url_translator.cc index 3c18794..e9cae5a 100644 --- a/sync/engine/net/url_translator.cc +++ b/sync/engine/net/url_translator.cc @@ -13,7 +13,7 @@ using std::string; -namespace csync { +namespace syncer { namespace { // Parameters that the server understands. (here, a-Z) @@ -54,4 +54,4 @@ string MakeSyncQueryString(const string& client_id) { return query; } -} // namespace csync +} // namespace syncer diff --git a/sync/engine/net/url_translator.h b/sync/engine/net/url_translator.h index 1842380..043a2fe 100644 --- a/sync/engine/net/url_translator.h +++ b/sync/engine/net/url_translator.h @@ -11,7 +11,7 @@ #include <string> -namespace csync { +namespace syncer { // Convenience wrappers around CgiEscapePath(), used by gaia_auth. std::string CgiEscapeString(const char* src); @@ -23,6 +23,6 @@ std::string MakeSyncServerPath(const std::string& path, std::string MakeSyncQueryString(const std::string& client_id); -} // namespace csync +} // namespace syncer #endif // SYNC_ENGINE_NET_URL_TRANSLATOR_H_ diff --git a/sync/engine/nigori_util.cc b/sync/engine/nigori_util.cc index 765cf0a..e7d4e5c 100644 --- a/sync/engine/nigori_util.cc +++ b/sync/engine/nigori_util.cc @@ -20,7 +20,7 @@ namespace syncable { bool ProcessUnsyncedChangesForEncryption( WriteTransaction* const trans, - csync::Cryptographer* cryptographer) { + syncer::Cryptographer* cryptographer) { DCHECK(cryptographer->is_ready()); // Get list of all datatypes with unsynced changes. It's possible that our // local changes need to be encrypted if encryption for that datatype was @@ -29,7 +29,7 @@ bool ProcessUnsyncedChangesForEncryption( // changes in this code path are likely due to consistency issues (we have // to be updated to a key we already have, e.g. an old key). std::vector<int64> handles; - csync::SyncerUtil::GetUnsyncedEntries(trans, &handles); + syncer::SyncerUtil::GetUnsyncedEntries(trans, &handles); for (size_t i = 0; i < handles.size(); ++i) { MutableEntry entry(trans, GET_BY_HANDLE, handles[i]); const sync_pb::EntitySpecifics& specifics = entry.Get(SPECIFICS); @@ -51,7 +51,7 @@ bool VerifyUnsyncedChangesAreEncrypted( BaseTransaction* const trans, ModelTypeSet encrypted_types) { std::vector<int64> handles; - csync::SyncerUtil::GetUnsyncedEntries(trans, &handles); + syncer::SyncerUtil::GetUnsyncedEntries(trans, &handles); for (size_t i = 0; i < handles.size(); ++i) { Entry entry(trans, GET_BY_HANDLE, handles[i]); if (!entry.good()) { @@ -92,7 +92,7 @@ bool SpecificsNeedsEncryption(ModelTypeSet encrypted_types, // Mainly for testing. bool VerifyDataTypeEncryptionForTest( BaseTransaction* const trans, - csync::Cryptographer* cryptographer, + syncer::Cryptographer* cryptographer, ModelType type, bool is_encrypted) { if (type == PASSWORDS || type == NIGORI) { @@ -156,7 +156,7 @@ bool VerifyDataTypeEncryptionForTest( } bool UpdateEntryWithEncryption( - csync::Cryptographer* cryptographer, + syncer::Cryptographer* cryptographer, const sync_pb::EntitySpecifics& new_specifics, syncable::MutableEntry* entry) { syncable::ModelType type = syncable::GetModelTypeFromSpecifics(new_specifics); diff --git a/sync/engine/nigori_util.h b/sync/engine/nigori_util.h index 5e5c20a..9d3e2de 100644 --- a/sync/engine/nigori_util.h +++ b/sync/engine/nigori_util.h @@ -12,7 +12,7 @@ #include "sync/internal_api/public/syncable/model_type.h" #include "sync/protocol/nigori_specifics.pb.h" -namespace csync { +namespace syncer { class Cryptographer; } @@ -43,7 +43,7 @@ bool VerifyUnsyncedChangesAreEncrypted( // or unencrypted, based on |encrypted_types|. bool ProcessUnsyncedChangesForEncryption( WriteTransaction* const trans, - csync::Cryptographer* cryptographer); + syncer::Cryptographer* cryptographer); // Returns true if the entry requires encryption but is not encrypted, false // otherwise. Note: this does not check that already encrypted entries are @@ -58,7 +58,7 @@ bool SpecificsNeedsEncryption(ModelTypeSet encrypted_types, // Verifies all data of type |type| is encrypted appropriately. bool VerifyDataTypeEncryptionForTest( BaseTransaction* const trans, - csync::Cryptographer* cryptographer, + syncer::Cryptographer* cryptographer, ModelType type, bool is_encrypted) WARN_UNUSED_RESULT; @@ -66,7 +66,7 @@ bool VerifyDataTypeEncryptionForTest( // Returns false if an error encrypting occurred (does not modify |entry|). // Note: gracefully handles new_specifics aliasing with entry->Get(SPECIFICS). bool UpdateEntryWithEncryption( - csync::Cryptographer* cryptographer, + syncer::Cryptographer* cryptographer, const sync_pb::EntitySpecifics& new_specifics, MutableEntry* entry); diff --git a/sync/engine/nudge_source.cc b/sync/engine/nudge_source.cc index 1020fbf..cd01dda 100644 --- a/sync/engine/nudge_source.cc +++ b/sync/engine/nudge_source.cc @@ -6,7 +6,7 @@ #include "base/logging.h" -namespace csync { +namespace syncer { #define ENUM_CASE(x) case x: return #x; break @@ -24,4 +24,4 @@ const char* GetNudgeSourceString(NudgeSource nudge_source) { #undef ENUM_CASE -} // namespace csync +} // namespace syncer diff --git a/sync/engine/nudge_source.h b/sync/engine/nudge_source.h index a842915..b665203 100644 --- a/sync/engine/nudge_source.h +++ b/sync/engine/nudge_source.h @@ -6,7 +6,7 @@ #define SYNC_ENGINE_NUDGE_SOURCE_H_ #pragma once -namespace csync { +namespace syncer { enum NudgeSource { NUDGE_SOURCE_UNKNOWN = 0, @@ -22,6 +22,6 @@ enum NudgeSource { const char* GetNudgeSourceString(NudgeSource nudge_source); -} // namespace csync +} // namespace syncer #endif // SYNC_ENGINE_NUDGE_SOURCE_H_ diff --git a/sync/engine/process_commit_response_command.cc b/sync/engine/process_commit_response_command.cc index b315062..51e1697 100644 --- a/sync/engine/process_commit_response_command.cc +++ b/sync/engine/process_commit_response_command.cc @@ -45,7 +45,7 @@ using syncable::SERVER_VERSION; using syncable::SYNCER; using syncable::SYNCING; -namespace csync { +namespace syncer { using sessions::OrderedCommitSet; using sessions::StatusController; @@ -477,4 +477,4 @@ void ProcessCommitResponseCommand::ProcessSuccessfulCommitResponse( } } -} // namespace csync +} // namespace syncer diff --git a/sync/engine/process_commit_response_command.h b/sync/engine/process_commit_response_command.h index 98de2f2..80c5753 100644 --- a/sync/engine/process_commit_response_command.h +++ b/sync/engine/process_commit_response_command.h @@ -21,7 +21,7 @@ class MutableEntry; class Directory; } -namespace csync { +namespace syncer { namespace sessions { class OrderedCommitSet; @@ -131,6 +131,6 @@ class ProcessCommitResponseCommand : public ModelChangingSyncerCommand { DISALLOW_COPY_AND_ASSIGN(ProcessCommitResponseCommand); }; -} // namespace csync +} // namespace syncer #endif // SYNC_ENGINE_PROCESS_COMMIT_RESPONSE_COMMAND_H_ diff --git a/sync/engine/process_commit_response_command_unittest.cc b/sync/engine/process_commit_response_command_unittest.cc index c18d571..a387bd2 100644 --- a/sync/engine/process_commit_response_command_unittest.cc +++ b/sync/engine/process_commit_response_command_unittest.cc @@ -21,7 +21,7 @@ #include "sync/test/engine/test_id_factory.h" #include "testing/gtest/include/gtest/gtest.h" -namespace csync { +namespace syncer { using sessions::SyncSession; using std::string; @@ -118,8 +118,8 @@ class ProcessCommitResponseCommandTest : public SyncerCommandTest { const string& name, syncable::ModelType model_type, sessions::OrderedCommitSet *commit_set, - csync::ClientToServerMessage *commit, - csync::ClientToServerResponse *response) { + syncer::ClientToServerMessage *commit, + syncer::ClientToServerResponse *response) { bool is_folder = true; int64 metahandle = 0; CreateUnsyncedItem(item_id, parent_id, name, is_folder, model_type, @@ -190,8 +190,8 @@ class ProcessCommitResponseCommandTest : public SyncerCommandTest { TEST_F(ProcessCommitResponseCommandTest, MultipleCommitIdProjections) { sessions::OrderedCommitSet commit_set(session()->routing_info()); - csync::ClientToServerMessage request; - csync::ClientToServerResponse response; + syncer::ClientToServerMessage request; + syncer::ClientToServerResponse response; Id bookmark_folder_id = id_factory_.NewLocalId(); Id bookmark_id1 = id_factory_.NewLocalId(); @@ -274,8 +274,8 @@ TEST_F(ProcessCommitResponseCommandTest, MultipleCommitIdProjections) { // of the children. TEST_F(ProcessCommitResponseCommandTest, NewFolderCommitKeepsChildOrder) { sessions::OrderedCommitSet commit_set(session()->routing_info()); - csync::ClientToServerMessage request; - csync::ClientToServerResponse response; + syncer::ClientToServerMessage request; + syncer::ClientToServerResponse response; // Create the parent folder, a new item whose ID will change on commit. Id folder_id = id_factory_.NewLocalId(); @@ -402,8 +402,8 @@ INSTANTIATE_TEST_CASE_P(ProcessCommitResponse, // depending on the test parameter. TEST_P(MixedResult, ExtensionActivity) { sessions::OrderedCommitSet commit_set(session()->routing_info()); - csync::ClientToServerMessage request; - csync::ClientToServerResponse response; + syncer::ClientToServerMessage request; + syncer::ClientToServerResponse response; EXPECT_NE(routing_info().find(syncable::BOOKMARKS)->second, routing_info().find(syncable::AUTOFILL)->second) @@ -451,4 +451,4 @@ TEST_P(MixedResult, ExtensionActivity) { } } -} // namespace csync +} // namespace syncer diff --git a/sync/engine/process_updates_command.cc b/sync/engine/process_updates_command.cc index 003c59f..8c2ec75 100644 --- a/sync/engine/process_updates_command.cc +++ b/sync/engine/process_updates_command.cc @@ -21,7 +21,7 @@ using std::vector; -namespace csync { +namespace syncer { using sessions::SyncSession; using sessions::StatusController; @@ -182,4 +182,4 @@ ServerUpdateProcessingResult ProcessUpdatesCommand::ProcessUpdate( return SUCCESS_PROCESSED; } -} // namespace csync +} // namespace syncer diff --git a/sync/engine/process_updates_command.h b/sync/engine/process_updates_command.h index 262d5b7..6aeb181 100644 --- a/sync/engine/process_updates_command.h +++ b/sync/engine/process_updates_command.h @@ -18,7 +18,7 @@ namespace sync_pb { class SyncEntity; } -namespace csync { +namespace syncer { class Cryptographer; @@ -50,6 +50,6 @@ class ProcessUpdatesCommand : public ModelChangingSyncerCommand { DISALLOW_COPY_AND_ASSIGN(ProcessUpdatesCommand); }; -} // namespace csync +} // namespace syncer #endif // SYNC_ENGINE_PROCESS_UPDATES_COMMAND_H_ diff --git a/sync/engine/process_updates_command_unittest.cc b/sync/engine/process_updates_command_unittest.cc index a8e8ca3..656091f 100644 --- a/sync/engine/process_updates_command_unittest.cc +++ b/sync/engine/process_updates_command_unittest.cc @@ -13,7 +13,7 @@ #include "sync/test/engine/syncer_command_test.h" #include "testing/gtest/include/gtest/gtest.h" -namespace csync { +namespace syncer { namespace { @@ -49,4 +49,4 @@ TEST_F(ProcessUpdatesCommandTest, GetGroupsToChange) { } // namespace -} // namespace csync +} // namespace syncer diff --git a/sync/engine/resolve_conflicts_command.cc b/sync/engine/resolve_conflicts_command.cc index edef3ff..a1ffbde 100644 --- a/sync/engine/resolve_conflicts_command.cc +++ b/sync/engine/resolve_conflicts_command.cc @@ -10,7 +10,7 @@ #include "sync/syncable/directory.h" #include "sync/syncable/write_transaction.h" -namespace csync { +namespace syncer { ResolveConflictsCommand::ResolveConflictsCommand() {} ResolveConflictsCommand::~ResolveConflictsCommand() {} @@ -38,4 +38,4 @@ SyncerError ResolveConflictsCommand::ModelChangingExecuteImpl( return SYNCER_OK; } -} // namespace csync +} // namespace syncer diff --git a/sync/engine/resolve_conflicts_command.h b/sync/engine/resolve_conflicts_command.h index 217ddb2..22a9302 100644 --- a/sync/engine/resolve_conflicts_command.h +++ b/sync/engine/resolve_conflicts_command.h @@ -10,7 +10,7 @@ #include "base/compiler_specific.h" #include "sync/engine/model_changing_syncer_command.h" -namespace csync { +namespace syncer { class ResolveConflictsCommand : public ModelChangingSyncerCommand { public: @@ -28,6 +28,6 @@ class ResolveConflictsCommand : public ModelChangingSyncerCommand { DISALLOW_COPY_AND_ASSIGN(ResolveConflictsCommand); }; -} // namespace csync +} // namespace syncer #endif // SYNC_ENGINE_RESOLVE_CONFLICTS_COMMAND_H_ diff --git a/sync/engine/resolve_conflicts_command_unittest.cc b/sync/engine/resolve_conflicts_command_unittest.cc index ac3e84f..e5f3c44 100644 --- a/sync/engine/resolve_conflicts_command_unittest.cc +++ b/sync/engine/resolve_conflicts_command_unittest.cc @@ -12,7 +12,7 @@ #include "sync/test/engine/syncer_command_test.h" #include "testing/gtest/include/gtest/gtest.h" -namespace csync { +namespace syncer { namespace { @@ -48,4 +48,4 @@ TEST_F(ResolveConflictsCommandTest, GetGroupsToChange) { } // namespace -} // namespace csync +} // namespace syncer diff --git a/sync/engine/store_timestamps_command.cc b/sync/engine/store_timestamps_command.cc index cfbabe6..89a3088 100644 --- a/sync/engine/store_timestamps_command.cc +++ b/sync/engine/store_timestamps_command.cc @@ -9,7 +9,7 @@ #include "sync/sessions/sync_session.h" #include "sync/syncable/directory.h" -namespace csync { +namespace syncer { StoreTimestampsCommand::StoreTimestampsCommand() {} StoreTimestampsCommand::~StoreTimestampsCommand() {} @@ -56,4 +56,4 @@ SyncerError StoreTimestampsCommand::ExecuteImpl( return SYNCER_OK; } -} // namespace csync +} // namespace syncer diff --git a/sync/engine/store_timestamps_command.h b/sync/engine/store_timestamps_command.h index cd4c054..382752b 100644 --- a/sync/engine/store_timestamps_command.h +++ b/sync/engine/store_timestamps_command.h @@ -10,7 +10,7 @@ #include "sync/engine/syncer_command.h" #include "sync/engine/syncer_types.h" -namespace csync { +namespace syncer { // A syncer command that extracts the changelog timestamp information from // a GetUpdatesResponse (fetched in DownloadUpdatesCommand) and stores @@ -36,6 +36,6 @@ class StoreTimestampsCommand : public SyncerCommand { DISALLOW_COPY_AND_ASSIGN(StoreTimestampsCommand); }; -} // namespace csync +} // namespace syncer #endif // SYNC_ENGINE_STORE_TIMESTAMPS_COMMAND_H_ diff --git a/sync/engine/sync_engine_event.cc b/sync/engine/sync_engine_event.cc index d362448..2df3d62 100644 --- a/sync/engine/sync_engine_event.cc +++ b/sync/engine/sync_engine_event.cc @@ -4,11 +4,11 @@ #include "sync/engine/sync_engine_event.h" -namespace csync { +namespace syncer { SyncEngineEvent::SyncEngineEvent(EventCause cause) : what_happened(cause) { } SyncEngineEvent::~SyncEngineEvent() {} -} // namespace csync +} // namespace syncer diff --git a/sync/engine/sync_engine_event.h b/sync/engine/sync_engine_event.h index e0d011c..6545461e 100644 --- a/sync/engine/sync_engine_event.h +++ b/sync/engine/sync_engine_event.h @@ -15,7 +15,7 @@ namespace syncable { class Id; } -namespace csync { +namespace syncer { struct SyncEngineEvent { enum EventCause { @@ -67,6 +67,6 @@ class SyncEngineEventListener { virtual ~SyncEngineEventListener() {} }; -} // namespace csync +} // namespace syncer #endif // SYNC_ENGINE_SYNC_ENGINE_EVENT_H_ diff --git a/sync/engine/sync_scheduler.cc b/sync/engine/sync_scheduler.cc index 1d1ddad..23ad567 100644 --- a/sync/engine/sync_scheduler.cc +++ b/sync/engine/sync_scheduler.cc @@ -23,7 +23,7 @@ using base::TimeDelta; using base::TimeTicks; -namespace csync { +namespace syncer { using sessions::SyncSession; using sessions::SyncSessionSnapshot; @@ -35,22 +35,22 @@ using sync_pb::GetUpdatesCallerInfo; namespace { bool ShouldRequestEarlyExit( - const csync::SyncProtocolError& error) { + const syncer::SyncProtocolError& error) { switch (error.error_type) { - case csync::SYNC_SUCCESS: - case csync::MIGRATION_DONE: - case csync::THROTTLED: - case csync::TRANSIENT_ERROR: + case syncer::SYNC_SUCCESS: + case syncer::MIGRATION_DONE: + case syncer::THROTTLED: + case syncer::TRANSIENT_ERROR: return false; - case csync::NOT_MY_BIRTHDAY: - case csync::CLEAR_PENDING: + case syncer::NOT_MY_BIRTHDAY: + case syncer::CLEAR_PENDING: // If we send terminate sync early then |sync_cycle_ended| notification // would not be sent. If there were no actions then |ACTIONABLE_ERROR| // notification wouldnt be sent either. Then the UI layer would be left // waiting forever. So assert we would send something. - DCHECK(error.action != csync::UNKNOWN_ACTION); + DCHECK(error.action != syncer::UNKNOWN_ACTION); return true; - case csync::INVALID_CREDENTIAL: + case syncer::INVALID_CREDENTIAL: // The notification for this is handled by PostAndProcessHeaders|. // Server does no have to send any action for this. return true; @@ -63,8 +63,8 @@ bool ShouldRequestEarlyExit( } bool IsActionableError( - const csync::SyncProtocolError& error) { - return (error.action != csync::UNKNOWN_ACTION); + const syncer::SyncProtocolError& error) { + return (error.action != syncer::UNKNOWN_ACTION); } } // namespace @@ -1141,4 +1141,4 @@ base::TimeDelta SyncScheduler::sessions_commit_delay() const { #undef ENUM_CASE -} // csync +} // namespace syncer diff --git a/sync/engine/sync_scheduler.h b/sync/engine/sync_scheduler.h index 51f5792..d8ea732 100644 --- a/sync/engine/sync_scheduler.h +++ b/sync/engine/sync_scheduler.h @@ -33,7 +33,7 @@ namespace tracked_objects { class Location; } // namespace tracked_objects -namespace csync { +namespace syncer { struct ServerConnectionEvent; @@ -329,8 +329,8 @@ class SyncScheduler : public sessions::SyncSession::Delegate { void OnServerConnectionErrorFixed(); // The pointer is owned by the caller. - csync::sessions::SyncSession* CreateSyncSession( - const csync::sessions::SyncSourceInfo& info); + syncer::sessions::SyncSession* CreateSyncSession( + const syncer::sessions::SyncSourceInfo& info); // Creates a session for a poll and performs the sync. void PollTimerCallback(); @@ -402,6 +402,6 @@ class SyncScheduler : public sessions::SyncSession::Delegate { DISALLOW_COPY_AND_ASSIGN(SyncScheduler); }; -} // namespace csync +} // namespace syncer #endif // SYNC_ENGINE_SYNC_SCHEDULER_H_ diff --git a/sync/engine/sync_scheduler_unittest.cc b/sync/engine/sync_scheduler_unittest.cc index 82628cb..cfea374 100644 --- a/sync/engine/sync_scheduler_unittest.cc +++ b/sync/engine/sync_scheduler_unittest.cc @@ -30,7 +30,7 @@ using testing::Mock; using testing::Return; using testing::WithArg; -namespace csync { +namespace syncer { using sessions::SyncSession; using sessions::SyncSessionContext; using sessions::SyncSessionSnapshot; @@ -1140,4 +1140,4 @@ TEST_F(SyncSchedulerTest, SetsPreviousRoutingInfo) { EXPECT_TRUE(expected == context()->previous_session_routing_info()); } -} // namespace csync +} // namespace syncer diff --git a/sync/engine/sync_scheduler_whitebox_unittest.cc b/sync/engine/sync_scheduler_whitebox_unittest.cc index b6e3234..7fb53be 100644 --- a/sync/engine/sync_scheduler_whitebox_unittest.cc +++ b/sync/engine/sync_scheduler_whitebox_unittest.cc @@ -18,8 +18,8 @@ using base::TimeDelta; using base::TimeTicks; -namespace csync { -using csync::Syncer; +namespace syncer { +using syncer::Syncer; using sessions::SyncSession; using sessions::SyncSessionContext; using sessions::SyncSourceInfo; @@ -265,4 +265,4 @@ TEST_F(SyncSchedulerWhiteboxTest, ContinueCanaryJobConfig) { EXPECT_EQ(decision, SyncScheduler::CONTINUE); } -} // namespace csync +} // namespace syncer diff --git a/sync/engine/syncer.cc b/sync/engine/syncer.cc index 8d3063d..3e8e456 100644 --- a/sync/engine/syncer.cc +++ b/sync/engine/syncer.cc @@ -42,7 +42,7 @@ using syncable::SERVER_POSITION_IN_PARENT; using syncable::SERVER_SPECIFICS; using syncable::SERVER_VERSION; -namespace csync { +namespace syncer { using sessions::ScopedSessionContextConflictResolver; using sessions::StatusController; @@ -296,4 +296,4 @@ void ClearServerData(syncable::MutableEntry* entry) { entry->Put(SERVER_POSITION_IN_PARENT, 0); } -} // namespace csync +} // namespace syncer diff --git a/sync/engine/syncer.h b/sync/engine/syncer.h index edddf9b..8369d80 100644 --- a/sync/engine/syncer.h +++ b/sync/engine/syncer.h @@ -24,7 +24,7 @@ class Entry; class MutableEntry; } // namespace syncable -namespace csync { +namespace syncer { enum SyncerStep { SYNCER_BEGIN, @@ -107,6 +107,6 @@ void CopyServerFields(syncable::Entry* src, syncable::MutableEntry* dest); void ClearServerData(syncable::MutableEntry* entry); const char* SyncerStepToString(const SyncerStep); -} // namespace csync +} // namespace syncer #endif // SYNC_ENGINE_SYNCER_H_ diff --git a/sync/engine/syncer_command.cc b/sync/engine/syncer_command.cc index bf7bf96..5dfd821 100644 --- a/sync/engine/syncer_command.cc +++ b/sync/engine/syncer_command.cc @@ -4,7 +4,7 @@ #include "sync/engine/syncer_command.h" -namespace csync { +namespace syncer { SyncerCommand::SyncerCommand() {} SyncerCommand::~SyncerCommand() {} @@ -14,4 +14,4 @@ SyncerError SyncerCommand::Execute(sessions::SyncSession* session) { return result; } -} // namespace csync +} // namespace syncer diff --git a/sync/engine/syncer_command.h b/sync/engine/syncer_command.h index 710b3ac..b626b0f 100644 --- a/sync/engine/syncer_command.h +++ b/sync/engine/syncer_command.h @@ -10,7 +10,7 @@ #include "sync/internal_api/public/util/syncer_error.h" -namespace csync { +namespace syncer { namespace sessions { class SyncSession; @@ -42,6 +42,6 @@ class SyncerCommand { DISALLOW_COPY_AND_ASSIGN(SyncerCommand); }; -} // namespace csync +} // namespace syncer #endif // SYNC_ENGINE_SYNCER_COMMAND_H_ diff --git a/sync/engine/syncer_proto_util.cc b/sync/engine/syncer_proto_util.cc index 8be6888..e88bc06 100644 --- a/sync/engine/syncer_proto_util.cc +++ b/sync/engine/syncer_proto_util.cc @@ -21,7 +21,7 @@ #include "sync/syncable/syncable-inl.h" #include "sync/util/time.h" -using csync::SyncProtocolErrorType; +using syncer::SyncProtocolErrorType; using std::string; using std::stringstream; using syncable::BASE_VERSION; @@ -33,7 +33,7 @@ using syncable::IS_UNSYNCED; using syncable::MTIME; using syncable::PARENT_ID; -namespace csync { +namespace syncer { using sessions::SyncSession; namespace { @@ -217,7 +217,7 @@ void SyncerProtoUtil::HandleThrottleError( const base::TimeTicks& throttled_until, ThrottledDataTypeTracker* tracker, sessions::SyncSession::Delegate* delegate) { - DCHECK_EQ(error.error_type, csync::THROTTLED); + DCHECK_EQ(error.error_type, syncer::THROTTLED); if (error.error_data_types.Empty()) { // No datatypes indicates the client should be completely throttled. delegate->OnSilencedUntil(throttled_until); @@ -244,53 +244,53 @@ SyncProtocolErrorType ConvertSyncProtocolErrorTypePBToLocalType( const sync_pb::SyncEnums::ErrorType& error_type) { switch (error_type) { case sync_pb::SyncEnums::SUCCESS: - return csync::SYNC_SUCCESS; + return syncer::SYNC_SUCCESS; case sync_pb::SyncEnums::NOT_MY_BIRTHDAY: - return csync::NOT_MY_BIRTHDAY; + return syncer::NOT_MY_BIRTHDAY; case sync_pb::SyncEnums::THROTTLED: - return csync::THROTTLED; + return syncer::THROTTLED; case sync_pb::SyncEnums::CLEAR_PENDING: - return csync::CLEAR_PENDING; + return syncer::CLEAR_PENDING; case sync_pb::SyncEnums::TRANSIENT_ERROR: - return csync::TRANSIENT_ERROR; + return syncer::TRANSIENT_ERROR; case sync_pb::SyncEnums::MIGRATION_DONE: - return csync::MIGRATION_DONE; + return syncer::MIGRATION_DONE; case sync_pb::SyncEnums::UNKNOWN: - return csync::UNKNOWN_ERROR; + return syncer::UNKNOWN_ERROR; case sync_pb::SyncEnums::USER_NOT_ACTIVATED: case sync_pb::SyncEnums::AUTH_INVALID: case sync_pb::SyncEnums::ACCESS_DENIED: - return csync::INVALID_CREDENTIAL; + return syncer::INVALID_CREDENTIAL; default: NOTREACHED(); - return csync::UNKNOWN_ERROR; + return syncer::UNKNOWN_ERROR; } } -csync::ClientAction ConvertClientActionPBToLocalClientAction( +syncer::ClientAction ConvertClientActionPBToLocalClientAction( const sync_pb::SyncEnums::Action& action) { switch (action) { case sync_pb::SyncEnums::UPGRADE_CLIENT: - return csync::UPGRADE_CLIENT; + return syncer::UPGRADE_CLIENT; case sync_pb::SyncEnums::CLEAR_USER_DATA_AND_RESYNC: - return csync::CLEAR_USER_DATA_AND_RESYNC; + return syncer::CLEAR_USER_DATA_AND_RESYNC; case sync_pb::SyncEnums::ENABLE_SYNC_ON_ACCOUNT: - return csync::ENABLE_SYNC_ON_ACCOUNT; + return syncer::ENABLE_SYNC_ON_ACCOUNT; case sync_pb::SyncEnums::STOP_AND_RESTART_SYNC: - return csync::STOP_AND_RESTART_SYNC; + return syncer::STOP_AND_RESTART_SYNC; case sync_pb::SyncEnums::DISABLE_SYNC_ON_CLIENT: - return csync::DISABLE_SYNC_ON_CLIENT; + return syncer::DISABLE_SYNC_ON_CLIENT; case sync_pb::SyncEnums::UNKNOWN_ACTION: - return csync::UNKNOWN_ACTION; + return syncer::UNKNOWN_ACTION; default: NOTREACHED(); - return csync::UNKNOWN_ACTION; + return syncer::UNKNOWN_ACTION; } } -csync::SyncProtocolError ConvertErrorPBToLocalType( +syncer::SyncProtocolError ConvertErrorPBToLocalType( const sync_pb::ClientToServerResponse::Error& error) { - csync::SyncProtocolError sync_protocol_error; + syncer::SyncProtocolError sync_protocol_error; sync_protocol_error.error_type = ConvertSyncProtocolErrorTypePBToLocalType( error.error_type()); sync_protocol_error.error_description = error.error_description(); @@ -312,13 +312,13 @@ csync::SyncProtocolError ConvertErrorPBToLocalType( } // TODO(lipalani) : Rename these function names as per the CR for issue 7740067. -csync::SyncProtocolError ConvertLegacyErrorCodeToNewError( +syncer::SyncProtocolError ConvertLegacyErrorCodeToNewError( const sync_pb::SyncEnums::ErrorType& error_type) { - csync::SyncProtocolError error; + syncer::SyncProtocolError error; error.error_type = ConvertSyncProtocolErrorTypePBToLocalType(error_type); if (error_type == sync_pb::SyncEnums::CLEAR_PENDING || error_type == sync_pb::SyncEnums::NOT_MY_BIRTHDAY) { - error.action = csync::DISABLE_SYNC_ON_CLIENT; + error.action = syncer::DISABLE_SYNC_ON_CLIENT; } // There is no other action we can compute for legacy server. return error; } @@ -345,11 +345,11 @@ SyncerError SyncerProtoUtil::PostClientToServerMessage( msg, response)) { // There was an error establishing communication with the server. // We can not proceed beyond this point. - const csync::HttpResponse::ServerConnectionCode server_status = + const syncer::HttpResponse::ServerConnectionCode server_status = session->context()->connection_manager()->server_status(); - DCHECK_NE(server_status, csync::HttpResponse::NONE); - DCHECK_NE(server_status, csync::HttpResponse::SERVER_CONNECTION_OK); + DCHECK_NE(server_status, syncer::HttpResponse::NONE); + DCHECK_NE(server_status, syncer::HttpResponse::SERVER_CONNECTION_OK); return ServerConnectionErrorAsSyncerError(server_status); } @@ -358,13 +358,13 @@ SyncerError SyncerProtoUtil::PostClientToServerMessage( session->context()->traffic_recorder()->RecordClientToServerResponse( *response); - csync::SyncProtocolError sync_protocol_error; + syncer::SyncProtocolError sync_protocol_error; // Birthday mismatch overrides any error that is sent by the server. if (!VerifyResponseBirthday(dir, response)) { - sync_protocol_error.error_type = csync::NOT_MY_BIRTHDAY; + sync_protocol_error.error_type = syncer::NOT_MY_BIRTHDAY; sync_protocol_error.action = - csync::DISABLE_SYNC_ON_CLIENT; + syncer::DISABLE_SYNC_ON_CLIENT; } else if (response->has_error()) { // This is a new server. Just get the error from the protocol. sync_protocol_error = ConvertErrorPBToLocalType(response->error()); @@ -384,28 +384,28 @@ SyncerError SyncerProtoUtil::PostClientToServerMessage( // Now do any special handling for the error type and decide on the return // value. switch (sync_protocol_error.error_type) { - case csync::UNKNOWN_ERROR: + case syncer::UNKNOWN_ERROR: LOG(WARNING) << "Sync protocol out-of-date. The server is using a more " << "recent version."; return SERVER_RETURN_UNKNOWN_ERROR; - case csync::SYNC_SUCCESS: + case syncer::SYNC_SUCCESS: LogResponseProfilingData(*response); return SYNCER_OK; - case csync::THROTTLED: + case syncer::THROTTLED: LOG(WARNING) << "Client silenced by server."; HandleThrottleError(sync_protocol_error, base::TimeTicks::Now() + GetThrottleDelay(*response), session->context()->throttled_data_type_tracker(), session->delegate()); return SERVER_RETURN_THROTTLED; - case csync::TRANSIENT_ERROR: + case syncer::TRANSIENT_ERROR: return SERVER_RETURN_TRANSIENT_ERROR; - case csync::MIGRATION_DONE: + case syncer::MIGRATION_DONE: HandleMigrationDoneResponse(response, session); return SERVER_RETURN_MIGRATION_DONE; - case csync::CLEAR_PENDING: + case syncer::CLEAR_PENDING: return SERVER_RETURN_CLEAR_PENDING; - case csync::NOT_MY_BIRTHDAY: + case syncer::NOT_MY_BIRTHDAY: return SERVER_RETURN_NOT_MY_BIRTHDAY; default: NOTREACHED(); @@ -542,4 +542,4 @@ std::string SyncerProtoUtil::ClientToServerResponseDebugString( return output; } -} // namespace csync +} // namespace syncer diff --git a/sync/engine/syncer_proto_util.h b/sync/engine/syncer_proto_util.h index d9ccddc..4e9614c 100644 --- a/sync/engine/syncer_proto_util.h +++ b/sync/engine/syncer_proto_util.h @@ -25,7 +25,7 @@ class ClientToServerResponse; class EntitySpecifics; } // namespace sync_pb -namespace csync { +namespace syncer { namespace sessions { class SyncProtocolError; @@ -111,7 +111,7 @@ class SyncerProtoUtil { // Post the message using the scm, and do some processing on the returned // headers. Decode the server response. - static bool PostAndProcessHeaders(csync::ServerConnectionManager* scm, + static bool PostAndProcessHeaders(syncer::ServerConnectionManager* scm, sessions::SyncSession* session, const ClientToServerMessage& msg, sync_pb::ClientToServerResponse* response); @@ -122,7 +122,7 @@ class SyncerProtoUtil { static void HandleThrottleError( const SyncProtocolError& error, const base::TimeTicks& throttled_until, - csync::ThrottledDataTypeTracker* tracker, + syncer::ThrottledDataTypeTracker* tracker, sessions::SyncSession::Delegate* delegate); friend class SyncerProtoUtilTest; @@ -135,6 +135,6 @@ class SyncerProtoUtil { DISALLOW_COPY_AND_ASSIGN(SyncerProtoUtil); }; -} // namespace csync +} // namespace syncer #endif // SYNC_ENGINE_SYNCER_PROTO_UTIL_H_ diff --git a/sync/engine/syncer_proto_util_unittest.cc b/sync/engine/syncer_proto_util_unittest.cc index b0c9f6e..7c496ee 100644 --- a/sync/engine/syncer_proto_util_unittest.cc +++ b/sync/engine/syncer_proto_util_unittest.cc @@ -28,7 +28,7 @@ using syncable::Blob; using ::testing::_; -namespace csync { +namespace syncer { using sessions::SyncSessionContext; class MockDelegate : public sessions::SyncSession::Delegate { @@ -203,7 +203,7 @@ TEST_F(SyncerProtoUtilTest, AddRequestBirthday) { EXPECT_EQ(msg.store_birthday(), "meat"); } -class DummyConnectionManager : public csync::ServerConnectionManager { +class DummyConnectionManager : public syncer::ServerConnectionManager { public: DummyConnectionManager() : ServerConnectionManager("unused", 0, false), @@ -263,7 +263,7 @@ TEST_F(SyncerProtoUtilTest, PostAndProcessHeaders) { TEST_F(SyncerProtoUtilTest, HandleThrottlingWithDatatypes) { ThrottledDataTypeTracker tracker(NULL); SyncProtocolError error; - error.error_type = csync::THROTTLED; + error.error_type = syncer::THROTTLED; syncable::ModelTypeSet types; types.Put(syncable::BOOKMARKS); types.Put(syncable::PASSWORDS); @@ -278,7 +278,7 @@ TEST_F(SyncerProtoUtilTest, HandleThrottlingNoDatatypes) { ThrottledDataTypeTracker tracker(NULL); MockDelegate delegate; SyncProtocolError error; - error.error_type = csync::THROTTLED; + error.error_type = syncer::THROTTLED; base::TimeTicks ticks = base::TimeTicks::FromInternalValue(1); @@ -287,4 +287,4 @@ TEST_F(SyncerProtoUtilTest, HandleThrottlingNoDatatypes) { SyncerProtoUtil::HandleThrottleError(error, ticks, &tracker, &delegate); EXPECT_TRUE(tracker.GetThrottledTypes().Empty()); } -} // namespace csync +} // namespace syncer diff --git a/sync/engine/syncer_types.h b/sync/engine/syncer_types.h index 474bdaec..eb79d82 100644 --- a/sync/engine/syncer_types.h +++ b/sync/engine/syncer_types.h @@ -8,7 +8,7 @@ // The intent of this is to keep all shared data types and enums for the syncer // in a single place without having dependencies between other files. -namespace csync { +namespace syncer { enum UpdateAttemptResponse { // Update was applied or safely ignored. @@ -82,6 +82,6 @@ enum VerifyCommitResult { VERIFY_OK, }; -} // namespace csync +} // namespace syncer #endif // SYNC_ENGINE_SYNCER_TYPES_H_ diff --git a/sync/engine/syncer_unittest.cc b/sync/engine/syncer_unittest.cc index 764161e..fe20a65 100644 --- a/sync/engine/syncer_unittest.cc +++ b/sync/engine/syncer_unittest.cc @@ -62,7 +62,7 @@ using std::multimap; using std::set; using std::string; -namespace csync { +namespace syncer { using syncable::BaseTransaction; using syncable::Blob; @@ -560,7 +560,7 @@ class SyncerTest : public testing::Test, scoped_refptr<ModelSafeWorker> worker_; syncable::ModelTypeSet enabled_datatypes_; - csync::TrafficRecorder traffic_recorder_; + syncer::TrafficRecorder traffic_recorder_; DISALLOW_COPY_AND_ASSIGN(SyncerTest); }; @@ -714,7 +714,7 @@ TEST_F(SyncerTest, GetCommitIdsFiltersUnreadyEntries) { // Mark bookmarks as encrypted and set the cryptographer to have pending // keys. WriteTransaction wtrans(FROM_HERE, UNITTEST, directory()); - csync::Cryptographer other_cryptographer(&encryptor_); + syncer::Cryptographer other_cryptographer(&encryptor_); other_cryptographer.AddKey(other_params); sync_pb::EntitySpecifics specifics; sync_pb::NigoriSpecifics* nigori = specifics.mutable_nigori(); @@ -807,7 +807,7 @@ TEST_F(SyncerTest, GetCommitIdsFiltersUnreadyEntries) { TEST_F(SyncerTest, EncryptionAwareConflicts) { KeyParams key_params = {"localhost", "dummy", "foobar"}; - csync::Cryptographer other_cryptographer(&encryptor_); + syncer::Cryptographer other_cryptographer(&encryptor_); other_cryptographer.AddKey(key_params); sync_pb::EntitySpecifics bookmark, encrypted_bookmark, modified_bookmark; bookmark.mutable_bookmark()->set_title("title"); @@ -981,7 +981,7 @@ TEST_F(SyncerTest, ReceiveOldNigori) { KeyParams current_key = {"localhost", "dummy", "cur"}; // Data for testing encryption/decryption. - csync::Cryptographer other_cryptographer(&encryptor_); + syncer::Cryptographer other_cryptographer(&encryptor_); other_cryptographer.AddKey(old_key); sync_pb::EntitySpecifics other_encrypted_specifics; other_encrypted_specifics.mutable_bookmark()->set_title("title"); @@ -1064,7 +1064,7 @@ TEST_F(SyncerTest, ReceiveOldNigori) { TEST_F(SyncerTest, NigoriConflicts) { KeyParams local_key_params = {"localhost", "dummy", "blargle"}; KeyParams other_key_params = {"localhost", "dummy", "foobar"}; - csync::Cryptographer other_cryptographer(&encryptor_); + syncer::Cryptographer other_cryptographer(&encryptor_); other_cryptographer.AddKey(other_key_params); syncable::ModelTypeSet encrypted_types(syncable::PASSWORDS, syncable::NIGORI); sync_pb::EntitySpecifics initial_nigori_specifics; @@ -4831,4 +4831,4 @@ TEST_F(SyncerPositionTiebreakingTest, MidLowHigh) { ExpectLocalOrderIsByServerId(); } -} // namespace csync +} // namespace syncer diff --git a/sync/engine/syncer_util.cc b/sync/engine/syncer_util.cc index 3e78472..4b95d05 100644 --- a/sync/engine/syncer_util.cc +++ b/sync/engine/syncer_util.cc @@ -68,7 +68,7 @@ using syncable::SPECIFICS; using syncable::SYNCER; using syncable::WriteTransaction; -namespace csync { +namespace syncer { // Returns the number of unsynced entries. // static @@ -722,4 +722,4 @@ VerifyResult SyncerUtil::VerifyUndelete(syncable::WriteTransaction* trans, return VERIFY_UNDECIDED; } -} // namespace csync +} // namespace syncer diff --git a/sync/engine/syncer_util.h b/sync/engine/syncer_util.h index e7d0515..7312ab7 100644 --- a/sync/engine/syncer_util.h +++ b/sync/engine/syncer_util.h @@ -19,7 +19,7 @@ #include "sync/syncable/metahandle_set.h" #include "sync/syncable/syncable_id.h" -namespace csync { +namespace syncer { class Cryptographer; class SyncEntity; @@ -123,6 +123,6 @@ class SyncerUtil { DISALLOW_IMPLICIT_CONSTRUCTORS(SyncerUtil); }; -} // namespace csync +} // namespace syncer #endif // SYNC_ENGINE_SYNCER_UTIL_H_ diff --git a/sync/engine/syncproto.h b/sync/engine/syncproto.h index ec6c6e4..8fa4697 100644 --- a/sync/engine/syncproto.h +++ b/sync/engine/syncproto.h @@ -12,7 +12,7 @@ #include "sync/protocol/sync.pb.h" #include "sync/syncable/syncable_id.h" -namespace csync { +namespace syncer { template<class Base> class IdWrapper : public Base { @@ -82,6 +82,6 @@ typedef sync_pb::CommitResponse CommitResponse; typedef sync_pb::GetUpdatesResponse GetUpdatesResponse; typedef sync_pb::GetUpdatesMessage GetUpdatesMessage; -} // namespace csync +} // namespace syncer #endif // SYNC_ENGINE_SYNCPROTO_H_ diff --git a/sync/engine/syncproto_unittest.cc b/sync/engine/syncproto_unittest.cc index d641b5d..1ceaab3 100644 --- a/sync/engine/syncproto_unittest.cc +++ b/sync/engine/syncproto_unittest.cc @@ -5,7 +5,7 @@ #include "sync/engine/syncproto.h" #include "testing/gtest/include/gtest/gtest.h" -namespace csync { +namespace syncer { class SyncProtoTest : public testing::Test { }; @@ -15,4 +15,4 @@ TEST_F(SyncProtoTest, ProtocolVersionPresent) { EXPECT_TRUE(csm.has_protocol_version()); } -} // namespace csync +} // namespace syncer diff --git a/sync/engine/throttled_data_type_tracker.cc b/sync/engine/throttled_data_type_tracker.cc index 47d68f6..e27f2e3 100644 --- a/sync/engine/throttled_data_type_tracker.cc +++ b/sync/engine/throttled_data_type_tracker.cc @@ -7,7 +7,7 @@ #include "sync/engine/all_status.h" #include "sync/internal_api/public/syncable/model_type.h" -namespace csync { +namespace syncer { ThrottledDataTypeTracker::ThrottledDataTypeTracker(AllStatus *allstatus) : allstatus_(allstatus) { @@ -69,4 +69,4 @@ syncable::ModelTypeSet ThrottledDataTypeTracker::GetThrottledTypes() const { return types; } -} // namespace csync +} // namespace syncer diff --git a/sync/engine/throttled_data_type_tracker.h b/sync/engine/throttled_data_type_tracker.h index f24ab74..a496bea 100644 --- a/sync/engine/throttled_data_type_tracker.h +++ b/sync/engine/throttled_data_type_tracker.h @@ -11,7 +11,7 @@ #include "base/gtest_prod_util.h" #include "sync/internal_api/public/syncable/model_type.h" -namespace csync { +namespace syncer { class AllStatus; @@ -50,6 +50,6 @@ class ThrottledDataTypeTracker { DISALLOW_COPY_AND_ASSIGN(ThrottledDataTypeTracker); }; -} // namespace csync +} // namespace syncer #endif // SYNC_ENGINE_THROTTLED_DATA_TYPE_TRACKER_H_ diff --git a/sync/engine/throttled_data_type_tracker_unittest.cc b/sync/engine/throttled_data_type_tracker_unittest.cc index 6273915..20b7237 100644 --- a/sync/engine/throttled_data_type_tracker_unittest.cc +++ b/sync/engine/throttled_data_type_tracker_unittest.cc @@ -10,7 +10,7 @@ using base::TimeDelta; using base::TimeTicks; -namespace csync { +namespace syncer { TEST(ThrottledDataTypeTrackerTest, AddUnthrottleTimeTest) { const syncable::ModelTypeSet types(syncable::BOOKMARKS, syncable::PASSWORDS); @@ -63,5 +63,5 @@ TEST(ThrottledDataTypeTrackerTest, UnthrottleSomeTypesTest) { EXPECT_TRUE(throttler.GetThrottledTypes().Equals(long_throttled)); } -} // namespace csync +} // namespace syncer diff --git a/sync/engine/traffic_logger.cc b/sync/engine/traffic_logger.cc index e25fdc8..740409a 100644 --- a/sync/engine/traffic_logger.cc +++ b/sync/engine/traffic_logger.cc @@ -13,7 +13,7 @@ #include "sync/protocol/proto_value_conversions.h" #include "sync/protocol/sync.pb.h" -namespace csync { +namespace syncer { namespace { template <class T> @@ -43,4 +43,4 @@ void LogClientToServerResponse( "******Server Response******"); } -} // namespace csync +} // namespace syncer diff --git a/sync/engine/traffic_logger.h b/sync/engine/traffic_logger.h index 93ae2a3..cba7a67 100644 --- a/sync/engine/traffic_logger.h +++ b/sync/engine/traffic_logger.h @@ -15,12 +15,12 @@ class ClientToServerResponse; class ClientToServerMessage; } // namespace sync_pb -namespace csync { +namespace syncer { void LogClientToServerMessage(const sync_pb::ClientToServerMessage& msg); void LogClientToServerResponse( const sync_pb::ClientToServerResponse& response); -} // namespace csync +} // namespace syncer #endif // CHROME_BROWSER_SYNC_ENGINE_TRAFFIC_LOGGER_H_ diff --git a/sync/engine/traffic_recorder.cc b/sync/engine/traffic_recorder.cc index ade5bd6..379c488 100644 --- a/sync/engine/traffic_recorder.cc +++ b/sync/engine/traffic_recorder.cc @@ -12,7 +12,7 @@ #include "sync/protocol/sync.pb.h" #include "sync/sessions/sync_session.h" -namespace csync { +namespace syncer { TrafficRecorder::TrafficRecord::TrafficRecord(const std::string& message, TrafficMessageType message_type, @@ -129,5 +129,5 @@ void TrafficRecorder::RecordClientToServerResponse( StoreProtoInQueue(response, CLIENT_TO_SERVER_RESPONSE); } -} // namespace csync +} // namespace syncer diff --git a/sync/engine/traffic_recorder.h b/sync/engine/traffic_recorder.h index 525e735..436f07c 100644 --- a/sync/engine/traffic_recorder.h +++ b/sync/engine/traffic_recorder.h @@ -19,7 +19,7 @@ class ClientToServerResponse; class ClientToServerMessage; } -namespace csync { +namespace syncer { class TrafficRecorder { public: @@ -72,7 +72,7 @@ class TrafficRecorder { DISALLOW_COPY_AND_ASSIGN(TrafficRecorder); }; -} // namespace csync +} // namespace syncer #endif // CHROME_BROWSER_SYNC_ENGINE_TRAFFIC_RECORDER_H_ diff --git a/sync/engine/traffic_recorder_unittest.cc b/sync/engine/traffic_recorder_unittest.cc index 637aeeb..cf821f5 100644 --- a/sync/engine/traffic_recorder_unittest.cc +++ b/sync/engine/traffic_recorder_unittest.cc @@ -7,7 +7,7 @@ #include "sync/protocol/sync.pb.h" #include "testing/gtest/include/gtest/gtest.h" -namespace csync { +namespace syncer { const unsigned int kMaxMessages = 10; const unsigned int kMaxMessageSize = 5 * 1024; @@ -39,5 +39,4 @@ TEST(TrafficRecorderTest, MaxMessageSizeTest) { EXPECT_TRUE(record.message.empty()); } -} //namespace csync - +} // namespace syncer diff --git a/sync/engine/update_applicator.cc b/sync/engine/update_applicator.cc index 3986e60..2756902 100644 --- a/sync/engine/update_applicator.cc +++ b/sync/engine/update_applicator.cc @@ -16,7 +16,7 @@ using std::vector; -namespace csync { +namespace syncer { UpdateApplicator::UpdateApplicator(ConflictResolver* resolver, Cryptographer* cryptographer, @@ -189,4 +189,4 @@ bool UpdateApplicator::ResultTracker::no_conflicts() const { return conflicting_ids_.empty(); } -} // namespace csync +} // namespace syncer diff --git a/sync/engine/update_applicator.h b/sync/engine/update_applicator.h index fbc8361..de05999 100644 --- a/sync/engine/update_applicator.h +++ b/sync/engine/update_applicator.h @@ -24,7 +24,7 @@ class WriteTransaction; class Entry; } -namespace csync { +namespace syncer { namespace sessions { class ConflictProgress; @@ -109,6 +109,6 @@ class UpdateApplicator { DISALLOW_COPY_AND_ASSIGN(UpdateApplicator); }; -} // namespace csync +} // namespace syncer #endif // SYNC_ENGINE_UPDATE_APPLICATOR_H_ diff --git a/sync/engine/verify_updates_command.cc b/sync/engine/verify_updates_command.cc index 91f08f0..93b6263 100644 --- a/sync/engine/verify_updates_command.cc +++ b/sync/engine/verify_updates_command.cc @@ -18,7 +18,7 @@ #include "sync/syncable/mutable_entry.h" #include "sync/syncable/write_transaction.h" -namespace csync { +namespace syncer { using syncable::GET_BY_ID; using syncable::ModelTypeSet; @@ -100,7 +100,7 @@ SyncerError VerifyUpdatesCommand::ModelChangingExecuteImpl( const GetUpdatesResponse& updates = status->updates_response().get_updates(); int update_count = updates.entries().size(); - ModelTypeSet requested_types = csync::GetRoutingInfoTypes( + ModelTypeSet requested_types = syncer::GetRoutingInfoTypes( session->routing_info()); DVLOG(1) << update_count << " entries to verify"; @@ -186,4 +186,4 @@ VerifyUpdatesCommand::VerifyUpdateResult VerifyUpdatesCommand::VerifyUpdate( return result; // This might be VERIFY_SUCCESS as well } -} // namespace csync +} // namespace syncer diff --git a/sync/engine/verify_updates_command.h b/sync/engine/verify_updates_command.h index b0bf68e..27b0b41 100644 --- a/sync/engine/verify_updates_command.h +++ b/sync/engine/verify_updates_command.h @@ -17,7 +17,7 @@ namespace syncable { class WriteTransaction; } -namespace csync { +namespace syncer { // Verifies the response from a GetUpdates request. All invalid updates will be // noted in the SyncSession after this command is executed. @@ -45,6 +45,6 @@ class VerifyUpdatesCommand : public ModelChangingSyncerCommand { DISALLOW_COPY_AND_ASSIGN(VerifyUpdatesCommand); }; -} // namespace csync +} // namespace syncer #endif // SYNC_ENGINE_VERIFY_UPDATES_COMMAND_H_ diff --git a/sync/engine/verify_updates_command_unittest.cc b/sync/engine/verify_updates_command_unittest.cc index 49ac704..afbc784 100644 --- a/sync/engine/verify_updates_command_unittest.cc +++ b/sync/engine/verify_updates_command_unittest.cc @@ -13,7 +13,7 @@ #include "sync/test/engine/syncer_command_test.h" #include "testing/gtest/include/gtest/gtest.h" -namespace csync { +namespace syncer { using sessions::StatusController; using std::string; @@ -105,4 +105,4 @@ TEST_F(VerifyUpdatesCommandTest, AllVerified) { } } -} +} // namespace syncer |