summaryrefslogtreecommitdiffstats
path: root/sync/syncable/mutable_entry.cc
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-20 17:25:41 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-20 17:25:41 +0000
commitd45f0d9764d93d8f89564a5df7fa505c6a87a6fe (patch)
tree89ce4ea823cf922e6955dafcfb275459589cef0a /sync/syncable/mutable_entry.cc
parent73e5d26041b0a22e16e383e84a8177930c9fd055 (diff)
downloadchromium_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/syncable/mutable_entry.cc')
-rw-r--r--sync/syncable/mutable_entry.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/sync/syncable/mutable_entry.cc b/sync/syncable/mutable_entry.cc
index c61bcb3..869320f 100644
--- a/sync/syncable/mutable_entry.cc
+++ b/sync/syncable/mutable_entry.cc
@@ -232,8 +232,7 @@ bool MutableEntry::Put(ProtoField field,
if (update_unapplied_updates_index) {
// Remove ourselves from unapplied_update_metahandles with our
// old server type.
- const syncer::ModelType old_server_type =
- kernel_->GetServerModelType();
+ const ModelType old_server_type = kernel_->GetServerModelType();
const int64 metahandle = kernel_->ref(META_HANDLE);
size_t erase_count =
dir()->kernel_->unapplied_update_metahandles[old_server_type]
@@ -247,8 +246,7 @@ bool MutableEntry::Put(ProtoField field,
if (update_unapplied_updates_index) {
// Add ourselves back into unapplied_update_metahandles with our
// new server type.
- const syncer::ModelType new_server_type =
- kernel_->GetServerModelType();
+ const ModelType new_server_type = kernel_->GetServerModelType();
const int64 metahandle = kernel_->ref(META_HANDLE);
dir()->kernel_->unapplied_update_metahandles[new_server_type]
.insert(metahandle);