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

Unified Diff: sync/test/engine/mock_connection_manager.cc

Issue 10795018: [Sync] Remove unneeded 'using syncer::' lines and 'syncer::' scopings (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fiix 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
« no previous file with comments | « sync/test/engine/mock_connection_manager.h ('k') | sync/test/engine/syncer_command_test.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/test/engine/mock_connection_manager.cc
diff --git a/sync/test/engine/mock_connection_manager.cc b/sync/test/engine/mock_connection_manager.cc
index 58bd0d1e68694b792b4a0daff886d671106a5fc5..5b5174d4d81666f8bce4e978d75435a136affe06 100644
--- a/sync/test/engine/mock_connection_manager.cc
+++ b/sync/test/engine/mock_connection_manager.cc
@@ -76,7 +76,7 @@ void MockConnectionManager::SetMidCommitObserver(
bool MockConnectionManager::PostBufferToPath(PostBufferParams* params,
const string& path,
const string& auth_token,
- syncer::ScopedServerStatusWatcher* watcher) {
+ ScopedServerStatusWatcher* watcher) {
ClientToServerMessage post;
CHECK(post.ParseFromString(params->buffer_in));
CHECK(post.has_protocol_version());
@@ -245,8 +245,7 @@ sync_pb::SyncEntity* MockConnectionManager::SetNigori(
sync_pb::SyncEntity* ent = GetUpdateResponse()->add_entries();
ent->set_id_string(TestIdFactory::FromNumber(id).GetServerId());
ent->set_parent_id_string(TestIdFactory::FromNumber(0).GetServerId());
- ent->set_server_defined_unique_tag(syncer::ModelTypeToRootTag(
- syncer::NIGORI));
+ ent->set_server_defined_unique_tag(ModelTypeToRootTag(NIGORI));
ent->set_name("Nigori");
ent->set_non_unique_name("Nigori");
ent->set_version(version);
@@ -402,7 +401,7 @@ void MockConnectionManager::ProcessGetUpdates(
// Verify that the GetUpdates filter sent by the Syncer matches the test
// expectation.
for (int i = FIRST_REAL_MODEL_TYPE; i < MODEL_TYPE_COUNT; ++i) {
- ModelType model_type = syncer::ModelTypeFromInt(i);
+ ModelType model_type = ModelTypeFromInt(i);
sync_pb::DataTypeProgressMarker const* progress_marker =
GetProgressMarkerForType(gu.from_progress_marker(), model_type);
EXPECT_EQ(expected_filter_.Has(model_type), (progress_marker != NULL))
@@ -426,7 +425,7 @@ void MockConnectionManager::ProcessGetUpdates(
sync_pb::GetUpdatesResponse* updates = &update_queue_.front();
for (int i = 0; i < updates->entries_size(); ++i) {
if (!updates->entries(i).deleted()) {
- ModelType entry_type = syncer::GetModelType(updates->entries(i));
+ ModelType entry_type = GetModelType(updates->entries(i));
EXPECT_TRUE(
IsModelTypePresentInSpecifics(gu.from_progress_marker(), entry_type))
<< "Syncer did not request updates being provided by the test.";
@@ -555,8 +554,8 @@ const CommitResponse& MockConnectionManager::last_commit_response() const {
bool MockConnectionManager::IsModelTypePresentInSpecifics(
const google::protobuf::RepeatedPtrField<
sync_pb::DataTypeProgressMarker>& filter,
- syncer::ModelType value) {
- int data_type_id = syncer::GetSpecificsFieldNumberFromModelType(value);
+ ModelType value) {
+ int data_type_id = GetSpecificsFieldNumberFromModelType(value);
for (int i = 0; i < filter.size(); ++i) {
if (filter.Get(i).data_type_id() == data_type_id) {
return true;
@@ -569,8 +568,8 @@ sync_pb::DataTypeProgressMarker const*
MockConnectionManager::GetProgressMarkerForType(
const google::protobuf::RepeatedPtrField<
sync_pb::DataTypeProgressMarker>& filter,
- syncer::ModelType value) {
- int data_type_id = syncer::GetSpecificsFieldNumberFromModelType(value);
+ ModelType value) {
+ int data_type_id = GetSpecificsFieldNumberFromModelType(value);
for (int i = 0; i < filter.size(); ++i) {
if (filter.Get(i).data_type_id() == data_type_id) {
return &(filter.Get(i));
« no previous file with comments | « sync/test/engine/mock_connection_manager.h ('k') | sync/test/engine/syncer_command_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698