Index: components/sync/syncable/syncable_delete_journal.h |
diff --git a/sync/syncable/syncable_delete_journal.h b/components/sync/syncable/syncable_delete_journal.h |
similarity index 89% |
rename from sync/syncable/syncable_delete_journal.h |
rename to components/sync/syncable/syncable_delete_journal.h |
index c4271e5cfce52f9c2bdfa228eb4b09414ee0a941..10558089026786a14275703a93a7ddc29e1c7a05 100644 |
--- a/sync/syncable/syncable_delete_journal.h |
+++ b/components/sync/syncable/syncable_delete_journal.h |
@@ -2,8 +2,8 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef SYNC_SYNCABLE_SYNCABLE_DELETE_JOURNAL_H_ |
-#define SYNC_SYNCABLE_SYNCABLE_DELETE_JOURNAL_H_ |
+#ifndef COMPONENTS_SYNC_SYNCABLE_SYNCABLE_DELETE_JOURNAL_H_ |
+#define COMPONENTS_SYNC_SYNCABLE_SYNCABLE_DELETE_JOURNAL_H_ |
#include <stddef.h> |
@@ -12,9 +12,9 @@ |
#include "base/gtest_prod_util.h" |
#include "base/macros.h" |
#include "base/synchronization/lock.h" |
-#include "sync/base/sync_export.h" |
-#include "sync/syncable/metahandle_set.h" |
-#include "sync/syncable/syncable-inl.h" |
+#include "components/sync/base/sync_export.h" |
+#include "components/sync/syncable/metahandle_set.h" |
+#include "components/sync/syncable/syncable-inl.h" |
namespace syncer { |
namespace syncable { |
@@ -22,7 +22,7 @@ namespace syncable { |
class BaseTransaction; |
struct EntryKernel; |
-typedef std::set<const EntryKernel*, LessField<IdField, ID> > JournalIndex; |
+typedef std::set<const EntryKernel*, LessField<IdField, ID>> JournalIndex; |
// DeleteJournal manages deleted entries that are not in sync directory until |
// it's safe to drop them after the deletion is confirmed with native models. |
@@ -53,7 +53,8 @@ class SYNC_EXPORT DeleteJournal { |
// enable periodically saving/clearing of delete journals of |type| because |
// new journals added later are not needed until next model association. |
// Can be called on any thread. |
- void GetDeleteJournals(BaseTransaction* trans, ModelType type, |
+ void GetDeleteJournals(BaseTransaction* trans, |
+ ModelType type, |
EntryKernelSet* deleted_entries); |
// Purge entries of specified type in |delete_journals_| if their handles are |
@@ -104,4 +105,4 @@ class SYNC_EXPORT DeleteJournal { |
} // namespace syncable |
} // namespace syncer |
-#endif // SYNC_SYNCABLE_SYNCABLE_DELETE_JOURNAL_H_ |
+#endif // COMPONENTS_SYNC_SYNCABLE_SYNCABLE_DELETE_JOURNAL_H_ |