Index: components/sync/engine_impl/syncer.h |
diff --git a/sync/engine/syncer.h b/components/sync/engine_impl/syncer.h |
similarity index 86% |
rename from sync/engine/syncer.h |
rename to components/sync/engine_impl/syncer.h |
index 926e0d61bed9c60020a7e9c5b391c8962b077ea2..71c7e4eb4a6a6260b116d803225400c9198e0532 100644 |
--- a/sync/engine/syncer.h |
+++ b/components/sync/engine_impl/syncer.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_SYNCER_H_ |
-#define SYNC_ENGINE_SYNCER_H_ |
+#ifndef COMPONENTS_SYNC_ENGINE_IMPL_SYNCER_H_ |
+#define COMPONENTS_SYNC_ENGINE_IMPL_SYNCER_H_ |
#include <stdint.h> |
@@ -14,12 +14,12 @@ |
#include "base/gtest_prod_util.h" |
#include "base/macros.h" |
#include "base/synchronization/lock.h" |
-#include "sync/base/sync_export.h" |
-#include "sync/engine/conflict_resolver.h" |
-#include "sync/engine/syncer_types.h" |
-#include "sync/internal_api/public/base/model_type.h" |
-#include "sync/sessions/sync_session.h" |
-#include "sync/util/extensions_activity.h" |
+#include "components/sync/base/extensions_activity.h" |
+#include "components/sync/base/model_type.h" |
+#include "components/sync/base/sync_export.h" |
+#include "components/sync/engine_impl/conflict_resolver.h" |
+#include "components/sync/engine_impl/syncer_types.h" |
+#include "components/sync/sessions_impl/sync_session.h" |
namespace syncer { |
@@ -108,11 +108,10 @@ class SYNC_EXPORT Syncer { |
FRIEND_TEST_ALL_PREFIXES(EntryCreatedInNewFolderTest, |
EntryCreatedInNewFolderMidSync); |
- bool DownloadAndApplyUpdates( |
- ModelTypeSet* request_types, |
- sessions::SyncSession* session, |
- GetUpdatesProcessor* get_updates_processor, |
- bool create_mobile_bookmarks_folder); |
+ bool DownloadAndApplyUpdates(ModelTypeSet* request_types, |
+ sessions::SyncSession* session, |
+ GetUpdatesProcessor* get_updates_processor, |
+ bool create_mobile_bookmarks_folder); |
// This function will commit batches of unsynced items to the server until the |
// number of unsynced and ready to commit items reaches zero or an error is |
@@ -124,9 +123,8 @@ class SYNC_EXPORT Syncer { |
CommitProcessor* commit_processor); |
void HandleCycleBegin(sessions::SyncSession* session); |
- bool HandleCycleEnd( |
- sessions::SyncSession* session, |
- sync_pb::GetUpdatesCallerInfo::GetUpdatesSource source); |
+ bool HandleCycleEnd(sessions::SyncSession* session, |
+ sync_pb::GetUpdatesCallerInfo::GetUpdatesSource source); |
syncer::CancelationSignal* const cancelation_signal_; |
@@ -138,4 +136,4 @@ class SYNC_EXPORT Syncer { |
} // namespace syncer |
-#endif // SYNC_ENGINE_SYNCER_H_ |
+#endif // COMPONENTS_SYNC_ENGINE_IMPL_SYNCER_H_ |