summaryrefslogtreecommitdiffstats
path: root/sync/sessions
diff options
context:
space:
mode:
Diffstat (limited to 'sync/sessions')
-rw-r--r--sync/sessions/debug_info_getter.h4
-rw-r--r--sync/sessions/ordered_commit_set.cc8
-rw-r--r--sync/sessions/ordered_commit_set.h12
-rw-r--r--sync/sessions/ordered_commit_set_unittest.cc16
-rw-r--r--sync/sessions/session_state.cc4
-rw-r--r--sync/sessions/session_state.h4
-rw-r--r--sync/sessions/session_state_unittest.cc4
-rw-r--r--sync/sessions/status_controller.cc4
-rw-r--r--sync/sessions/status_controller.h6
-rw-r--r--sync/sessions/status_controller_unittest.cc4
-rw-r--r--sync/sessions/sync_session.cc4
-rw-r--r--sync/sessions/sync_session.h4
-rw-r--r--sync/sessions/sync_session_context.cc6
-rw-r--r--sync/sessions/sync_session_context.h10
-rw-r--r--sync/sessions/sync_session_unittest.cc4
-rw-r--r--sync/sessions/test_util.cc4
-rw-r--r--sync/sessions/test_util.h4
17 files changed, 51 insertions, 51 deletions
diff --git a/sync/sessions/debug_info_getter.h b/sync/sessions/debug_info_getter.h
index 3dea807..c434091 100644
--- a/sync/sessions/debug_info_getter.h
+++ b/sync/sessions/debug_info_getter.h
@@ -7,7 +7,7 @@
#include "sync/protocol/sync.pb.h"
-namespace csync {
+namespace syncer {
namespace sessions {
// This is the interface that needs to be implemented by the event listener
@@ -21,7 +21,7 @@ class DebugInfoGetter {
};
} // namespace sessions
-} // namespace csync
+} // namespace syncer
#endif // SYNC_SESSIONS_DEBUG_INFO_GETTER_H_
diff --git a/sync/sessions/ordered_commit_set.cc b/sync/sessions/ordered_commit_set.cc
index 91bc5e2..1d13c09 100644
--- a/sync/sessions/ordered_commit_set.cc
+++ b/sync/sessions/ordered_commit_set.cc
@@ -8,11 +8,11 @@
#include "base/logging.h"
-namespace csync {
+namespace syncer {
namespace sessions {
OrderedCommitSet::OrderedCommitSet(
- const csync::ModelSafeRoutingInfo& routes)
+ const syncer::ModelSafeRoutingInfo& routes)
: routes_(routes) {
}
@@ -32,7 +32,7 @@ void OrderedCommitSet::AddCommitItem(const int64 metahandle,
}
const OrderedCommitSet::Projection& OrderedCommitSet::GetCommitIdProjection(
- csync::ModelSafeGroup group) const {
+ syncer::ModelSafeGroup group) const {
Projections::const_iterator i = projections_.find(group);
DCHECK(i != projections_.end());
return i->second;
@@ -124,5 +124,5 @@ void OrderedCommitSet::operator=(const OrderedCommitSet& other) {
}
} // namespace sessions
-} // namespace csync
+} // namespace syncer
diff --git a/sync/sessions/ordered_commit_set.h b/sync/sessions/ordered_commit_set.h
index 7c1937e..1fe8d7c 100644
--- a/sync/sessions/ordered_commit_set.h
+++ b/sync/sessions/ordered_commit_set.h
@@ -14,7 +14,7 @@
#include "sync/internal_api/public/syncable/model_type.h"
#include "sync/syncable/syncable_id.h"
-namespace csync {
+namespace syncer {
namespace sessions {
// TODO(ncarter): This code is more generic than just Commit and can
@@ -30,7 +30,7 @@ class OrderedCommitSet {
typedef std::vector<size_t> Projection;
// TODO(chron): Reserve space according to batch size?
- explicit OrderedCommitSet(const csync::ModelSafeRoutingInfo& routes);
+ explicit OrderedCommitSet(const syncer::ModelSafeRoutingInfo& routes);
~OrderedCommitSet();
bool HaveCommitItem(const int64 metahandle) const {
@@ -65,7 +65,7 @@ class OrderedCommitSet {
// response one ModelSafeGroup at a time. See GetCommitIdAt for how the
// indices contained in the returned Projection can be used.
const Projection& GetCommitIdProjection(
- csync::ModelSafeGroup group) const;
+ syncer::ModelSafeGroup group) const;
size_t Size() const {
return commit_ids_.size();
@@ -89,7 +89,7 @@ class OrderedCommitSet {
void operator=(const OrderedCommitSet& other);
private:
// A set of CommitIdProjections associated with particular ModelSafeGroups.
- typedef std::map<csync::ModelSafeGroup, Projection> Projections;
+ typedef std::map<syncer::ModelSafeGroup, Projection> Projections;
// Helper container for return value of GetCommitItemAt.
struct CommitItem {
@@ -115,11 +115,11 @@ class OrderedCommitSet {
// and shouldn't take up too much extra space since commit lists are small.
std::vector<syncable::ModelType> types_;
- csync::ModelSafeRoutingInfo routes_;
+ syncer::ModelSafeRoutingInfo routes_;
};
} // namespace sessions
-} // namespace csync
+} // namespace syncer
#endif // SYNC_SESSIONS_ORDERED_COMMIT_SET_H_
diff --git a/sync/sessions/ordered_commit_set_unittest.cc b/sync/sessions/ordered_commit_set_unittest.cc
index 85ca08f..fcdc891 100644
--- a/sync/sessions/ordered_commit_set_unittest.cc
+++ b/sync/sessions/ordered_commit_set_unittest.cc
@@ -11,17 +11,17 @@ using std::vector;
class OrderedCommitSetTest : public testing::Test {
public:
OrderedCommitSetTest() {
- routes_[syncable::BOOKMARKS] = csync::GROUP_UI;
- routes_[syncable::PREFERENCES] = csync::GROUP_UI;
- routes_[syncable::AUTOFILL] = csync::GROUP_DB;
- routes_[syncable::TOP_LEVEL_FOLDER] = csync::GROUP_PASSIVE;
+ routes_[syncable::BOOKMARKS] = syncer::GROUP_UI;
+ routes_[syncable::PREFERENCES] = syncer::GROUP_UI;
+ routes_[syncable::AUTOFILL] = syncer::GROUP_DB;
+ routes_[syncable::TOP_LEVEL_FOLDER] = syncer::GROUP_PASSIVE;
}
protected:
- csync::TestIdFactory ids_;
- csync::ModelSafeRoutingInfo routes_;
+ syncer::TestIdFactory ids_;
+ syncer::ModelSafeRoutingInfo routes_;
};
-namespace csync {
+namespace syncer {
namespace sessions {
TEST_F(OrderedCommitSetTest, Projections) {
@@ -128,5 +128,5 @@ TEST_F(OrderedCommitSetTest, AddAndRemoveEntries) {
}
} // namespace sessions
-} // namespace csync
+} // namespace syncer
diff --git a/sync/sessions/session_state.cc b/sync/sessions/session_state.cc
index 6a088d0..cd99800 100644
--- a/sync/sessions/session_state.cc
+++ b/sync/sessions/session_state.cc
@@ -13,7 +13,7 @@
using std::set;
using std::vector;
-namespace csync {
+namespace syncer {
namespace sessions {
ConflictProgress::ConflictProgress()
@@ -139,4 +139,4 @@ PerModelSafeGroupState::~PerModelSafeGroupState() {
}
} // namespace sessions
-} // namespace csync
+} // namespace syncer
diff --git a/sync/sessions/session_state.h b/sync/sessions/session_state.h
index ab35ae8..23f720c 100644
--- a/sync/sessions/session_state.h
+++ b/sync/sessions/session_state.h
@@ -20,7 +20,7 @@
#include "sync/engine/syncproto.h"
#include "sync/syncable/syncable_id.h"
-namespace csync {
+namespace syncer {
namespace sessions {
// Tracks progress of conflicts and their resolutions.
@@ -129,6 +129,6 @@ struct PerModelSafeGroupState {
};
} // namespace sessions
-} // namespace csync
+} // namespace syncer
#endif // SYNC_SESSIONS_SESSION_STATE_H_
diff --git a/sync/sessions/session_state_unittest.cc b/sync/sessions/session_state_unittest.cc
index 52d7e80..3d1b07c 100644
--- a/sync/sessions/session_state_unittest.cc
+++ b/sync/sessions/session_state_unittest.cc
@@ -15,7 +15,7 @@
#include "sync/internal_api/public/sessions/sync_source_info.h"
#include "testing/gtest/include/gtest/gtest.h"
-namespace csync {
+namespace syncer {
namespace sessions {
namespace {
@@ -132,4 +132,4 @@ TEST_F(SessionStateTest, SyncSessionSnapshotToValue) {
} // namespace
} // namespace sessions
-} // namespace csync
+} // namespace syncer
diff --git a/sync/sessions/status_controller.cc b/sync/sessions/status_controller.cc
index cab189e..5cca02c 100644
--- a/sync/sessions/status_controller.cc
+++ b/sync/sessions/status_controller.cc
@@ -10,7 +10,7 @@
#include "sync/internal_api/public/syncable/model_type.h"
#include "sync/protocol/sync_protocol_error.h"
-namespace csync {
+namespace syncer {
namespace sessions {
using syncable::FIRST_REAL_MODEL_TYPE;
@@ -269,4 +269,4 @@ bool StatusController::debug_info_sent() const {
}
} // namespace sessions
-} // namespace csync
+} // namespace syncer
diff --git a/sync/sessions/status_controller.h b/sync/sessions/status_controller.h
index 7837e90..0780a93 100644
--- a/sync/sessions/status_controller.h
+++ b/sync/sessions/status_controller.h
@@ -43,7 +43,7 @@
#include "sync/sessions/ordered_commit_set.h"
#include "sync/sessions/session_state.h"
-namespace csync {
+namespace syncer {
namespace sessions {
class StatusController {
@@ -234,7 +234,7 @@ class ScopedModelSafeGroupRestriction {
DISALLOW_COPY_AND_ASSIGN(ScopedModelSafeGroupRestriction);
};
-}
-}
+} // namespace sessions
+} // namespace syncer
#endif // SYNC_SESSIONS_STATUS_CONTROLLER_H_
diff --git a/sync/sessions/status_controller_unittest.cc b/sync/sessions/status_controller_unittest.cc
index 9037c30..b88ea26 100644
--- a/sync/sessions/status_controller_unittest.cc
+++ b/sync/sessions/status_controller_unittest.cc
@@ -6,7 +6,7 @@
#include "sync/test/engine/test_id_factory.h"
#include "testing/gtest/include/gtest/gtest.h"
-namespace csync {
+namespace syncer {
namespace sessions {
class StatusControllerTest : public testing::Test {
@@ -128,4 +128,4 @@ TEST_F(StatusControllerTest, Unrestricted) {
}
} // namespace sessions
-} // namespace csync
+} // namespace syncer
diff --git a/sync/sessions/sync_session.cc b/sync/sessions/sync_session.cc
index 1ef6e40..da73b1a 100644
--- a/sync/sessions/sync_session.cc
+++ b/sync/sessions/sync_session.cc
@@ -11,7 +11,7 @@
#include "sync/internal_api/public/syncable/model_type.h"
#include "sync/syncable/directory.h"
-namespace csync {
+namespace syncer {
namespace sessions {
namespace {
@@ -257,4 +257,4 @@ void SyncSession::SetFinished() {
}
} // namespace sessions
-} // namespace csync
+} // namespace syncer
diff --git a/sync/sessions/sync_session.h b/sync/sessions/sync_session.h
index 6ccae9e..e847ddb 100644
--- a/sync/sessions/sync_session.h
+++ b/sync/sessions/sync_session.h
@@ -37,7 +37,7 @@ namespace syncable {
class WriteTransaction;
}
-namespace csync {
+namespace syncer {
class ModelSafeWorker;
namespace sessions {
@@ -247,6 +247,6 @@ class ScopedSetSessionWriteTransaction {
};
} // namespace sessions
-} // namespace csync
+} // namespace syncer
#endif // SYNC_SESSIONS_SYNC_SESSION_H_
diff --git a/sync/sessions/sync_session_context.cc b/sync/sessions/sync_session_context.cc
index 22f7582..8edb458 100644
--- a/sync/sessions/sync_session_context.cc
+++ b/sync/sessions/sync_session_context.cc
@@ -8,7 +8,7 @@
#include "sync/sessions/debug_info_getter.h"
#include "sync/util/extensions_activity_monitor.h"
-namespace csync {
+namespace syncer {
namespace sessions {
const unsigned int kMaxMessagesToRecord = 10;
@@ -23,7 +23,7 @@ SyncSessionContext::SyncSessionContext(
ThrottledDataTypeTracker* throttled_data_type_tracker,
const std::vector<SyncEngineEventListener*>& listeners,
DebugInfoGetter* debug_info_getter,
- csync::TrafficRecorder* traffic_recorder)
+ syncer::TrafficRecorder* traffic_recorder)
: resolver_(NULL),
connection_manager_(connection_manager),
directory_(directory),
@@ -44,4 +44,4 @@ SyncSessionContext::~SyncSessionContext() {
}
} // namespace sessions
-} // namespace csync
+} // namespace syncer
diff --git a/sync/sessions/sync_session_context.h b/sync/sessions/sync_session_context.h
index 20f574c..ab54042 100644
--- a/sync/sessions/sync_session_context.h
+++ b/sync/sessions/sync_session_context.h
@@ -34,7 +34,7 @@ namespace syncable {
class Directory;
}
-namespace csync {
+namespace syncer {
class ConflictResolver;
class ExtensionsActivityMonitor;
@@ -58,7 +58,7 @@ class SyncSessionContext {
ThrottledDataTypeTracker* throttled_data_type_tracker,
const std::vector<SyncEngineEventListener*>& listeners,
DebugInfoGetter* debug_info_getter,
- csync::TrafficRecorder* traffic_recorder);
+ syncer::TrafficRecorder* traffic_recorder);
~SyncSessionContext();
ConflictResolver* resolver() { return resolver_; }
@@ -124,7 +124,7 @@ class SyncSessionContext {
OnSyncEngineEvent(event));
}
- csync::TrafficRecorder* traffic_recorder() {
+ syncer::TrafficRecorder* traffic_recorder() {
return traffic_recorder_;
}
@@ -174,7 +174,7 @@ class SyncSessionContext {
// client behavior on server side.
DebugInfoGetter* const debug_info_getter_;
- csync::TrafficRecorder* traffic_recorder_;
+ syncer::TrafficRecorder* traffic_recorder_;
DISALLOW_COPY_AND_ASSIGN(SyncSessionContext);
};
@@ -203,6 +203,6 @@ class ScopedSessionContextConflictResolver {
};
} // namespace sessions
-} // namespace csync
+} // namespace syncer
#endif // SYNC_SESSIONS_SYNC_SESSION_CONTEXT_H_
diff --git a/sync/sessions/sync_session_unittest.cc b/sync/sessions/sync_session_unittest.cc
index c792c9d..fb6c684 100644
--- a/sync/sessions/sync_session_unittest.cc
+++ b/sync/sessions/sync_session_unittest.cc
@@ -23,7 +23,7 @@
using syncable::WriteTransaction;
-namespace csync {
+namespace syncer {
namespace sessions {
namespace {
@@ -536,4 +536,4 @@ TEST_F(SyncSessionTest, CoalescePayloads) {
} // namespace
} // namespace sessions
-} // namespace csync
+} // namespace syncer
diff --git a/sync/sessions/test_util.cc b/sync/sessions/test_util.cc
index d1bd5b7..875d133 100644
--- a/sync/sessions/test_util.cc
+++ b/sync/sessions/test_util.cc
@@ -4,7 +4,7 @@
#include "sync/sessions/test_util.h"
-namespace csync {
+namespace syncer {
namespace sessions {
namespace test_util {
@@ -63,4 +63,4 @@ void SimulateSessionsCommitDelayUpdateImpl(sessions::SyncSession* session,
} // namespace test_util
} // namespace sessions
-} // namespace csync
+} // namespace syncer
diff --git a/sync/sessions/test_util.h b/sync/sessions/test_util.h
index 01fa3aa..c27d752 100644
--- a/sync/sessions/test_util.h
+++ b/sync/sessions/test_util.h
@@ -12,7 +12,7 @@
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
-namespace csync {
+namespace syncer {
namespace sessions {
namespace test_util {
@@ -47,6 +47,6 @@ ACTION_P(SimulateSessionsCommitDelayUpdate, poll) {
} // namespace test_util
} // namespace sessions
-} // namespace csync
+} // namespace syncer
#endif // SYNC_SESSIONS_TEST_UTIL_H_
generated by cgit v1.1 at 2025-01-30 05:22:07 +0000