| Index: components/sync/test/engine/test_syncable_utils.h
|
| diff --git a/sync/test/engine/test_syncable_utils.h b/components/sync/test/engine/test_syncable_utils.h
|
| similarity index 81%
|
| rename from sync/test/engine/test_syncable_utils.h
|
| rename to components/sync/test/engine/test_syncable_utils.h
|
| index 5975e1228ca5eb9293206ae5ab3f7ef407596eb5..497c48510acbd8586b9dc3bc9dc17a4679dc9648 100644
|
| --- a/sync/test/engine/test_syncable_utils.h
|
| +++ b/components/sync/test/engine/test_syncable_utils.h
|
| @@ -5,13 +5,13 @@
|
| // Utilities that are useful in verifying the state of items in a
|
| // syncable database.
|
|
|
| -#ifndef SYNC_TEST_ENGINE_TEST_SYNCABLE_UTILS_H_
|
| -#define SYNC_TEST_ENGINE_TEST_SYNCABLE_UTILS_H_
|
| +#ifndef COMPONENTS_SYNC_TEST_ENGINE_TEST_SYNCABLE_UTILS_H_
|
| +#define COMPONENTS_SYNC_TEST_ENGINE_TEST_SYNCABLE_UTILS_H_
|
|
|
| #include <string>
|
|
|
| -#include "sync/internal_api/public/base/model_type.h"
|
| -#include "sync/protocol/sync.pb.h"
|
| +#include "components/sync/base/model_type.h"
|
| +#include "components/sync/protocol/sync.pb.h"
|
|
|
| namespace syncer {
|
| namespace syncable {
|
| @@ -40,7 +40,7 @@ Id GetOnlyEntryWithName(BaseTransaction* rtrans,
|
| const std::string& name);
|
|
|
| void CreateTypeRoot(WriteTransaction* trans,
|
| - syncable::Directory *dir,
|
| + syncable::Directory* dir,
|
| ModelType type);
|
|
|
| sync_pb::DataTypeProgressMarker BuildProgress(ModelType type);
|
| @@ -48,4 +48,4 @@ sync_pb::DataTypeProgressMarker BuildProgress(ModelType type);
|
| } // namespace syncable
|
| } // namespace syncer
|
|
|
| -#endif // SYNC_TEST_ENGINE_TEST_SYNCABLE_UTILS_H_
|
| +#endif // COMPONENTS_SYNC_TEST_ENGINE_TEST_SYNCABLE_UTILS_H_
|
|
|