| Index: components/sync/engine_impl/get_updates_processor.h
|
| diff --git a/sync/engine/get_updates_processor.h b/components/sync/engine_impl/get_updates_processor.h
|
| similarity index 78%
|
| rename from sync/engine/get_updates_processor.h
|
| rename to components/sync/engine_impl/get_updates_processor.h
|
| index 519a13a738d6b18cf38f7a00a2b6be4b3912e8e9..3695fc586859b14d3f6deca8aada23825f12ef1d 100644
|
| --- a/sync/engine/get_updates_processor.h
|
| +++ b/components/sync/engine_impl/get_updates_processor.h
|
| @@ -2,19 +2,19 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef SYNC_ENGINE_GET_UPDATES_PROCESSOR_H_
|
| -#define SYNC_ENGINE_GET_UPDATES_PROCESSOR_H_
|
| +#ifndef COMPONENTS_SYNC_ENGINE_IMPL_GET_UPDATES_PROCESSOR_H_
|
| +#define COMPONENTS_SYNC_ENGINE_IMPL_GET_UPDATES_PROCESSOR_H_
|
|
|
| #include <map>
|
| #include <vector>
|
|
|
| #include "base/gtest_prod_util.h"
|
| #include "base/macros.h"
|
| -#include "sync/base/sync_export.h"
|
| -#include "sync/internal_api/public/base/model_type.h"
|
| -#include "sync/internal_api/public/engine/model_safe_worker.h"
|
| -#include "sync/protocol/sync.pb.h"
|
| -#include "sync/sessions/model_type_registry.h"
|
| +#include "components/sync/base/model_type.h"
|
| +#include "components/sync/base/sync_export.h"
|
| +#include "components/sync/engine/model_safe_worker.h"
|
| +#include "components/sync/protocol/sync.pb.h"
|
| +#include "components/sync/sessions_impl/model_type_registry.h"
|
|
|
| namespace sync_pb {
|
| class GetUpdatesMessage;
|
| @@ -53,21 +53,18 @@ class SYNC_EXPORT GetUpdatesProcessor {
|
| // Returns SYNCER_OK if the download succeeds, SERVER_MORE_TO_DOWNLOAD if the
|
| // download succeeded but there are still some updates left to fetch on the
|
| // server, or an appropriate error value in case of failure.
|
| - SyncerError DownloadUpdates(
|
| - ModelTypeSet* request_types,
|
| - sessions::SyncSession* session,
|
| - bool create_mobile_bookmarks_folder);
|
| + SyncerError DownloadUpdates(ModelTypeSet* request_types,
|
| + sessions::SyncSession* session,
|
| + bool create_mobile_bookmarks_folder);
|
|
|
| // Applies any downloaded and processed updates.
|
| - void ApplyUpdates(
|
| - ModelTypeSet gu_types,
|
| - sessions::StatusController* status_controller);
|
| + void ApplyUpdates(ModelTypeSet gu_types,
|
| + sessions::StatusController* status_controller);
|
|
|
| private:
|
| // Populates a GetUpdates request message with per-type information.
|
| - void PrepareGetUpdates(
|
| - ModelTypeSet gu_types,
|
| - sync_pb::ClientToServerMessage* message);
|
| + void PrepareGetUpdates(ModelTypeSet gu_types,
|
| + sync_pb::ClientToServerMessage* message);
|
|
|
| // Sends the specified message to the server and stores the response in a
|
| // member of the |session|'s StatusController.
|
| @@ -87,9 +84,8 @@ class SYNC_EXPORT GetUpdatesProcessor {
|
| const sync_pb::GetUpdatesResponse& gu_response,
|
| sessions::StatusController* status_controller);
|
|
|
| - static void CopyClientDebugInfo(
|
| - sessions::DebugInfoGetter* debug_info_getter,
|
| - sync_pb::DebugInfo* debug_info);
|
| + static void CopyClientDebugInfo(sessions::DebugInfoGetter* debug_info_getter,
|
| + sync_pb::DebugInfo* debug_info);
|
|
|
| FRIEND_TEST_ALL_PREFIXES(GetUpdatesProcessorTest, BookmarkNudge);
|
| FRIEND_TEST_ALL_PREFIXES(GetUpdatesProcessorTest, NotifyMany);
|
| @@ -117,4 +113,4 @@ class SYNC_EXPORT GetUpdatesProcessor {
|
|
|
| } // namespace syncer
|
|
|
| -#endif // SYNC_ENGINE_GET_UPDATES_PROCESSOR_H_
|
| +#endif // COMPONENTS_SYNC_ENGINE_IMPL_GET_UPDATES_PROCESSOR_H_
|
|
|