Index: components/sync/syncable/model_neutral_mutable_entry.h |
diff --git a/sync/syncable/model_neutral_mutable_entry.h b/components/sync/syncable/model_neutral_mutable_entry.h |
similarity index 86% |
rename from sync/syncable/model_neutral_mutable_entry.h |
rename to components/sync/syncable/model_neutral_mutable_entry.h |
index 76aa32a1cc0ddc8e9eb507cddff4ff60d6140d69..005dfeabaed41b5f9b4283ca4386775ea264fdb4 100644 |
--- a/sync/syncable/model_neutral_mutable_entry.h |
+++ b/components/sync/syncable/model_neutral_mutable_entry.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_MODEL_NEUTRAL_MUTABLE_ENTRY_H_ |
-#define SYNC_SYNCABLE_MODEL_NEUTRAL_MUTABLE_ENTRY_H_ |
+#ifndef COMPONENTS_SYNC_SYNCABLE_MODEL_NEUTRAL_MUTABLE_ENTRY_H_ |
+#define COMPONENTS_SYNC_SYNCABLE_MODEL_NEUTRAL_MUTABLE_ENTRY_H_ |
#include <stddef.h> |
#include <stdint.h> |
@@ -11,9 +11,9 @@ |
#include <string> |
#include "base/macros.h" |
-#include "sync/base/sync_export.h" |
-#include "sync/internal_api/public/base/model_type.h" |
-#include "sync/syncable/entry.h" |
+#include "components/sync/base/model_type.h" |
+#include "components/sync/base/sync_export.h" |
+#include "components/sync/syncable/entry.h" |
namespace syncer { |
class WriteNode; |
@@ -22,9 +22,7 @@ namespace syncable { |
class BaseWriteTransaction; |
-enum CreateNewUpdateItem { |
- CREATE_NEW_UPDATE_ITEM |
-}; |
+enum CreateNewUpdateItem { CREATE_NEW_UPDATE_ITEM }; |
enum CreateNewTypeRoot { CREATE_NEW_TYPE_ROOT }; |
@@ -43,14 +41,12 @@ class SYNC_EXPORT ModelNeutralMutableEntry : public Entry { |
ModelType type); |
ModelNeutralMutableEntry(BaseWriteTransaction* trans, GetByHandle, int64_t); |
ModelNeutralMutableEntry(BaseWriteTransaction* trans, GetById, const Id&); |
- ModelNeutralMutableEntry( |
- BaseWriteTransaction* trans, |
- GetByClientTag, |
- const std::string& tag); |
- ModelNeutralMutableEntry( |
- BaseWriteTransaction* trans, |
- GetTypeRoot, |
- ModelType type); |
+ ModelNeutralMutableEntry(BaseWriteTransaction* trans, |
+ GetByClientTag, |
+ const std::string& tag); |
+ ModelNeutralMutableEntry(BaseWriteTransaction* trans, |
+ GetTypeRoot, |
+ ModelType type); |
inline BaseWriteTransaction* base_write_transaction() const { |
return base_write_transaction_; |
@@ -126,4 +122,4 @@ class SYNC_EXPORT ModelNeutralMutableEntry : public Entry { |
} // namespace syncable |
} // namespace syncer |
-#endif // SYNC_SYNCABLE_MODEL_NEUTRAL_MUTABLE_ENTRY_H_ |
+#endif // COMPONENTS_SYNC_SYNCABLE_MODEL_NEUTRAL_MUTABLE_ENTRY_H_ |