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

Unified Diff: sync/sessions/sync_session.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/sessions/status_controller_unittest.cc ('k') | sync/sessions/sync_session_context.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/sessions/sync_session.cc
diff --git a/sync/sessions/sync_session.cc b/sync/sessions/sync_session.cc
index 0281dcd469af95f6969e7b6a7ce44d7fd7af2d0b..7af4c50a1ed91425a76b1ddd551d917f1d54acf3 100644
--- a/sync/sessions/sync_session.cc
+++ b/sync/sessions/sync_session.cc
@@ -48,17 +48,17 @@ std::set<ModelSafeGroup> ComputeEnabledGroups(
return enabled_groups;
}
-void PurgeStalePayload(syncer::ModelTypePayloadMap* original,
+void PurgeStalePayload(ModelTypePayloadMap* original,
const ModelSafeRoutingInfo& routing_info) {
- std::vector<syncer::ModelTypePayloadMap::iterator> iterators_to_delete;
- for (syncer::ModelTypePayloadMap::iterator i = original->begin();
+ std::vector<ModelTypePayloadMap::iterator> iterators_to_delete;
+ for (ModelTypePayloadMap::iterator i = original->begin();
i != original->end(); ++i) {
if (routing_info.end() == routing_info.find(i->first)) {
iterators_to_delete.push_back(i);
}
}
- for (std::vector<syncer::ModelTypePayloadMap::iterator>::iterator
+ for (std::vector<ModelTypePayloadMap::iterator>::iterator
it = iterators_to_delete.begin(); it != iterators_to_delete.end();
++it) {
original->erase(*it);
@@ -156,11 +156,10 @@ SyncSessionSnapshot SyncSession::TakeSnapshot() const {
syncable::Directory* dir = context_->directory();
bool is_share_useable = true;
- syncer::ModelTypeSet initial_sync_ended;
- syncer::ModelTypePayloadMap download_progress_markers;
- for (int i = syncer::FIRST_REAL_MODEL_TYPE;
- i < syncer::MODEL_TYPE_COUNT; ++i) {
- syncer::ModelType type(syncer::ModelTypeFromInt(i));
+ ModelTypeSet initial_sync_ended;
+ ModelTypePayloadMap download_progress_markers;
+ for (int i = FIRST_REAL_MODEL_TYPE; i < MODEL_TYPE_COUNT; ++i) {
+ ModelType type(ModelTypeFromInt(i));
if (routing_info_.count(type) != 0) {
if (dir->initial_sync_ended_for_type(type))
initial_sync_ended.Put(type);
« no previous file with comments | « sync/sessions/status_controller_unittest.cc ('k') | sync/sessions/sync_session_context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698