Pass AttachmentIdList instead of AttachmentList to SyncData

sync/api/sync_data.h

 // Copyright 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.
 
 #ifndef SYNC_API_SYNC_DATA_H_
 #define SYNC_API_SYNC_DATA_H_
 
 #include <iosfwd>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/stl_util.h"
 #include "base/time/time.h"
-#include "sync/api/attachments/attachment.h"
+#include "sync/api/attachments/attachment_id.h"
 #include "sync/base/sync_export.h"
 #include "sync/internal_api/public/attachments/attachment_service_proxy.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/internal_api/public/util/immutable.h"
 #include "sync/internal_api/public/util/weak_handle.h"
 
 namespace sync_pb {
 class EntitySpecifics;
 class SyncEntity;
 }  // namespace sync_pb
@@ skipping 20 matching lines @@
   // identifier server-side.
   //
   // For deletes: |datatype| must specify the datatype who node is being
   // deleted.
   //
   // For adds/updates: |specifics| must be valid and |non_unique_title| (can be
   // the same as |sync_tag|) must be specfied.  Note: |non_unique_title| is
   // primarily for debug purposes, and will be overwritten if the datatype is
   // encrypted.
   //
-  // For data with attachments: |attachments| must not contain duplicates.
+  // For data with attachments: |attachment_ids| must not contain duplicates.
   static SyncData CreateLocalDelete(
       const std::string& sync_tag,
       ModelType datatype);
   static SyncData CreateLocalData(
       const std::string& sync_tag,
       const std::string& non_unique_title,
       const sync_pb::EntitySpecifics& specifics);
   static SyncData CreateLocalDataWithAttachments(
       const std::string& sync_tag,
       const std::string& non_unique_title,
       const sync_pb::EntitySpecifics& specifics,
-      const AttachmentList& attachments);
+      const AttachmentIdList& attachment_ids);
 
   // Helper method for creating SyncData objects originating from the syncer.
   static SyncData CreateRemoteData(
       int64 id,
       const sync_pb::EntitySpecifics& specifics,
       const base::Time& last_modified_time,
       const AttachmentIdList& attachment_ids,
       const syncer::AttachmentServiceProxy& attachment_service);
 
   // Whether this SyncData holds valid data. The only way to have a SyncData
@@ skipping 48 matching lines @@
 
   // Equal to kInvalidId iff this is local.
   int64 id_;
 
   // This may be null if the SyncData represents a deleted item.
   base::Time remote_modification_time_;
 
   // The actual shared sync entity being held.
   ImmutableSyncEntity immutable_entity_;
 
-  Immutable<AttachmentList> attachments_;
-
   AttachmentServiceProxy attachment_service_;
 
  private:
   // Whether this SyncData holds valid data.
   bool is_valid_;
 
   // Clears |entity| and |attachments|.
   SyncData(int64 id,
            sync_pb::SyncEntity* entity,
-           AttachmentList* attachments,
            const base::Time& remote_modification_time,
            const syncer::AttachmentServiceProxy& attachment_service);
 };
 
 // A SyncData going to the syncer.
 class SYNC_EXPORT SyncDataLocal : public SyncData {
  public:
   // Construct a SyncDataLocal from a SyncData.
   //
   // |sync_data|'s IsLocal() must be true.
   explicit SyncDataLocal(const SyncData& sync_data);
   ~SyncDataLocal();
 
-  // Return a list of this SyncData's attachments.
-  const AttachmentList& GetLocalAttachmentsForUpload() const;
-
   // Return the value of the unique client tag. This is only set for data going
   // TO the syncer, not coming from.
   const std::string& GetTag() const;
 };
 
 // A SyncData that comes from the syncer.
 class SYNC_EXPORT SyncDataRemote : public SyncData {
  public:
   // Construct a SyncDataRemote from a SyncData.
   //
@@ skipping 31 matching lines @@
 };
 
 // gmock printer helper.
 void PrintTo(const SyncData& sync_data, std::ostream* os);
 
 typedef std::vector<SyncData> SyncDataList;
 
 }  // namespace syncer
 
 #endif  // SYNC_API_SYNC_DATA_H_