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

components/sync/syncable/syncable_delete_journal.cc

Index: components/sync/syncable/syncable_delete_journal.cc
diff --git a/sync/syncable/syncable_delete_journal.cc b/components/sync/syncable/syncable_delete_journal.cc
similarity index 89%
rename from sync/syncable/syncable_delete_journal.cc
rename to components/sync/syncable/syncable_delete_journal.cc
index 923b065d333e07f3be082a9ad2d4a8fe52dd1f21..a66da469667e6e004e1a1ef2508f3b1f1b2722ce 100644
--- a/sync/syncable/syncable_delete_journal.cc
+++ b/components/sync/syncable/syncable_delete_journal.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sync/syncable/syncable_delete_journal.h"
+#include "components/sync/syncable/syncable_delete_journal.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/stl_util.h"
-#include "sync/internal_api/public/base/model_type.h"
+#include "components/sync/base/model_type.h"
 
 namespace syncer {
 namespace syncable {
@@ -28,14 +28,16 @@ size_t DeleteJournal::GetDeleteJournalSize(BaseTransaction* trans) const {
 }
 
 void DeleteJournal::UpdateDeleteJournalForServerDelete(
-    BaseTransaction* trans, bool was_deleted, const EntryKernel& entry) {
+    BaseTransaction* trans,
+    bool was_deleted,
+    const EntryKernel& entry) {
   DCHECK(trans);
 
   // Should be sufficient to check server type only but check for local
   // type too because of incomplete test setup.
   if (!(IsDeleteJournalEnabled(entry.GetServerModelType()) ||
-      IsDeleteJournalEnabled(
-          GetModelTypeFromSpecifics(entry.ref(SPECIFICS))))) {
+        IsDeleteJournalEnabled(
+            GetModelTypeFromSpecifics(entry.ref(SPECIFICS))))) {
     return;
   }
 
@@ -72,7 +74,7 @@ void DeleteJournal::GetDeleteJournals(BaseTransaction* trans,
                                       EntryKernelSet* deleted_entries) {
   DCHECK(trans);
   for (JournalIndex::const_iterator it = delete_journals_.begin();
-      it != delete_journals_.end(); ++it) {
+       it != delete_journals_.end(); ++it) {
     if ((*it)->GetServerModelType() == type ||
         GetModelTypeFromSpecifics((*it)->ref(SPECIFICS)) == type) {
       deleted_entries->insert(*it);
@@ -106,8 +108,8 @@ void DeleteJournal::TakeSnapshotAndClear(BaseTransaction* trans,
   JournalIndex::iterator it = delete_journals_.begin();
   while (it != delete_journals_.end()) {
     if (passive_delete_journal_types_.Has((*it)->GetServerModelType()) ||
-        passive_delete_journal_types_.Has(GetModelTypeFromSpecifics(
-            (*it)->ref(SPECIFICS)))) {
+        passive_delete_journal_types_.Has(
+            GetModelTypeFromSpecifics((*it)->ref(SPECIFICS)))) {
       journal_entries->insert(*it);
       delete_journals_.erase(it++);
     } else {
@@ -122,8 +124,8 @@ void DeleteJournal::AddJournalBatch(BaseTransaction* trans,
                                     const EntryKernelSet& entries) {
   DCHECK(trans);
   EntryKernel needle;
-  for (EntryKernelSet::const_iterator i = entries.begin();
-       i != entries.end(); ++i) {
+  for (EntryKernelSet::const_iterator i = entries.begin(); i != entries.end();
+       ++i) {
     needle.put(ID, (*i)->ref(ID));
     if (delete_journals_.find(&needle) == delete_journals_.end()) {
       delete_journals_.insert(new EntryKernel(**i));