| Index: components/sync/model/sync_merge_result.h
|
| diff --git a/components/sync/api/sync_merge_result.h b/components/sync/model/sync_merge_result.h
|
| similarity index 92%
|
| rename from components/sync/api/sync_merge_result.h
|
| rename to components/sync/model/sync_merge_result.h
|
| index 46302176f097a967f7ac3c371e72f370d6019627..00f9a2e1da92c1d681b807d6e33f5a84eaa9b73b 100644
|
| --- a/components/sync/api/sync_merge_result.h
|
| +++ b/components/sync/model/sync_merge_result.h
|
| @@ -2,13 +2,13 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef COMPONENTS_SYNC_API_SYNC_MERGE_RESULT_H_
|
| -#define COMPONENTS_SYNC_API_SYNC_MERGE_RESULT_H_
|
| +#ifndef COMPONENTS_SYNC_MODEL_SYNC_MERGE_RESULT_H_
|
| +#define COMPONENTS_SYNC_MODEL_SYNC_MERGE_RESULT_H_
|
|
|
| #include <stdint.h>
|
|
|
| -#include "components/sync/api/sync_error.h"
|
| #include "components/sync/base/model_type.h"
|
| +#include "components/sync/model/sync_error.h"
|
|
|
| namespace syncer {
|
|
|
| @@ -77,4 +77,4 @@ class SyncMergeResult {
|
|
|
| } // namespace syncer
|
|
|
| -#endif // COMPONENTS_SYNC_API_SYNC_MERGE_RESULT_H_
|
| +#endif // COMPONENTS_SYNC_MODEL_SYNC_MERGE_RESULT_H_
|
|
|