Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(58)

Unified Diff: sync/engine/syncer_unittest.cc

Issue 10698014: [Sync] Rename csync namespace to syncer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sync/engine/syncer_types.h ('k') | sync/engine/syncer_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/engine/syncer_unittest.cc
diff --git a/sync/engine/syncer_unittest.cc b/sync/engine/syncer_unittest.cc
index 764161e1b6760a42b8ea8a778f3c814e1e338533..fe20a65e1e05df12d74c724eb397a74a2a490e2c 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
« no previous file with comments | « sync/engine/syncer_types.h ('k') | sync/engine/syncer_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698