Index: components/sync/syncable/entry_kernel.h |
diff --git a/sync/syncable/entry_kernel.h b/components/sync/syncable/entry_kernel.h |
similarity index 93% |
rename from sync/syncable/entry_kernel.h |
rename to components/sync/syncable/entry_kernel.h |
index 064cdd46b6d1e79b0b53538c6310a4a6c1ecba89..4895b2829ae6b784c2abb70f37e0c5909ce3e748 100644 |
--- a/sync/syncable/entry_kernel.h |
+++ b/components/sync/syncable/entry_kernel.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_ENTRY_KERNEL_H_ |
-#define SYNC_SYNCABLE_ENTRY_KERNEL_H_ |
+#ifndef COMPONENTS_SYNC_SYNCABLE_ENTRY_KERNEL_H_ |
+#define COMPONENTS_SYNC_SYNCABLE_ENTRY_KERNEL_H_ |
#include <stdint.h> |
@@ -14,16 +14,16 @@ |
#include "base/time/time.h" |
#include "base/values.h" |
-#include "sync/base/sync_export.h" |
-#include "sync/internal_api/public/base/model_type.h" |
-#include "sync/internal_api/public/base/unique_position.h" |
-#include "sync/internal_api/public/util/immutable.h" |
-#include "sync/internal_api/public/util/proto_value_ptr.h" |
-#include "sync/protocol/attachments.pb.h" |
-#include "sync/protocol/sync.pb.h" |
-#include "sync/syncable/metahandle_set.h" |
-#include "sync/syncable/syncable_id.h" |
-#include "sync/util/time.h" |
+#include "components/sync/base/immutable.h" |
+#include "components/sync/base/model_type.h" |
+#include "components/sync/base/proto_value_ptr.h" |
+#include "components/sync/base/sync_export.h" |
+#include "components/sync/base/time.h" |
+#include "components/sync/base/unique_position.h" |
+#include "components/sync/protocol/attachments.pb.h" |
+#include "components/sync/protocol/sync.pb.h" |
+#include "components/sync/syncable/metahandle_set.h" |
+#include "components/sync/syncable/syncable_id.h" |
namespace syncer { |
@@ -44,10 +44,7 @@ namespace syncable { |
static const int64_t kInvalidMetaHandle = 0; |
-enum { |
- BEGIN_FIELDS = 0, |
- INT64_FIELDS_BEGIN = BEGIN_FIELDS |
-}; |
+enum { BEGIN_FIELDS = 0, INT64_FIELDS_BEGIN = BEGIN_FIELDS }; |
enum MetahandleField { |
// Primary key into the table. Keep this as a handle to the meta entry |
@@ -194,9 +191,7 @@ enum BitTemp { |
BIT_TEMPS_END, |
}; |
-enum { |
- BIT_TEMPS_COUNT = BIT_TEMPS_END - BIT_TEMPS_BEGIN |
-}; |
+enum { BIT_TEMPS_COUNT = BIT_TEMPS_END - BIT_TEMPS_BEGIN }; |
struct SYNC_EXPORT EntryKernel { |
private: |
@@ -244,9 +239,7 @@ struct SYNC_EXPORT EntryKernel { |
dirty_ = false; |
} |
- inline bool is_dirty() const { |
- return dirty_; |
- } |
+ inline bool is_dirty() const { return dirty_; } |
// Setters. |
inline void put(MetahandleField field, int64_t value) { |
@@ -392,8 +385,7 @@ struct SYNC_EXPORT EntryKernel { |
class EntryKernelLessByMetaHandle { |
public: |
- inline bool operator()(const EntryKernel* a, |
- const EntryKernel* b) const { |
+ inline bool operator()(const EntryKernel* a, const EntryKernel* b) const { |
return a->ref(META_HANDLE) < b->ref(META_HANDLE); |
} |
}; |
@@ -422,4 +414,4 @@ std::ostream& operator<<(std::ostream& os, const EntryKernel& entry_kernel); |
} // namespace syncable |
} // namespace syncer |
-#endif // SYNC_SYNCABLE_ENTRY_KERNEL_H_ |
+#endif // COMPONENTS_SYNC_SYNCABLE_ENTRY_KERNEL_H_ |