summaryrefslogtreecommitdiffstats
path: root/sync/engine/process_commit_response_command_unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sync/engine/process_commit_response_command_unittest.cc')
-rw-r--r--sync/engine/process_commit_response_command_unittest.cc20
1 files changed, 10 insertions, 10 deletions
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