| Index: sync/engine/download.h
|
| diff --git a/sync/engine/download.h b/sync/engine/download.h
|
| index e3230d82112550d8337965f4c2c02475c03fc250..22a3a4204a94203ee53a864125f1295f28665eac 100644
|
| --- a/sync/engine/download.h
|
| +++ b/sync/engine/download.h
|
| @@ -6,7 +6,7 @@
|
| #define SYNC_ENGINE_DOWNLOAD_H_
|
|
|
| #include "sync/base/sync_export.h"
|
| -#include "sync/engine/sync_directory_update_handler.h"
|
| +#include "sync/engine/get_updates_processor.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"
|
| @@ -31,6 +31,7 @@ namespace download {
|
| // keep types in sync when in normal mode.
|
| SYNC_EXPORT_PRIVATE void BuildNormalDownloadUpdates(
|
| sessions::SyncSession* session,
|
| + GetUpdatesProcessor* get_updates_processor,
|
| bool create_mobile_bookmarks_folder,
|
| ModelTypeSet request_types,
|
| const sessions::NudgeTracker& nudge_tracker,
|
| @@ -39,7 +40,7 @@ SYNC_EXPORT_PRIVATE void BuildNormalDownloadUpdates(
|
| // Helper function. Defined here for testing.
|
| SYNC_EXPORT_PRIVATE void BuildNormalDownloadUpdatesImpl(
|
| ModelTypeSet proto_request_types,
|
| - UpdateHandlerMap* update_handler_map,
|
| + GetUpdatesProcessor* get_updates_processor,
|
| const sessions::NudgeTracker& nudge_tracker,
|
| sync_pb::GetUpdatesMessage* get_updates);
|
|
|
| @@ -48,6 +49,7 @@ SYNC_EXPORT_PRIVATE void BuildNormalDownloadUpdatesImpl(
|
| // initialize a type for the first time.
|
| SYNC_EXPORT_PRIVATE void BuildDownloadUpdatesForConfigure(
|
| sessions::SyncSession* session,
|
| + GetUpdatesProcessor* get_updates_processor,
|
| bool create_mobile_bookmarks_folder,
|
| sync_pb::GetUpdatesCallerInfo::GetUpdatesSource source,
|
| ModelTypeSet request_types,
|
| @@ -56,7 +58,7 @@ SYNC_EXPORT_PRIVATE void BuildDownloadUpdatesForConfigure(
|
| // Helper function. Defined here for testing.
|
| SYNC_EXPORT_PRIVATE void BuildDownloadUpdatesForConfigureImpl(
|
| ModelTypeSet proto_request_types,
|
| - UpdateHandlerMap* update_handler_map,
|
| + GetUpdatesProcessor* get_updates_processor,
|
| sync_pb::GetUpdatesCallerInfo::GetUpdatesSource source,
|
| sync_pb::GetUpdatesMessage* get_updates);
|
|
|
| @@ -65,6 +67,7 @@ SYNC_EXPORT_PRIVATE void BuildDownloadUpdatesForConfigureImpl(
|
| // periodic polling.
|
| SYNC_EXPORT_PRIVATE void BuildDownloadUpdatesForPoll(
|
| sessions::SyncSession* session,
|
| + GetUpdatesProcessor* get_updates_processor,
|
| bool create_mobile_bookmarks_folder,
|
| ModelTypeSet request_types,
|
| sync_pb::ClientToServerMessage* client_to_server_message);
|
| @@ -72,13 +75,14 @@ SYNC_EXPORT_PRIVATE void BuildDownloadUpdatesForPoll(
|
| // Helper function. Defined here for testing.
|
| SYNC_EXPORT_PRIVATE void BuildDownloadUpdatesForPollImpl(
|
| ModelTypeSet proto_request_types,
|
| - UpdateHandlerMap* update_handler_map,
|
| + GetUpdatesProcessor* get_updates_processor,
|
| sync_pb::GetUpdatesMessage* get_updates);
|
|
|
| // Same as BuildDownloadUpdatesForPoll() except the update origin/source is
|
| // RETRY.
|
| SYNC_EXPORT_PRIVATE void BuildDownloadUpdatesForRetry(
|
| sessions::SyncSession* session,
|
| + GetUpdatesProcessor* get_updates_processor,
|
| bool create_mobile_bookmarks_folder,
|
| ModelTypeSet request_types,
|
| sync_pb::ClientToServerMessage* client_to_server_message);
|
| @@ -87,7 +91,7 @@ SYNC_EXPORT_PRIVATE void BuildDownloadUpdatesForRetry(
|
| // RETRY.
|
| SYNC_EXPORT_PRIVATE void BuildDownloadUpdatesForRetryImpl(
|
| ModelTypeSet proto_request_types,
|
| - UpdateHandlerMap* update_handler_map,
|
| + GetUpdatesProcessor* get_updates_processor,
|
| sync_pb::GetUpdatesMessage* get_updates);
|
|
|
| // Sends the specified message to the server and stores the response in a member
|
| @@ -95,6 +99,7 @@ SYNC_EXPORT_PRIVATE void BuildDownloadUpdatesForRetryImpl(
|
| SYNC_EXPORT_PRIVATE SyncerError
|
| ExecuteDownloadUpdates(ModelTypeSet request_types,
|
| sessions::SyncSession* session,
|
| + GetUpdatesProcessor* get_updates_processor,
|
| sync_pb::ClientToServerMessage* msg);
|
|
|
| // Helper function for processing responses from the server.
|
| @@ -102,7 +107,7 @@ SYNC_EXPORT_PRIVATE SyncerError
|
| SYNC_EXPORT_PRIVATE SyncerError ProcessResponse(
|
| const sync_pb::GetUpdatesResponse& gu_response,
|
| ModelTypeSet proto_request_types,
|
| - UpdateHandlerMap* handler_map,
|
| + GetUpdatesProcessor* get_updates_processor,
|
| sessions::StatusController* status);
|
|
|
| // Helper function to copy client debug info from debug_info_getter to
|
|
|