| Index: components/sync/engine_impl/directory_commit_contribution.h
|
| diff --git a/sync/engine/directory_commit_contribution.h b/components/sync/engine_impl/directory_commit_contribution.h
|
| similarity index 85%
|
| rename from sync/engine/directory_commit_contribution.h
|
| rename to components/sync/engine_impl/directory_commit_contribution.h
|
| index a7b18dccd694745afe4c6985e50f9ca9dd6ce8d3..84a31425f49663ba289a7954714fc4f986b36d48 100644
|
| --- a/sync/engine/directory_commit_contribution.h
|
| +++ b/components/sync/engine_impl/directory_commit_contribution.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_ENGINE_DIRECTORY_COMMIT_CONTRIBUTION_H_
|
| -#define SYNC_ENGINE_DIRECTORY_COMMIT_CONTRIBUTION_H_
|
| +#ifndef COMPONENTS_SYNC_ENGINE_IMPL_DIRECTORY_COMMIT_CONTRIBUTION_H_
|
| +#define COMPONENTS_SYNC_ENGINE_IMPL_DIRECTORY_COMMIT_CONTRIBUTION_H_
|
|
|
| #include <stddef.h>
|
| #include <stdint.h>
|
| @@ -13,13 +13,13 @@
|
|
|
| #include "base/gtest_prod_util.h"
|
| #include "base/macros.h"
|
| -#include "sync/base/sync_export.h"
|
| -#include "sync/engine/commit_contribution.h"
|
| -#include "sync/internal_api/public/base/model_type.h"
|
| -#include "sync/internal_api/public/util/syncer_error.h"
|
| -#include "sync/protocol/sync.pb.h"
|
| -#include "sync/sessions/directory_type_debug_info_emitter.h"
|
| -#include "sync/sessions/status_controller.h"
|
| +#include "components/sync/base/model_type.h"
|
| +#include "components/sync/base/sync_export.h"
|
| +#include "components/sync/base/syncer_error.h"
|
| +#include "components/sync/engine_impl/commit_contribution.h"
|
| +#include "components/sync/protocol/sync.pb.h"
|
| +#include "components/sync/sessions_impl/directory_type_debug_info_emitter.h"
|
| +#include "components/sync/sessions_impl/status_controller.h"
|
|
|
| namespace syncer {
|
|
|
| @@ -81,8 +81,7 @@ class SYNC_EXPORT DirectoryCommitContribution : public CommitContribution {
|
| private:
|
| class DirectoryCommitContributionTest;
|
| FRIEND_TEST_ALL_PREFIXES(DirectoryCommitContributionTest, GatherByTypes);
|
| - FRIEND_TEST_ALL_PREFIXES(DirectoryCommitContributionTest,
|
| - GatherAndTruncate);
|
| + FRIEND_TEST_ALL_PREFIXES(DirectoryCommitContributionTest, GatherAndTruncate);
|
|
|
| DirectoryCommitContribution(
|
| const std::vector<int64_t>& metahandles,
|
| @@ -113,4 +112,4 @@ class SYNC_EXPORT DirectoryCommitContribution : public CommitContribution {
|
|
|
| } // namespace syncer
|
|
|
| -#endif // SYNC_ENGINE_DIRECTORY_COMMIT_CONTRIBUTION_H_
|
| +#endif // COMPONENTS_SYNC_ENGINE_IMPL_DIRECTORY_COMMIT_CONTRIBUTION_H_
|
|
|