diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-20 17:25:41 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-20 17:25:41 +0000 |
| commit | d45f0d9764d93d8f89564a5df7fa505c6a87a6fe (patch) | |
| tree | 89ce4ea823cf922e6955dafcfb275459589cef0a /sync/engine/process_updates_command.cc | |
| parent | 73e5d26041b0a22e16e383e84a8177930c9fd055 (diff) | |
| download | chromium_src-d45f0d9764d93d8f89564a5df7fa505c6a87a6fe.zip chromium_src-d45f0d9764d93d8f89564a5df7fa505c6a87a6fe.tar.gz chromium_src-d45f0d9764d93d8f89564a5df7fa505c6a87a6fe.tar.bz2 | |
[Sync] Remove unneeded 'using syncer::' lines and 'syncer::' scopings
Since (almost) everything in sync/ is now in the 'syncer' namespace,
all of these are redundant.
Clean up indentation.
Put sync_{client,listen_notifications} into syncer namespace.
BUG=128060
TEST=
Review URL: https://chromiumcodereview.appspot.com/10795018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147675 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/engine/process_updates_command.cc')
| -rw-r--r-- | sync/engine/process_updates_command.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sync/engine/process_updates_command.cc b/sync/engine/process_updates_command.cc index ccf3def..de6be0f 100644 --- a/sync/engine/process_updates_command.cc +++ b/sync/engine/process_updates_command.cc @@ -78,7 +78,7 @@ bool ReverifyEntry(syncable::WriteTransaction* trans, const bool deleted = entry.has_deleted() && entry.deleted(); const bool is_directory = IsFolder(entry); - const syncer::ModelType model_type = GetModelType(entry); + const ModelType model_type = GetModelType(entry); return VERIFY_SUCCESS == VerifyUpdateConsistency(trans, entry, @@ -160,7 +160,7 @@ ServerUpdateProcessingResult ProcessUpdatesCommand::ProcessUpdate( // We only store the old specifics if they were decryptable and applied and // there is no BASE_SERVER_SPECIFICS already. Else do nothing. if (!target_entry.Get(syncable::IS_UNAPPLIED_UPDATE) && - !syncer::IsRealDataType(syncer::GetModelTypeFromSpecifics( + !IsRealDataType(GetModelTypeFromSpecifics( target_entry.Get(syncable::BASE_SERVER_SPECIFICS))) && (!prev_specifics.has_encrypted() || cryptographer->CanDecrypt(prev_specifics.encrypted()))) { @@ -168,7 +168,7 @@ ServerUpdateProcessingResult ProcessUpdatesCommand::ProcessUpdate( << prev_specifics.SerializeAsString(); target_entry.Put(syncable::BASE_SERVER_SPECIFICS, prev_specifics); } - } else if (syncer::IsRealDataType(syncer::GetModelTypeFromSpecifics( + } else if (IsRealDataType(GetModelTypeFromSpecifics( target_entry.Get(syncable::BASE_SERVER_SPECIFICS)))) { // We have a BASE_SERVER_SPECIFICS, but a subsequent non-specifics-only // change arrived. As a result, we can't use the specifics alone to detect |