sync/engine/syncer_unittest.cc - Issue 10795018: [Sync] Remove unneeded 'using syncer::' lines and 'syncer::' scopings

Unified Diff: sync/engine/syncer_unittest.cc

Issue 10795018: [Sync] Remove unneeded 'using syncer::' lines and 'syncer::' scopings (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix indent Created 8 years, 5 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

Index: sync/engine/syncer_unittest.cc

diff --git a/sync/engine/syncer_unittest.cc b/sync/engine/syncer_unittest.cc

index c4686230e6150e367bcbb1f20879f6aaa6535952..dabe08bd4b6315efde0d2e518296020e855f46b3 100644

--- a/sync/engine/syncer_unittest.cc

+++ b/sync/engine/syncer_unittest.cc

@@ -152,7 +152,7 @@ class SyncerTest : public testing::Test,

void GetModelSafeRoutingInfo(ModelSafeRoutingInfo* out) {

// We're just testing the sync engine here, so we shunt everything to

// the SyncerThread. Datatypes which aren't enabled aren't in the map.

- for (syncer::ModelTypeSet::Iterator it = enabled_datatypes_.First();

+ for (ModelTypeSet::Iterator it = enabled_datatypes_.First();

it.Good(); it.Inc()) {

(*out)[it.Get()] = GROUP_PASSIVE;

}

@@ -177,7 +177,7 @@ class SyncerTest : public testing::Test,

std::vector<ModelSafeWorker*> workers;

GetModelSafeRoutingInfo(&info);

GetWorkers(&workers);

- syncer::ModelTypePayloadMap types =

+ ModelTypePayloadMap types =

ModelSafeRoutingInfoToPayloadMap(info, std::string());

return new SyncSession(context_.get(), this,

sessions::SyncSourceInfo(sync_pb::GetUpdatesCallerInfo::UNKNOWN, types),

@@ -217,10 +217,10 @@ class SyncerTest : public testing::Test,

virtual void SetUp() {

dir_maker_.SetUp();

mock_server_.reset(new MockConnectionManager(directory()));

- EnableDatatype(syncer::BOOKMARKS);

- EnableDatatype(syncer::NIGORI);

- EnableDatatype(syncer::PREFERENCES);

- EnableDatatype(syncer::NIGORI);

+ EnableDatatype(BOOKMARKS);

+ EnableDatatype(NIGORI);

+ EnableDatatype(PREFERENCES);

+ EnableDatatype(NIGORI);

worker_ = new FakeModelWorker(GROUP_PASSIVE);

std::vector<SyncEngineEventListener*> listeners;

listeners.push_back(this);

@@ -279,7 +279,7 @@ class SyncerTest : public testing::Test,

EXPECT_EQ("http://demo/", specifics.bookmark().url());

}

- bool initial_sync_ended_for_type(syncer::ModelType type) {

+ bool initial_sync_ended_for_type(ModelType type) {

return directory()->initial_sync_ended_for_type(type);

}

@@ -296,13 +296,13 @@ class SyncerTest : public testing::Test,

}

sync_pb::EntitySpecifics DefaultBookmarkSpecifics() {

sync_pb::EntitySpecifics result;

- AddDefaultFieldValue(syncer::BOOKMARKS, &result);

+ AddDefaultFieldValue(BOOKMARKS, &result);

return result;

}

sync_pb::EntitySpecifics DefaultPreferencesSpecifics() {

sync_pb::EntitySpecifics result;

- AddDefaultFieldValue(syncer::PREFERENCES, &result);

+ AddDefaultFieldValue(PREFERENCES, &result);

return result;

}

// Enumeration of alterations to entries for commit ordering tests.

@@ -405,8 +405,8 @@ class SyncerTest : public testing::Test,

sessions::OrderedCommitSet output_set(routes);

GetCommitIdsCommand command(limit, &output_set);

std::set<int64> ready_unsynced_set;

- command.FilterUnreadyEntries(&wtrans, syncer::ModelTypeSet(),

- syncer::ModelTypeSet(), false,

+ command.FilterUnreadyEntries(&wtrans, ModelTypeSet(),

+ ModelTypeSet(), false,

unsynced_handle_view, &ready_unsynced_set);

command.BuildCommitIds(session_->write_transaction(), routes,

ready_unsynced_set);

@@ -457,7 +457,7 @@ class SyncerTest : public testing::Test,

return entry.Get(META_HANDLE);

}

- void EnableDatatype(syncer::ModelType model_type) {

+ void EnableDatatype(ModelType model_type) {

enabled_datatypes_.Put(model_type);

ModelSafeRoutingInfo routing_info;

@@ -470,7 +470,7 @@ class SyncerTest : public testing::Test,

mock_server_->ExpectGetUpdatesRequestTypes(enabled_datatypes_);

}

- void DisableDatatype(syncer::ModelType model_type) {

+ void DisableDatatype(ModelType model_type) {

enabled_datatypes_.Remove(model_type);

ModelSafeRoutingInfo routing_info;

@@ -558,8 +558,8 @@ class SyncerTest : public testing::Test,

base::TimeDelta last_sessions_commit_delay_seconds_;

scoped_refptr<ModelSafeWorker> worker_;

- syncer::ModelTypeSet enabled_datatypes_;

- syncer::TrafficRecorder traffic_recorder_;

+ ModelTypeSet enabled_datatypes_;

+ TrafficRecorder traffic_recorder_;

DISALLOW_COPY_AND_ASSIGN(SyncerTest);

};

@@ -632,9 +632,9 @@ TEST_F(SyncerTest, GetCommitIdsCommandTruncates) {

}

TEST_F(SyncerTest, GetCommitIdsFiltersThrottledEntries) {

- const syncer::ModelTypeSet throttled_types(syncer::BOOKMARKS);

+ const ModelTypeSet throttled_types(BOOKMARKS);

sync_pb::EntitySpecifics bookmark_data;

- AddDefaultFieldValue(syncer::BOOKMARKS, &bookmark_data);

+ AddDefaultFieldValue(BOOKMARKS, &bookmark_data);

mock_server_->AddUpdateDirectory(1, 0, "A", 10, 10);

SyncShareNudge();

@@ -687,7 +687,7 @@ TEST_F(SyncerTest, GetCommitIdsFiltersThrottledEntries) {

EXPECT_TRUE(is_unsynced == entryA.Get(IS_UNSYNCED)); \

EXPECT_TRUE(is_unapplied == entryA.Get(IS_UNAPPLIED_UPDATE)); \

EXPECT_TRUE(prev_initialized == \

- syncer::IsRealDataType(syncer::GetModelTypeFromSpecifics( \

+ IsRealDataType(GetModelTypeFromSpecifics( \

entryA.Get(BASE_SERVER_SPECIFICS)))); \

EXPECT_TRUE(parent_id == -1 || \

entryA.Get(PARENT_ID) == id_fac.FromNumber(parent_id)); \

@@ -701,7 +701,7 @@ TEST_F(SyncerTest, GetCommitIdsFiltersUnreadyEntries) {

sync_pb::EntitySpecifics bookmark, encrypted_bookmark;

bookmark.mutable_bookmark()->set_url("url");

bookmark.mutable_bookmark()->set_title("title");

- AddDefaultFieldValue(syncer::BOOKMARKS, &encrypted_bookmark);

+ AddDefaultFieldValue(BOOKMARKS, &encrypted_bookmark);

mock_server_->AddUpdateDirectory(1, 0, "A", 10, 10);

mock_server_->AddUpdateDirectory(2, 0, "B", 10, 10);

mock_server_->AddUpdateDirectory(3, 0, "C", 10, 10);

@@ -713,7 +713,7 @@ TEST_F(SyncerTest, GetCommitIdsFiltersUnreadyEntries) {

// Mark bookmarks as encrypted and set the cryptographer to have pending

// keys.

WriteTransaction wtrans(FROM_HERE, UNITTEST, directory());

- syncer::Cryptographer other_cryptographer(&encryptor_);

+ Cryptographer other_cryptographer(&encryptor_);

other_cryptographer.AddKey(other_params);

sync_pb::EntitySpecifics specifics;

sync_pb::NigoriSpecifics* nigori = specifics.mutable_nigori();

@@ -806,19 +806,19 @@ TEST_F(SyncerTest, GetCommitIdsFiltersUnreadyEntries) {

TEST_F(SyncerTest, EncryptionAwareConflicts) {

KeyParams key_params = {"localhost", "dummy", "foobar"};

- syncer::Cryptographer other_cryptographer(&encryptor_);

+ Cryptographer other_cryptographer(&encryptor_);

other_cryptographer.AddKey(key_params);

sync_pb::EntitySpecifics bookmark, encrypted_bookmark, modified_bookmark;

bookmark.mutable_bookmark()->set_title("title");

other_cryptographer.Encrypt(bookmark,

encrypted_bookmark.mutable_encrypted());

- AddDefaultFieldValue(syncer::BOOKMARKS, &encrypted_bookmark);

+ AddDefaultFieldValue(BOOKMARKS, &encrypted_bookmark);

modified_bookmark.mutable_bookmark()->set_title("title2");

other_cryptographer.Encrypt(modified_bookmark,

modified_bookmark.mutable_encrypted());

sync_pb::EntitySpecifics pref, encrypted_pref, modified_pref;

pref.mutable_preference()->set_name("name");

- AddDefaultFieldValue(syncer::PREFERENCES, &encrypted_pref);

+ AddDefaultFieldValue(PREFERENCES, &encrypted_pref);

other_cryptographer.Encrypt(pref,

encrypted_pref.mutable_encrypted());

modified_pref.mutable_preference()->set_name("name2");

@@ -980,7 +980,7 @@ TEST_F(SyncerTest, ReceiveOldNigori) {

KeyParams current_key = {"localhost", "dummy", "cur"};

// Data for testing encryption/decryption.

- syncer::Cryptographer other_cryptographer(&encryptor_);

+ Cryptographer other_cryptographer(&encryptor_);

other_cryptographer.AddKey(old_key);

sync_pb::EntitySpecifics other_encrypted_specifics;

other_encrypted_specifics.mutable_bookmark()->set_title("title");

@@ -989,7 +989,7 @@ TEST_F(SyncerTest, ReceiveOldNigori) {

other_encrypted_specifics.mutable_encrypted());

sync_pb::EntitySpecifics our_encrypted_specifics;

our_encrypted_specifics.mutable_bookmark()->set_title("title2");

- syncer::ModelTypeSet encrypted_types = syncer::ModelTypeSet::All();

+ ModelTypeSet encrypted_types = ModelTypeSet::All();

// Receive the initial nigori node.

@@ -1014,7 +1014,7 @@ TEST_F(SyncerTest, ReceiveOldNigori) {

cryptographer(&wtrans)->set_encrypt_everything();

cryptographer(&wtrans)->UpdateNigoriFromEncryptedTypes(nigori);

MutableEntry nigori_entry(&wtrans, GET_BY_SERVER_TAG,

- syncer::ModelTypeToRootTag(syncer::NIGORI));

+ ModelTypeToRootTag(NIGORI));

ASSERT_TRUE(nigori_entry.good());

nigori_entry.Put(SPECIFICS, specifics);

nigori_entry.Put(IS_UNSYNCED, true);

@@ -1040,7 +1040,7 @@ TEST_F(SyncerTest, ReceiveOldNigori) {

// the newest, and the encrypted types should be the most recent

syncable::ReadTransaction trans(FROM_HERE, directory());

Entry nigori_entry(&trans, GET_BY_SERVER_TAG,

- syncer::ModelTypeToRootTag(syncer::NIGORI));

+ ModelTypeToRootTag(NIGORI));

ASSERT_TRUE(nigori_entry.good());

EXPECT_FALSE(nigori_entry.Get(IS_UNAPPLIED_UPDATE));

EXPECT_FALSE(nigori_entry.Get(IS_UNSYNCED));

@@ -1063,9 +1063,9 @@ TEST_F(SyncerTest, ReceiveOldNigori) {

TEST_F(SyncerTest, NigoriConflicts) {

KeyParams local_key_params = {"localhost", "dummy", "blargle"};

KeyParams other_key_params = {"localhost", "dummy", "foobar"};

- syncer::Cryptographer other_cryptographer(&encryptor_);

+ Cryptographer other_cryptographer(&encryptor_);

other_cryptographer.AddKey(other_key_params);

- syncer::ModelTypeSet encrypted_types(syncer::PASSWORDS, syncer::NIGORI);

+ ModelTypeSet encrypted_types(PASSWORDS, NIGORI);

sync_pb::EntitySpecifics initial_nigori_specifics;

initial_nigori_specifics.mutable_nigori();

mock_server_->SetNigori(1, 10, 10, initial_nigori_specifics);

@@ -1081,7 +1081,7 @@ TEST_F(SyncerTest, NigoriConflicts) {

// Receive the initial nigori node.

SyncShareNudge();

- encrypted_types = syncer::ModelTypeSet::All();

+ encrypted_types = ModelTypeSet::All();

{

// Local changes with different passphrase, different types.

WriteTransaction wtrans(FROM_HERE, UNITTEST, directory());

@@ -1096,7 +1096,7 @@ TEST_F(SyncerTest, NigoriConflicts) {

cryptographer(&wtrans)->UpdateNigoriFromEncryptedTypes(nigori);

cryptographer(&wtrans)->set_encrypt_everything();

MutableEntry nigori_entry(&wtrans, GET_BY_SERVER_TAG,

- syncer::ModelTypeToRootTag(syncer::NIGORI));

+ ModelTypeToRootTag(NIGORI));

ASSERT_TRUE(nigori_entry.good());

nigori_entry.Put(SPECIFICS, specifics);

nigori_entry.Put(IS_UNSYNCED, true);

@@ -1126,7 +1126,7 @@ TEST_F(SyncerTest, NigoriConflicts) {

// Ensure the nigori data merged (encrypted types).

WriteTransaction wtrans(FROM_HERE, UNITTEST, directory());

MutableEntry nigori_entry(&wtrans, GET_BY_SERVER_TAG,

- syncer::ModelTypeToRootTag(syncer::NIGORI));

+ ModelTypeToRootTag(NIGORI));

ASSERT_TRUE(nigori_entry.good());

EXPECT_FALSE(nigori_entry.Get(IS_UNAPPLIED_UPDATE));

EXPECT_FALSE(nigori_entry.Get(IS_UNSYNCED));

@@ -1157,7 +1157,7 @@ TEST_F(SyncerTest, NigoriConflicts) {

// should have been unioned.

WriteTransaction wtrans(FROM_HERE, UNITTEST, directory());

MutableEntry nigori_entry(&wtrans, GET_BY_SERVER_TAG,

- syncer::ModelTypeToRootTag(syncer::NIGORI));

+ ModelTypeToRootTag(NIGORI));

ASSERT_TRUE(nigori_entry.good());

EXPECT_FALSE(nigori_entry.Get(IS_UNAPPLIED_UPDATE));

EXPECT_FALSE(nigori_entry.Get(IS_UNSYNCED));

@@ -1232,8 +1232,7 @@ TEST_F(SyncerTest, TestPurgeWhileUnsynced) {

parent2.Put(syncable::ID, pref_node_id);

}

- directory()->PurgeEntriesWithTypeIn(

- syncer::ModelTypeSet(syncer::PREFERENCES));

+ directory()->PurgeEntriesWithTypeIn(ModelTypeSet(PREFERENCES));

SyncShareNudge();

ASSERT_EQ(2U, mock_server_->committed_ids().size());

@@ -1268,7 +1267,7 @@ TEST_F(SyncerTest, TestPurgeWhileUnapplied) {

}

directory()->PurgeEntriesWithTypeIn(

- syncer::ModelTypeSet(syncer::BOOKMARKS));

+ ModelTypeSet(BOOKMARKS));

SyncShareNudge();

directory()->SaveChanges();

@@ -2463,7 +2462,7 @@ TEST_F(SyncerTest, CommitsUpdateDoesntAlterEntry) {

}

TEST_F(SyncerTest, ParentAndChildBothMatch) {

- const syncer::FullModelTypeSet all_types = syncer::FullModelTypeSet::All();

+ const FullModelTypeSet all_types = FullModelTypeSet::All();

syncable::Id parent_id = ids_.NewServerId();

syncable::Id child_id = ids_.NewServerId();

@@ -4017,28 +4016,28 @@ TEST_F(SyncerTest, GetUpdatesSetsRequestedTypes) {

// The expectations of this test happen in the MockConnectionManager's

// GetUpdates handler. EnableDatatype sets the expectation value from our

// set of enabled/disabled datatypes.

- EnableDatatype(syncer::BOOKMARKS);

+ EnableDatatype(BOOKMARKS);

SyncShareNudge();