[Sync] Replace AttachmentIdSet with AttachmentIdList in interfaces.

components/sync_driver/generic_change_processor_unittest.cc

 // Copyright 2014 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 "components/sync_driver/generic_change_processor.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
@@ skipping 22 matching lines @@
 namespace sync_driver {
 
 namespace {
 
 // A mock that keeps track of attachments passed to UploadAttachments.
 class MockAttachmentService : public syncer::AttachmentServiceImpl {
  public:
   MockAttachmentService(scoped_ptr<syncer::AttachmentStore> attachment_store);
   ~MockAttachmentService() override;
   void UploadAttachments(
-      const syncer::AttachmentIdSet& attachment_ids) override;
-  std::vector<syncer::AttachmentIdSet>* attachment_id_sets();
+      const syncer::AttachmentIdList& attachment_ids) override;
+  std::vector<syncer::AttachmentIdList>* attachment_id_lists();
 
  private:
-  std::vector<syncer::AttachmentIdSet> attachment_id_sets_;
+  std::vector<syncer::AttachmentIdList> attachment_id_lists_;
 };
 
 MockAttachmentService::MockAttachmentService(
     scoped_ptr<syncer::AttachmentStore> attachment_store)
     : AttachmentServiceImpl(attachment_store.Pass(),
                             scoped_ptr<syncer::AttachmentUploader>(
                                 new syncer::FakeAttachmentUploader),
                             scoped_ptr<syncer::AttachmentDownloader>(
                                 new syncer::FakeAttachmentDownloader),
                             NULL,
                             base::TimeDelta(),
                             base::TimeDelta()) {
 }
 
 MockAttachmentService::~MockAttachmentService() {
 }
 
 void MockAttachmentService::UploadAttachments(
-    const syncer::AttachmentIdSet& attachment_ids) {
-  attachment_id_sets_.push_back(attachment_ids);
+    const syncer::AttachmentIdList& attachment_ids) {
+  attachment_id_lists_.push_back(attachment_ids);
   AttachmentServiceImpl::UploadAttachments(attachment_ids);
 }
 
-std::vector<syncer::AttachmentIdSet>*
-MockAttachmentService::attachment_id_sets() {
-  return &attachment_id_sets_;
+std::vector<syncer::AttachmentIdList>*
+MockAttachmentService::attachment_id_lists() {
+  return &attachment_id_lists_;
 }
 
 // MockSyncApiComponentFactory needed to initialize GenericChangeProcessor and
 // pass MockAttachmentService to it.
 class MockSyncApiComponentFactory : public SyncApiComponentFactory {
  public:
   MockSyncApiComponentFactory() {}
 
   base::WeakPtr<syncer::SyncableService> GetSyncableServiceForType(
       syncer::ModelType type) override {
@@ skipping 294 matching lines @@
   change_list.push_back(
       syncer::SyncChange(FROM_HERE,
                          syncer::SyncChange::ACTION_ADD,
                          syncer::SyncData::CreateLocalDataWithAttachments(
                              tag, title, specifics, attachment_ids)));
   ASSERT_FALSE(
       change_processor()->ProcessSyncChanges(FROM_HERE, change_list).IsSet());
   RunLoop();
 
   // Check that the AttachmentService received the new attachments.
-  ASSERT_EQ(mock_attachment_service()->attachment_id_sets()->size(), 1U);
-  const syncer::AttachmentIdSet& attachments_added =
-      mock_attachment_service()->attachment_id_sets()->front();
+  ASSERT_EQ(mock_attachment_service()->attachment_id_lists()->size(), 1U);
+  const syncer::AttachmentIdList& attachments_added =
+      mock_attachment_service()->attachment_id_lists()->front();
   ASSERT_THAT(
       attachments_added,
       testing::UnorderedElementsAre(attachment_ids[0], attachment_ids[1]));
 
   // Update the SyncData, replacing its two attachments with one new attachment.
   syncer::AttachmentIdList new_attachment_ids;
   new_attachment_ids.push_back(syncer::AttachmentId::Create(0, 0));
-  mock_attachment_service()->attachment_id_sets()->clear();
+  mock_attachment_service()->attachment_id_lists()->clear();
   change_list.clear();
   change_list.push_back(
       syncer::SyncChange(FROM_HERE,
                          syncer::SyncChange::ACTION_UPDATE,
                          syncer::SyncData::CreateLocalDataWithAttachments(
                              tag, title, specifics, new_attachment_ids)));
   ASSERT_FALSE(
       change_processor()->ProcessSyncChanges(FROM_HERE, change_list).IsSet());
   RunLoop();
 
   // Check that the AttachmentService received it.
-  ASSERT_EQ(mock_attachment_service()->attachment_id_sets()->size(), 1U);
-  const syncer::AttachmentIdSet& new_attachments_added =
-      mock_attachment_service()->attachment_id_sets()->front();
+  ASSERT_EQ(mock_attachment_service()->attachment_id_lists()->size(), 1U);
+  const syncer::AttachmentIdList& new_attachments_added =
+      mock_attachment_service()->attachment_id_lists()->front();
   ASSERT_THAT(new_attachments_added,
               testing::UnorderedElementsAre(new_attachment_ids[0]));
 }
 
 // Verify that after attachment is uploaded GenericChangeProcessor updates
 // corresponding entries
 TEST_F(SyncGenericChangeProcessorTest, AttachmentUploaded) {
   std::string tag = "client_tag";
   std::string title = "client_title";
   sync_pb::EntitySpecifics specifics;
@@ skipping 43 matching lines @@
     *record1->mutable_id() = id1.GetProto();
     sync_pb::AttachmentMetadataRecord* record2 = metadata.add_record();
     *record2->mutable_id() = id2.GetProto();
     record2->set_is_on_server(true);
     node.SetAttachmentMetadata(metadata);
   }
 
   // Construct the GenericChangeProcessor and see that it asks the
   // AttachmentService to upload id1 only.
   ConstructGenericChangeProcessor(kType);
-  ASSERT_EQ(1U, mock_attachment_service()->attachment_id_sets()->size());
-  ASSERT_THAT(mock_attachment_service()->attachment_id_sets()->front(),
+  ASSERT_EQ(1U, mock_attachment_service()->attachment_id_lists()->size());
+  ASSERT_THAT(mock_attachment_service()->attachment_id_lists()->front(),
               testing::UnorderedElementsAre(id1));
 }
 
 }  // namespace
 
 }  // namespace sync_driver