Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(567)

Unified Diff: sync/engine/download_updates_command.cc

Issue 10735041: Remove syncproto.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address most comments Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sync/engine/commit.cc ('k') | sync/engine/net/server_connection_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/engine/download_updates_command.cc
diff --git a/sync/engine/download_updates_command.cc b/sync/engine/download_updates_command.cc
index 48e4acfebefde24711dfb5bad924dc10b7e6d80f..22839f60d0ba3798e8e7bf695d0b71e15c4b6440 100644
--- a/sync/engine/download_updates_command.cc
+++ b/sync/engine/download_updates_command.cc
@@ -9,7 +9,6 @@
#include "base/command_line.h"
#include "sync/engine/syncer.h"
#include "sync/engine/syncer_proto_util.h"
-#include "sync/engine/syncproto.h"
#include "sync/internal_api/public/base/model_type_payload_map.h"
#include "sync/syncable/directory.h"
@@ -27,13 +26,13 @@ DownloadUpdatesCommand::DownloadUpdatesCommand(
DownloadUpdatesCommand::~DownloadUpdatesCommand() {}
SyncerError DownloadUpdatesCommand::ExecuteImpl(SyncSession* session) {
- ClientToServerMessage client_to_server_message;
- ClientToServerResponse update_response;
+ sync_pb::ClientToServerMessage client_to_server_message;
+ sync_pb::ClientToServerResponse update_response;
client_to_server_message.set_share(session->context()->account_name());
client_to_server_message.set_message_contents(
- ClientToServerMessage::GET_UPDATES);
- GetUpdatesMessage* get_updates =
+ sync_pb::ClientToServerMessage::GET_UPDATES);
+ sync_pb::GetUpdatesMessage* get_updates =
client_to_server_message.mutable_get_updates();
get_updates->set_create_mobile_bookmarks_folder(
create_mobile_bookmarks_folder_);
@@ -74,6 +73,7 @@ SyncerError DownloadUpdatesCommand::ExecuteImpl(SyncSession* session) {
get_updates->mutable_caller_info()->set_notifications_enabled(
session->context()->notifications_enabled());
+ SyncerProtoUtil::SetProtocolVersion(&client_to_server_message);
SyncerProtoUtil::AddRequestBirthday(dir, &client_to_server_message);
DebugInfo* debug_info = client_to_server_message.mutable_debug_info();
« no previous file with comments | « sync/engine/commit.cc ('k') | sync/engine/net/server_connection_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698