| Index: components/sync/api/sync_merge_result.h
|
| diff --git a/sync/api/sync_merge_result.h b/components/sync/api/sync_merge_result.h
|
| similarity index 89%
|
| rename from sync/api/sync_merge_result.h
|
| rename to components/sync/api/sync_merge_result.h
|
| index bcc2e5ba7fbe7b3dc873332b02634135c22aefbb..8a0e2db13e21b4f496ccc24377b6c1fe9243e9dc 100644
|
| --- a/sync/api/sync_merge_result.h
|
| +++ b/components/sync/api/sync_merge_result.h
|
| @@ -2,14 +2,14 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef SYNC_API_SYNC_MERGE_RESULT_H_
|
| -#define SYNC_API_SYNC_MERGE_RESULT_H_
|
| +#ifndef COMPONENTS_SYNC_API_SYNC_MERGE_RESULT_H_
|
| +#define COMPONENTS_SYNC_API_SYNC_MERGE_RESULT_H_
|
|
|
| #include <stdint.h>
|
|
|
| -#include "sync/api/sync_error.h"
|
| -#include "sync/base/sync_export.h"
|
| -#include "sync/internal_api/public/base/model_type.h"
|
| +#include "components/sync/api/sync_error.h"
|
| +#include "components/sync/base/model_type.h"
|
| +#include "components/sync/base/sync_export.h"
|
|
|
| namespace syncer {
|
|
|
| @@ -78,4 +78,4 @@ class SYNC_EXPORT SyncMergeResult {
|
|
|
| } // namespace syncer
|
|
|
| -#endif // SYNC_API_SYNC_MERGE_RESULT_H_
|
| +#endif // COMPONENTS_SYNC_API_SYNC_MERGE_RESULT_H_
|
|
|