[Sync] Move //sync to //components/sync.

components/sync/syncable/directory.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sync/syncable/directory.h"
+#include "components/sync/syncable/directory.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
 #include <iterator>
 #include <utility>
 
 #include "base/base64.h"
 #include "base/guid.h"
 #include "base/metrics/histogram.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/trace_event/trace_event.h"
-#include "sync/internal_api/public/base/attachment_id_proto.h"
-#include "sync/internal_api/public/base/unique_position.h"
-#include "sync/internal_api/public/util/unrecoverable_error_handler.h"
-#include "sync/syncable/entry.h"
-#include "sync/syncable/entry_kernel.h"
-#include "sync/syncable/in_memory_directory_backing_store.h"
-#include "sync/syncable/model_neutral_mutable_entry.h"
-#include "sync/syncable/on_disk_directory_backing_store.h"
-#include "sync/syncable/scoped_kernel_lock.h"
-#include "sync/syncable/scoped_parent_child_index_updater.h"
-#include "sync/syncable/syncable-inl.h"
-#include "sync/syncable/syncable_base_transaction.h"
-#include "sync/syncable/syncable_changes_version.h"
-#include "sync/syncable/syncable_read_transaction.h"
-#include "sync/syncable/syncable_util.h"
-#include "sync/syncable/syncable_write_transaction.h"
+#include "components/sync/base/attachment_id_proto.h"
+#include "components/sync/base/unique_position.h"
+#include "components/sync/base/unrecoverable_error_handler.h"
+#include "components/sync/syncable/entry.h"
+#include "components/sync/syncable/entry_kernel.h"
+#include "components/sync/syncable/in_memory_directory_backing_store.h"
+#include "components/sync/syncable/model_neutral_mutable_entry.h"
+#include "components/sync/syncable/on_disk_directory_backing_store.h"
+#include "components/sync/syncable/scoped_kernel_lock.h"
+#include "components/sync/syncable/scoped_parent_child_index_updater.h"
+#include "components/sync/syncable/syncable-inl.h"
+#include "components/sync/syncable/syncable_base_transaction.h"
+#include "components/sync/syncable/syncable_changes_version.h"
+#include "components/sync/syncable/syncable_read_transaction.h"
+#include "components/sync/syncable/syncable_util.h"
+#include "components/sync/syncable/syncable_write_transaction.h"
 
 using std::string;
 
 namespace syncer {
 namespace syncable {
 
 // static
 const base::FilePath::CharType Directory::kSyncDatabaseFilename[] =
     FILE_PATH_LITERAL("SyncData.sqlite3");
 
@@ skipping 20 matching lines @@
 }
 
 bool Directory::PersistedKernelInfo::HasEmptyDownloadProgress(
     ModelType model_type) {
   const sync_pb::DataTypeProgressMarker& progress_marker =
       download_progress[model_type];
   return progress_marker.token().empty();
 }
 
 Directory::SaveChangesSnapshot::SaveChangesSnapshot()
-    : kernel_info_status(KERNEL_SHARE_INFO_INVALID) {
-}
+    : kernel_info_status(KERNEL_SHARE_INFO_INVALID) {}
 
 Directory::SaveChangesSnapshot::~SaveChangesSnapshot() {
   STLDeleteElements(&dirty_metas);
   STLDeleteElements(&delete_journals);
 }
 
 bool Directory::SaveChangesSnapshot::HasUnsavedMetahandleChanges() const {
   return !dirty_metas.empty() || !metahandles_to_purge.empty() ||
          !delete_journals.empty() || !delete_journals_to_purge.empty();
 }
@@ skipping 39 matching lines @@
 Directory::~Directory() {
   Close();
 }
 
 DirOpenResult Directory::Open(
     const string& name,
     DirectoryChangeDelegate* delegate,
     const WeakHandle<TransactionObserver>& transaction_observer) {
   TRACE_EVENT0("sync", "SyncDatabaseOpen");
 
-  const DirOpenResult result =
-      OpenImpl(name, delegate, transaction_observer);
+  const DirOpenResult result = OpenImpl(name, delegate, transaction_observer);
 
   if (OPENED != result)
     Close();
   return result;
 }
 
 void Directory::InitializeIndices(MetahandlesMap* handles_map) {
   ScopedKernelLock lock(this);
   kernel_->metahandles_map.swap(*handles_map);
   for (MetahandlesMap::const_iterator it = kernel_->metahandles_map.begin();
@@ skipping 14 matching lines @@
           << "Unexpected duplicate use of client tag";
       kernel_->server_tags_map[entry->ref(UNIQUE_SERVER_TAG)] = entry;
     }
     if (!entry->ref(UNIQUE_CLIENT_TAG).empty()) {
       DCHECK(kernel_->server_tags_map.find(entry->ref(UNIQUE_SERVER_TAG)) ==
              kernel_->server_tags_map.end())
           << "Unexpected duplicate use of server tag";
       kernel_->client_tags_map[entry->ref(UNIQUE_CLIENT_TAG)] = entry;
     }
     DCHECK(kernel_->ids_map.find(entry->ref(ID).value()) ==
-           kernel_->ids_map.end()) << "Unexpected duplicate use of ID";
+           kernel_->ids_map.end())
+        << "Unexpected duplicate use of ID";
     kernel_->ids_map[entry->ref(ID).value()] = entry;
     DCHECK(!entry->is_dirty());
     AddToAttachmentIndex(lock, metahandle, entry->ref(ATTACHMENT_METADATA));
   }
 }
 
 DirOpenResult Directory::OpenImpl(
     const string& name,
     DirectoryChangeDelegate* delegate,
-    const WeakHandle<TransactionObserver>&
-        transaction_observer) {
+    const WeakHandle<TransactionObserver>& transaction_observer) {
   KernelLoadInfo info;
   // Temporary indices before kernel_ initialized in case Load fails. We 0(1)
   // swap these later.
   Directory::MetahandlesMap tmp_handles_map;
 
   // Avoids mem leaks on failure.  Harmlessly deletes the empty hash map after
   // the swap in the success case.
   STLValueDeleter<MetahandlesMap> deleter(&tmp_handles_map);
 
   JournalIndex delete_journals;
@@ skipping 31 matching lines @@
 void Directory::Close() {
   store_.reset();
   if (kernel_) {
     delete kernel_;
     kernel_ = NULL;
   }
 }
 
 void Directory::OnUnrecoverableError(const BaseTransaction* trans,
                                      const tracked_objects::Location& location,
-                                     const std::string & message) {
+                                     const std::string& message) {
   DCHECK(trans != NULL);
   unrecoverable_error_set_ = true;
   unrecoverable_error_handler_.Call(
       FROM_HERE, &UnrecoverableErrorHandler::OnUnrecoverableError, location,
       message);
 }
 
 EntryKernel* Directory::GetEntryById(const Id& id) {
   ScopedKernelLock lock(this);
   return GetEntryById(lock, id);
@@ skipping 32 matching lines @@
 }
 
 EntryKernel* Directory::GetEntryByHandle(int64_t metahandle) {
   ScopedKernelLock lock(this);
   return GetEntryByHandle(lock, metahandle);
 }
 
 EntryKernel* Directory::GetEntryByHandle(const ScopedKernelLock& lock,
                                          int64_t metahandle) {
   // Look up in memory
-  MetahandlesMap::iterator found =
-      kernel_->metahandles_map.find(metahandle);
+  MetahandlesMap::iterator found = kernel_->metahandles_map.find(metahandle);
   if (found != kernel_->metahandles_map.end()) {
     // Found it in memory.  Easy.
     return found->second;
   }
   return NULL;
 }
 
-bool Directory::GetChildHandlesById(
-    BaseTransaction* trans, const Id& parent_id,
-    Directory::Metahandles* result) {
+bool Directory::GetChildHandlesById(BaseTransaction* trans,
+                                    const Id& parent_id,
+                                    Directory::Metahandles* result) {
   if (!SyncAssert(this == trans->directory(), FROM_HERE,
                   "Directories don't match", trans))
     return false;
   result->clear();
 
   ScopedKernelLock lock(this);
   AppendChildHandles(lock, parent_id, result);
   return true;
 }
 
-int Directory::GetTotalNodeCount(
-    BaseTransaction* trans,
-    EntryKernel* kernel) const {
+int Directory::GetTotalNodeCount(BaseTransaction* trans,
+                                 EntryKernel* kernel) const {
   if (!SyncAssert(this == trans->directory(), FROM_HERE,
                   "Directories don't match", trans))
     return false;
 
   int count = 1;
   std::deque<const OrderedChildSet*> child_sets;
 
   GetChildSetForKernel(trans, kernel, &child_sets);
   while (!child_sets.empty()) {
     const OrderedChildSet* set = child_sets.front();
     child_sets.pop_front();
-    for (OrderedChildSet::const_iterator it = set->begin();
-         it != set->end(); ++it) {
+    for (OrderedChildSet::const_iterator it = set->begin(); it != set->end();
+         ++it) {
       count++;
       GetChildSetForKernel(trans, *it, &child_sets);
     }
   }
 
   return count;
 }
 
 void Directory::GetChildSetForKernel(
     BaseTransaction* trans,
     EntryKernel* kernel,
     std::deque<const OrderedChildSet*>* child_sets) const {
   if (!kernel->ref(IS_DIR))
     return;  // Not a directory => no children.
 
   const OrderedChildSet* descendants =
       kernel_->parent_child_index.GetChildren(kernel->ref(ID));
   if (!descendants)
     return;  // This directory has no children.
 
   // Add our children to the list of items to be traversed.
   child_sets->push_back(descendants);
 }
 
-int Directory::GetPositionIndex(
-    BaseTransaction* trans,
-    EntryKernel* kernel) const {
+int Directory::GetPositionIndex(BaseTransaction* trans,
+                                EntryKernel* kernel) const {
   const OrderedChildSet* siblings =
       kernel_->parent_child_index.GetSiblings(kernel);
 
   OrderedChildSet::const_iterator it = siblings->find(kernel);
   return std::distance(siblings->begin(), it);
 }
 
 bool Directory::InsertEntry(BaseWriteTransaction* trans, EntryKernel* entry) {
   ScopedKernelLock lock(this);
   return InsertEntry(lock, trans, entry);
 }
 
 bool Directory::InsertEntry(const ScopedKernelLock& lock,
                             BaseWriteTransaction* trans,
                             EntryKernel* entry) {
   if (!SyncAssert(NULL != entry, FROM_HERE, "Entry is null", trans))
     return false;
 
   static const char error[] = "Entry already in memory index.";
 
-  if (!SyncAssert(
-          kernel_->metahandles_map.insert(
-              std::make_pair(entry->ref(META_HANDLE), entry)).second,
-          FROM_HERE,
-          error,
-          trans)) {
+  if (!SyncAssert(kernel_->metahandles_map
+                      .insert(std::make_pair(entry->ref(META_HANDLE), entry))
+                      .second,
+                  FROM_HERE, error, trans)) {
     return false;
   }
   if (!SyncAssert(
-          kernel_->ids_map.insert(
-              std::make_pair(entry->ref(ID).value(), entry)).second,
-          FROM_HERE,
-          error,
-          trans)) {
+          kernel_->ids_map.insert(std::make_pair(entry->ref(ID).value(), entry))
+              .second,
+          FROM_HERE, error, trans)) {
     return false;
   }
   if (ParentChildIndex::ShouldInclude(entry)) {
-    if (!SyncAssert(kernel_->parent_child_index.Insert(entry),
-                    FROM_HERE,
-                    error,
+    if (!SyncAssert(kernel_->parent_child_index.Insert(entry), FROM_HERE, error,
                     trans)) {
       return false;
     }
   }
-  AddToAttachmentIndex(
-      lock, entry->ref(META_HANDLE), entry->ref(ATTACHMENT_METADATA));
+  AddToAttachmentIndex(lock, entry->ref(META_HANDLE),
+                       entry->ref(ATTACHMENT_METADATA));
 
   // Should NEVER be created with a client tag or server tag.
   if (!SyncAssert(entry->ref(UNIQUE_SERVER_TAG).empty(), FROM_HERE,
                   "Server tag should be empty", trans)) {
     return false;
   }
   if (!SyncAssert(entry->ref(UNIQUE_CLIENT_TAG).empty(), FROM_HERE,
                   "Client tag should be empty", trans))
     return false;
 
   return true;
 }
 
 bool Directory::ReindexId(BaseWriteTransaction* trans,
                           EntryKernel* const entry,
                           const Id& new_id) {
   ScopedKernelLock lock(this);
   if (NULL != GetEntryById(lock, new_id))
     return false;
 
   {
     // Update the indices that depend on the ID field.
     ScopedParentChildIndexUpdater updater_b(lock, entry,
-        &kernel_->parent_child_index);
+                                            &kernel_->parent_child_index);
     size_t num_erased = kernel_->ids_map.erase(entry->ref(ID).value());
     DCHECK_EQ(1U, num_erased);
     entry->put(ID, new_id);
     kernel_->ids_map[entry->ref(ID).value()] = entry;
   }
   return true;
 }
 
 bool Directory::ReindexParentId(BaseWriteTransaction* trans,
                                 EntryKernel* const entry,
                                 const Id& new_parent_id) {
   ScopedKernelLock lock(this);
 
   {
     // Update the indices that depend on the PARENT_ID field.
     ScopedParentChildIndexUpdater index_updater(lock, entry,
-        &kernel_->parent_child_index);
+                                                &kernel_->parent_child_index);
     entry->put(PARENT_ID, new_parent_id);
   }
   return true;
 }
 
 void Directory::RemoveFromAttachmentIndex(
     const ScopedKernelLock& lock,
     const int64_t metahandle,
     const sync_pb::AttachmentMetadata& attachment_metadata) {
   for (int i = 0; i < attachment_metadata.record_size(); ++i) {
@@ skipping 13 matching lines @@
 void Directory::AddToAttachmentIndex(
     const ScopedKernelLock& lock,
     const int64_t metahandle,
     const sync_pb::AttachmentMetadata& attachment_metadata) {
   for (int i = 0; i < attachment_metadata.record_size(); ++i) {
     AttachmentIdUniqueId unique_id =
         attachment_metadata.record(i).id().unique_id();
     IndexByAttachmentId::iterator iter =
         kernel_->index_by_attachment_id.find(unique_id);
     if (iter == kernel_->index_by_attachment_id.end()) {
-      iter = kernel_->index_by_attachment_id.insert(std::make_pair(
-                                                        unique_id,
-                                                        MetahandleSet())).first;
+      iter = kernel_->index_by_attachment_id
+                 .insert(std::make_pair(unique_id, MetahandleSet()))
+                 .first;
     }
     iter->second.insert(metahandle);
   }
 }
 
 void Directory::UpdateAttachmentIndex(
     const int64_t metahandle,
     const sync_pb::AttachmentMetadata& old_metadata,
     const sync_pb::AttachmentMetadata& new_metadata) {
   ScopedKernelLock lock(this);
   RemoveFromAttachmentIndex(lock, metahandle, old_metadata);
   AddToAttachmentIndex(lock, metahandle, new_metadata);
 }
 
 void Directory::GetMetahandlesByAttachmentId(
     BaseTransaction* trans,
     const sync_pb::AttachmentIdProto& attachment_id_proto,
     Metahandles* result) {
   DCHECK(result);
   result->clear();
   ScopedKernelLock lock(this);
   IndexByAttachmentId::const_iterator index_iter =
       kernel_->index_by_attachment_id.find(attachment_id_proto.unique_id());
   if (index_iter == kernel_->index_by_attachment_id.end())
     return;
   const MetahandleSet& metahandle_set = index_iter->second;
-  std::copy(
-      metahandle_set.begin(), metahandle_set.end(), back_inserter(*result));
+  std::copy(metahandle_set.begin(), metahandle_set.end(),
+            back_inserter(*result));
 }
 
 bool Directory::unrecoverable_error_set(const BaseTransaction* trans) const {
   DCHECK(trans != NULL);
   return unrecoverable_error_set_;
 }
 
 void Directory::ClearDirtyMetahandles(const ScopedKernelLock& lock) {
   kernel_->transaction_mutex.AssertAcquired();
   kernel_->dirty_metahandles.clear();
 }
 
 bool Directory::SafeToPurgeFromMemory(WriteTransaction* trans,
                                       const EntryKernel* const entry) const {
   bool safe = entry->ref(IS_DEL) && !entry->is_dirty() &&
-      !entry->ref(SYNCING) && !entry->ref(IS_UNAPPLIED_UPDATE) &&
-      !entry->ref(IS_UNSYNCED);
+              !entry->ref(SYNCING) && !entry->ref(IS_UNAPPLIED_UPDATE) &&
+              !entry->ref(IS_UNSYNCED);
 
   if (safe) {
     int64_t handle = entry->ref(META_HANDLE);
     const ModelType type = entry->GetServerModelType();
-    if (!SyncAssert(kernel_->dirty_metahandles.count(handle) == 0U,
-                    FROM_HERE,
+    if (!SyncAssert(kernel_->dirty_metahandles.count(handle) == 0U, FROM_HERE,
                     "Dirty metahandles should be empty", trans))
       return false;
     // TODO(tim): Bug 49278.
-    if (!SyncAssert(!kernel_->unsynced_metahandles.count(handle),
-                    FROM_HERE,
-                    "Unsynced handles should be empty",
-                    trans))
+    if (!SyncAssert(!kernel_->unsynced_metahandles.count(handle), FROM_HERE,
+                    "Unsynced handles should be empty", trans))
       return false;
     if (!SyncAssert(!kernel_->unapplied_update_metahandles[type].count(handle),
-                    FROM_HERE,
-                    "Unapplied metahandles should be empty",
-                    trans))
+                    FROM_HERE, "Unapplied metahandles should be empty", trans))
       return false;
   }
 
   return safe;
 }
 
 void Directory::TakeSnapshotForSaveChanges(SaveChangesSnapshot* snapshot) {
   ReadTransaction trans(FROM_HERE, this);
   ScopedKernelLock lock(this);
 
@@ skipping 23 matching lines @@
   // Set purged handles.
   DCHECK(snapshot->metahandles_to_purge.empty());
   snapshot->metahandles_to_purge.swap(kernel_->metahandles_to_purge);
 
   // Fill kernel_info_status and kernel_info.
   snapshot->kernel_info = kernel_->persisted_info;
   snapshot->kernel_info_status = kernel_->info_status;
   // This one we reset on failure.
   kernel_->info_status = KERNEL_SHARE_INFO_VALID;
 
-  delete_journal_->TakeSnapshotAndClear(
-      &trans, &snapshot->delete_journals, &snapshot->delete_journals_to_purge);
+  delete_journal_->TakeSnapshotAndClear(&trans, &snapshot->delete_journals,
+                                        &snapshot->delete_journals_to_purge);
 }
 
 bool Directory::SaveChanges() {
   bool success = false;
 
   base::AutoLock scoped_lock(kernel_->save_changes_mutex);
 
   // Snapshot and save.
   SaveChangesSnapshot snapshot;
   TakeSnapshotForSaveChanges(&snapshot);
@@ skipping 12 matching lines @@
     return true;
 
   // Need a write transaction as we are about to permanently purge entries.
   WriteTransaction trans(FROM_HERE, VACUUM_AFTER_SAVE, this);
   ScopedKernelLock lock(this);
   // Now drop everything we can out of memory.
   for (EntryKernelSet::const_iterator i = snapshot.dirty_metas.begin();
        i != snapshot.dirty_metas.end(); ++i) {
     MetahandlesMap::iterator found =
         kernel_->metahandles_map.find((*i)->ref(META_HANDLE));
-    EntryKernel* entry = (found == kernel_->metahandles_map.end() ?
-                          NULL : found->second);
+    EntryKernel* entry =
+        (found == kernel_->metahandles_map.end() ? NULL : found->second);
     if (entry && SafeToPurgeFromMemory(&trans, entry)) {
       // We now drop deleted metahandles that are up to date on both the client
       // and the server.
       size_t num_erased = 0;
       num_erased = kernel_->metahandles_map.erase(entry->ref(META_HANDLE));
       DCHECK_EQ(1u, num_erased);
       num_erased = kernel_->ids_map.erase(entry->ref(ID).value());
       DCHECK_EQ(1u, num_erased);
       if (!entry->ref(UNIQUE_SERVER_TAG).empty()) {
         num_erased =
             kernel_->server_tags_map.erase(entry->ref(UNIQUE_SERVER_TAG));
         DCHECK_EQ(1u, num_erased);
       }
       if (!entry->ref(UNIQUE_CLIENT_TAG).empty()) {
         num_erased =
             kernel_->client_tags_map.erase(entry->ref(UNIQUE_CLIENT_TAG));
         DCHECK_EQ(1u, num_erased);
       }
-      if (!SyncAssert(!kernel_->parent_child_index.Contains(entry),
-                      FROM_HERE,
-                      "Deleted entry still present",
-                      (&trans)))
+      if (!SyncAssert(!kernel_->parent_child_index.Contains(entry), FROM_HERE,
+                      "Deleted entry still present", (&trans)))
         return false;
-      RemoveFromAttachmentIndex(
-          lock, entry->ref(META_HANDLE), entry->ref(ATTACHMENT_METADATA));
+      RemoveFromAttachmentIndex(lock, entry->ref(META_HANDLE),
+                                entry->ref(ATTACHMENT_METADATA));
 
       delete entry;
     }
     if (trans.unrecoverable_error_set())
       return false;
   }
   return true;
 }
 
 void Directory::UnapplyEntry(EntryKernel* entry) {
   int64_t handle = entry->ref(META_HANDLE);
-  ModelType server_type = GetModelTypeFromSpecifics(
-      entry->ref(SERVER_SPECIFICS));
+  ModelType server_type =
+      GetModelTypeFromSpecifics(entry->ref(SERVER_SPECIFICS));
 
   // Clear enough so that on the next sync cycle all local data will
   // be overwritten.
   // Note: do not modify the root node in order to preserve the
   // initial sync ended bit for this type (else on the next restart
   // this type will be treated as disabled and therefore fully purged).
   if (entry->ref(PARENT_ID).IsRoot()) {
     ModelType root_type = server_type;
     // Support both server created and client created type root folders.
     if (!IsRealDataType(root_type)) {
@@ skipping 37 matching lines @@
   // deleted items, and purged on the next snapshot. All other items will match
   // the state they would have had if they were just created via a server
   // update. See MutableEntry::MutableEntry(.., CreateNewUpdateItem, ..).
 }
 
 void Directory::DeleteEntry(const ScopedKernelLock& lock,
                             bool save_to_journal,
                             EntryKernel* entry,
                             EntryKernelSet* entries_to_journal) {
   int64_t handle = entry->ref(META_HANDLE);
-  ModelType server_type = GetModelTypeFromSpecifics(
-      entry->ref(SERVER_SPECIFICS));
+  ModelType server_type =
+      GetModelTypeFromSpecifics(entry->ref(SERVER_SPECIFICS));
 
   kernel_->metahandles_to_purge.insert(handle);
 
   size_t num_erased = 0;
   num_erased = kernel_->metahandles_map.erase(entry->ref(META_HANDLE));
   DCHECK_EQ(1u, num_erased);
   num_erased = kernel_->ids_map.erase(entry->ref(ID).value());
   DCHECK_EQ(1u, num_erased);
   num_erased = kernel_->unsynced_metahandles.erase(handle);
   DCHECK_EQ(entry->ref(IS_UNSYNCED), num_erased > 0);
-  num_erased =
-      kernel_->unapplied_update_metahandles[server_type].erase(handle);
+  num_erased = kernel_->unapplied_update_metahandles[server_type].erase(handle);
   DCHECK_EQ(entry->ref(IS_UNAPPLIED_UPDATE), num_erased > 0);
   if (kernel_->parent_child_index.Contains(entry))
     kernel_->parent_child_index.Remove(entry);
 
   if (!entry->ref(UNIQUE_CLIENT_TAG).empty()) {
-    num_erased =
-        kernel_->client_tags_map.erase(entry->ref(UNIQUE_CLIENT_TAG));
+    num_erased = kernel_->client_tags_map.erase(entry->ref(UNIQUE_CLIENT_TAG));
     DCHECK_EQ(1u, num_erased);
   }
   if (!entry->ref(UNIQUE_SERVER_TAG).empty()) {
-    num_erased =
-        kernel_->server_tags_map.erase(entry->ref(UNIQUE_SERVER_TAG));
+    num_erased = kernel_->server_tags_map.erase(entry->ref(UNIQUE_SERVER_TAG));
     DCHECK_EQ(1u, num_erased);
   }
   RemoveFromAttachmentIndex(lock, handle, entry->ref(ATTACHMENT_METADATA));
 
   if (save_to_journal) {
     entries_to_journal->insert(entry);
   } else {
     delete entry;
   }
 }
@@ skipping 52 matching lines @@
                 (delete_journal_->IsDeleteJournalEnabled(local_type) ||
                  delete_journal_->IsDeleteJournalEnabled(server_type));
             DeleteEntry(lock, save_to_journal, entry, &entries_to_journal);
           }
         }
       }
 
       delete_journal_->AddJournalBatch(&trans, entries_to_journal);
 
       // Ensure meta tracking for these data types reflects the purged state.
-      for (ModelTypeSet::Iterator it = disabled_types.First();
-           it.Good(); it.Inc()) {
+      for (ModelTypeSet::Iterator it = disabled_types.First(); it.Good();
+           it.Inc()) {
         kernel_->persisted_info.transaction_version[it.Get()] = 0;
 
         // Don't discard progress markers or context for unapplied types.
         if (!types_to_unapply.Has(it.Get())) {
           kernel_->persisted_info.ResetDownloadProgress(it.Get());
           kernel_->persisted_info.datatype_context[it.Get()].Clear();
         }
       }
 
       kernel_->info_status = KERNEL_SHARE_INFO_DIRTY;
@@ skipping 76 matching lines @@
 }
 
 void Directory::GetDownloadProgress(
     ModelType model_type,
     sync_pb::DataTypeProgressMarker* value_out) const {
   ScopedKernelLock lock(this);
   return value_out->CopyFrom(
       kernel_->persisted_info.download_progress[model_type]);
 }
 
-void Directory::GetDownloadProgressAsString(
-    ModelType model_type,
-    std::string* value_out) const {
+void Directory::GetDownloadProgressAsString(ModelType model_type,
+                                            std::string* value_out) const {
   ScopedKernelLock lock(this);
   kernel_->persisted_info.download_progress[model_type].SerializeToString(
       value_out);
 }
 
 size_t Directory::GetEntriesCount() const {
   ScopedKernelLock lock(this);
   return kernel_->metahandles_map.size();
 }
 
@@ skipping 21 matching lines @@
   kernel_->info_status = KERNEL_SHARE_INFO_DIRTY;
 }
 
 void Directory::GetDataTypeContext(BaseTransaction* trans,
                                    ModelType type,
                                    sync_pb::DataTypeContext* context) const {
   ScopedKernelLock lock(this);
   context->CopyFrom(kernel_->persisted_info.datatype_context[type]);
 }
 
-void Directory::SetDataTypeContext(
-    BaseWriteTransaction* trans,
-    ModelType type,
-    const sync_pb::DataTypeContext& context) {
+void Directory::SetDataTypeContext(BaseWriteTransaction* trans,
+                                   ModelType type,
+                                   const sync_pb::DataTypeContext& context) {
   ScopedKernelLock lock(this);
   kernel_->persisted_info.datatype_context[type].CopyFrom(context);
   kernel_->info_status = KERNEL_SHARE_INFO_DIRTY;
 }
 
 // TODO(stanisc): crbug.com/438313: change these to not rely on the folders.
 ModelTypeSet Directory::InitialSyncEndedTypes() {
   syncable::ReadTransaction trans(FROM_HERE, this);
   ModelTypeSet protocol_types = ProtocolTypes();
   ModelTypeSet initial_sync_ended_types;
   for (ModelTypeSet::Iterator i = protocol_types.First(); i.Good(); i.Inc()) {
     if (InitialSyncEndedForType(&trans, i.Get())) {
       initial_sync_ended_types.Put(i.Get());
     }
   }
   return initial_sync_ended_types;
 }
 
 bool Directory::InitialSyncEndedForType(ModelType type) {
   syncable::ReadTransaction trans(FROM_HERE, this);
   return InitialSyncEndedForType(&trans, type);
 }
 
-bool Directory::InitialSyncEndedForType(
-    BaseTransaction* trans, ModelType type) {
+bool Directory::InitialSyncEndedForType(BaseTransaction* trans,
+                                        ModelType type) {
   // True iff the type's root node has been created and changes
   // for the type have been applied at least once.
   Entry root(trans, GET_TYPE_ROOT, type);
   return root.good() && root.GetBaseVersion() != CHANGES_VERSION;
 }
 
 void Directory::MarkInitialSyncEndedForType(BaseWriteTransaction* trans,
                                             ModelType type) {
   // If the root folder is downloaded for the server, the root's base version
   // get updated automatically at the end of update cycle when the update gets
@@ skipping 33 matching lines @@
 }
 
 void Directory::set_bag_of_chips(const string& bag_of_chips) {
   ScopedKernelLock lock(this);
   if (kernel_->persisted_info.bag_of_chips == bag_of_chips)
     return;
   kernel_->persisted_info.bag_of_chips = bag_of_chips;
   kernel_->info_status = KERNEL_SHARE_INFO_DIRTY;
 }
 
-
 string Directory::cache_guid() const {
   // No need to lock since nothing ever writes to it after load.
   return kernel_->cache_guid;
 }
 
 NigoriHandler* Directory::GetNigoriHandler() {
   return nigori_handler_;
 }
 
 Cryptographer* Directory::GetCryptographer(const BaseTransaction* trans) {
@@ skipping 141 matching lines @@
 
 bool Directory::FullyCheckTreeInvariants(syncable::BaseTransaction* trans) {
   MetahandleSet handles;
   GetAllMetaHandles(trans, &handles);
   return CheckTreeInvariants(trans, handles);
 }
 
 bool Directory::CheckTreeInvariants(syncable::BaseTransaction* trans,
                                     const MetahandleSet& handles) {
   MetahandleSet::const_iterator i;
-  for (i = handles.begin() ; i != handles.end() ; ++i) {
+  for (i = handles.begin(); i != handles.end(); ++i) {
     int64_t metahandle = *i;
     Entry e(trans, GET_BY_HANDLE, metahandle);
     if (!SyncAssert(e.good(), FROM_HERE, "Entry is bad", trans))
       return false;
     syncable::Id id = e.GetId();
     syncable::Id parentid = e.GetParentId();
 
     if (id.IsRoot()) {
-      if (!SyncAssert(e.GetIsDir(), FROM_HERE,
-                      "Entry should be a directory",
+      if (!SyncAssert(e.GetIsDir(), FROM_HERE, "Entry should be a directory",
                       trans))
         return false;
-      if (!SyncAssert(parentid.IsRoot(), FROM_HERE,
-                      "Entry should be root",
+      if (!SyncAssert(parentid.IsRoot(), FROM_HERE, "Entry should be root",
                       trans))
-         return false;
+        return false;
       if (!SyncAssert(!e.GetIsUnsynced(), FROM_HERE, "Entry should be synced",
                       trans))
-         return false;
+        return false;
       continue;
     }
 
     if (!e.GetIsDel()) {
       if (!SyncAssert(id != parentid, FROM_HERE,
-                      "Id should be different from parent id.",
-                      trans))
-         return false;
+                      "Id should be different from parent id.", trans))
+        return false;
       if (!SyncAssert(!e.GetNonUniqueName().empty(), FROM_HERE,
-                      "Non unique name should not be empty.",
-                      trans))
+                      "Non unique name should not be empty.", trans))
         return false;
 
       if (!parentid.IsNull()) {
         int safety_count = handles.size() + 1;
         while (!parentid.IsRoot()) {
           Entry parent(trans, GET_BY_ID, parentid);
           if (!SyncAssert(parent.good(), FROM_HERE,
                           "Parent entry is not valid.", trans))
             return false;
           if (handles.end() == handles.find(parent.GetMetahandle()))
@@ skipping 14 matching lines @@
             return false;
         }
       }
     }
     int64_t base_version = e.GetBaseVersion();
     int64_t server_version = e.GetServerVersion();
     bool using_unique_client_tag = !e.GetUniqueClientTag().empty();
     if (CHANGES_VERSION == base_version || 0 == base_version) {
       ModelType model_type = e.GetModelType();
       bool is_client_creatable_type_root_folder =
-          parentid.IsRoot() &&
-          IsTypeWithClientGeneratedRoot(model_type) &&
+          parentid.IsRoot() && IsTypeWithClientGeneratedRoot(model_type) &&
           e.GetUniqueServerTag() == ModelTypeToRootTag(model_type);
       if (e.GetIsUnappliedUpdate()) {
         // Must be a new item, or a de-duplicated unique client tag
         // that was created both locally and remotely, or a type root folder
         // that was created both locally and remotely.
         if (!(using_unique_client_tag ||
               is_client_creatable_type_root_folder)) {
           if (!SyncAssert(e.GetIsDel(), FROM_HERE,
                           "The entry should have been deleted.", trans))
             return false;
         }
         // It came from the server, so it must have a server ID.
         if (!SyncAssert(id.ServerKnows(), FROM_HERE,
-                        "The id should be from a server.",
-                        trans))
+                        "The id should be from a server.", trans))
           return false;
       } else {
         if (e.GetIsDir()) {
           // TODO(chron): Implement this mode if clients ever need it.
           // For now, you can't combine a client tag and a directory.
           if (!SyncAssert(!using_unique_client_tag, FROM_HERE,
-                          "Directory cannot have a client tag.",
-                          trans))
+                          "Directory cannot have a client tag.", trans))
             return false;
         }
         if (is_client_creatable_type_root_folder) {
           // This must be a locally created type root folder.
           if (!SyncAssert(
                   !e.GetIsUnsynced(), FROM_HERE,
                   "Locally created type root folders should not be unsynced.",
                   trans))
             return false;
 
           if (!SyncAssert(
                   !e.GetIsDel(), FROM_HERE,
                   "Locally created type root folders should not be deleted.",
                   trans))
             return false;
         } else {
           // Should be an uncomitted item, or a successfully deleted one.
           if (!e.GetIsDel()) {
             if (!SyncAssert(e.GetIsUnsynced(), FROM_HERE,
                             "The item should be unsynced.", trans))
               return false;
           }
         }
         // If the next check failed, it would imply that an item exists
         // on the server, isn't waiting for application locally, but either
         // is an unsynced create or a successful delete in the local copy.
         // Either way, that's a mismatch.
         if (!SyncAssert(0 == server_version, FROM_HERE,
-                        "Server version should be zero.",
-                        trans))
+                        "Server version should be zero.", trans))
           return false;
         // Items that aren't using the unique client tag should have a zero
         // base version only if they have a local ID.  Items with unique client
         // tags are allowed to use the zero base version for undeletion and
         // de-duplication; the unique client tag trumps the server ID.
         if (!using_unique_client_tag) {
           if (!SyncAssert(!id.ServerKnows(), FROM_HERE,
-                          "Should be a client only id.",
-                          trans))
+                          "Should be a client only id.", trans))
             return false;
         }
       }
     } else {
-      if (!SyncAssert(id.ServerKnows(),
-                      FROM_HERE,
-                      "Should be a server id.",
+      if (!SyncAssert(id.ServerKnows(), FROM_HERE, "Should be a server id.",
                       trans))
         return false;
     }
 
     // Previously we would assert that locally deleted items that have never
     // been synced must not be sent to the server (IS_UNSYNCED must be false).
     // This is not always true in the case that an item is deleted while the
     // initial commit is in flight. See crbug.com/426865.
   }
   return true;
@@ skipping 101 matching lines @@
     UniquePosition successor_pos = (*siblings->begin())->ref(UNIQUE_POSITION);
 
     UniquePosition pos;
     if (!successor_pos.IsValid()) {
       // If all our successors are of non-positionable types, just create an
       // initial position.  We arbitrarily choose to sort invalid positions to
       // the right of the valid positions.
       //
       // We really shouldn't need to support this.  See TODO above.
       pos = UniquePosition::InitialPosition(suffix);
-    } else  {
+    } else {
       DCHECK(!siblings->empty());
       pos = UniquePosition::Before(successor_pos, suffix);
     }
 
     e->put(UNIQUE_POSITION, pos);
     return;
   }
 
   // We can't support placing an item after an invalid position.  Fortunately,
   // the tests don't exercise this particular case.  We should not support
   // siblings with invalid positions at all.  See TODO above.
   DCHECK(predecessor->ref(UNIQUE_POSITION).IsValid());
 
   OrderedChildSet::const_iterator neighbour = siblings->find(predecessor);
   DCHECK(neighbour != siblings->end());
 
   ++neighbour;
   if (neighbour == siblings->end()) {
     // Inserting at the end of the list.
-    UniquePosition pos = UniquePosition::After(
-        predecessor->ref(UNIQUE_POSITION),
-        suffix);
+    UniquePosition pos =
+        UniquePosition::After(predecessor->ref(UNIQUE_POSITION), suffix);
     e->put(UNIQUE_POSITION, pos);
     return;
   }
 
   EntryKernel* successor = *neighbour;
 
   // Another mixed valid and invalid position case.  This one could be supported
   // in theory, but we're trying to deprecate support for siblings with and
   // without valid positions.  See TODO above.
   // Using a release CHECK here because the following UniquePosition::Between
   // call crashes anyway when the position string is empty (see crbug/332371).
   CHECK(successor->ref(UNIQUE_POSITION).IsValid()) << *successor;
 
   // Finally, the normal case: inserting between two elements.
-  UniquePosition pos = UniquePosition::Between(
-      predecessor->ref(UNIQUE_POSITION),
-      successor->ref(UNIQUE_POSITION),
-      suffix);
+  UniquePosition pos =
+      UniquePosition::Between(predecessor->ref(UNIQUE_POSITION),
+                              successor->ref(UNIQUE_POSITION), suffix);
   e->put(UNIQUE_POSITION, pos);
   return;
 }
 
 // TODO(rlarocque): Avoid this indirection.  Just return the set.
 void Directory::AppendChildHandles(const ScopedKernelLock& lock,
                                    const Id& parent_id,
                                    Directory::Metahandles* result) {
   const OrderedChildSet* children =
       kernel_->parent_child_index.GetChildren(parent_id);
@@ skipping 73 matching lines @@
 Directory::Kernel* Directory::kernel() {
   return kernel_;
 }
 
 const Directory::Kernel* Directory::kernel() const {
   return kernel_;
 }
 
 }  // namespace syncable
 }  // namespace syncer