Remove syncproto.h

sync/engine/download_updates_command.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sync/engine/download_updates_command.h"
 
 #include <string>
 
 #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"
 
 using sync_pb::DebugInfo;
 
 namespace syncer {
 using sessions::StatusController;
 using sessions::SyncSession;
 using std::string;
 
 DownloadUpdatesCommand::DownloadUpdatesCommand(
     bool create_mobile_bookmarks_folder)
     : create_mobile_bookmarks_folder_(create_mobile_bookmarks_folder) {}
 
 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_protocol_version(

[akalin, 2012/07/11 01:42:22]

hmm multiple calls?  Maybe put this call into PostClientToServerMessage?  I
guess that'd mean having to pass a pointer or copy the protobuf.

[rlarocque, 2012/07/11 19:22:16]

Done.  This has been converted to a function call and moved next to the
AddRequestBirthday() call, which performs a similar function: setting a required
field.

+      client_to_server_message.protocol_version());
   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_);
 
   syncable::Directory* dir = session->context()->directory();
 
   // Request updates for all enabled types.
   const ModelTypeSet enabled_types =
       GetRoutingInfoTypes(session->routing_info());
   DVLOG(1) << "Getting updates for types "
@@ skipping 69 matching lines @@
     // could be null in some unit tests.
     if (session->context()->debug_info_getter()) {
       session->context()->debug_info_getter()->GetAndClearDebugInfo(
           debug_info);
     }
     session->mutable_status_controller()->set_debug_info_sent();
   }
 }
 
 }  // namespace syncer