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

Unified Diff: sync/engine/syncer_util.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/engine/syncer_util.h ('k') | sync/engine/throttled_data_type_tracker.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/engine/syncer_util.cc
diff --git a/sync/engine/syncer_util.cc b/sync/engine/syncer_util.cc
index 51f46a00f9f22f27767c05b57a19502626ea61bf..fedf4d8f54859528af88700e0d69538574987f7b 100644
--- a/sync/engine/syncer_util.cc
+++ b/sync/engine/syncer_util.cc
@@ -251,7 +251,7 @@ UpdateAttemptResponse AttemptToUpdateEntry(
!cryptographer->CanDecrypt(specifics.encrypted())) {
// We can't decrypt this node yet.
DVLOG(1) << "Received an undecryptable "
- << syncer::ModelTypeToString(entry->GetServerModelType())
+ << ModelTypeToString(entry->GetServerModelType())
<< " update, returning encryption_conflict.";
return CONFLICT_ENCRYPTION;
} else if (specifics.has_password() &&
@@ -303,11 +303,11 @@ UpdateAttemptResponse AttemptToUpdateEntry(
if (specifics.has_encrypted()) {
DVLOG(2) << "Received a decryptable "
- << syncer::ModelTypeToString(entry->GetServerModelType())
+ << ModelTypeToString(entry->GetServerModelType())
<< " update, applying normally.";
} else {
DVLOG(2) << "Received an unencrypted "
- << syncer::ModelTypeToString(entry->GetServerModelType())
+ << ModelTypeToString(entry->GetServerModelType())
<< " update, applying normally.";
}
@@ -596,7 +596,7 @@ VerifyResult VerifyUpdateConsistency(
syncable::MutableEntry* target,
const bool deleted,
const bool is_directory,
- syncer::ModelType model_type) {
+ ModelType model_type) {
CHECK(target->good());
const syncable::Id& update_id = SyncableIdFromProto(update.id_string());
@@ -605,7 +605,7 @@ VerifyResult VerifyUpdateConsistency(
if (deleted)
return VERIFY_SUCCESS;
- if (model_type == syncer::UNSPECIFIED) {
+ if (model_type == UNSPECIFIED) {
// This update is to an item of a datatype we don't recognize. The server
// shouldn't have sent it to us. Throw it on the ground.
return VERIFY_SKIP;
« no previous file with comments | « sync/engine/syncer_util.h ('k') | sync/engine/throttled_data_type_tracker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698