[Sync] Replace AttachmentIdSet with AttachmentIdList in interfaces.

sync/internal_api/attachments/attachment_service_impl_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 "sync/internal_api/public/attachments/attachment_service_impl.h"
 
 #include "base/bind.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
@@ skipping 242 matching lines @@
   }
 
   void RunLoopAndFireTimer() {
     RunLoop();
     if (mock_timer()->IsRunning()) {
       mock_timer()->Fire();
       RunLoop();
     }
   }
 
+  AttachmentIdSet AttachmentIdSetFromList(const AttachmentIdList& id_list) {

[maniscalco, 2015/03/25 00:42:39]

Could be static?

[pavely, 2015/03/25 00:52:11]

Done.

+    AttachmentIdSet id_set;
+    std::copy(id_list.begin(), id_list.end(),
+              std::inserter(id_set, id_set.end()));
+    return id_set;
+  }
+
   const std::vector<AttachmentService::GetOrDownloadResult>&
   download_results() const {
     return download_results_;
   }
 
   const AttachmentMap& last_download_attachments() const {
     return *last_download_attachments_.get();
   }
 
   net::NetworkChangeNotifier* network_change_notifier() {
@@ skipping 140 matching lines @@
 
   AttachmentIdSet local_attachments;
   store()->RespondToRead(local_attachments);
   RunLoop();
   ASSERT_EQ(1U, download_results().size());
   EXPECT_EQ(AttachmentService::GET_UNSPECIFIED_ERROR, download_results()[0]);
   EXPECT_TRUE(last_download_attachments().empty());
 }
 
 TEST_F(AttachmentServiceImplTest, UploadAttachments_Success) {
-  AttachmentIdSet attachment_ids;
+  AttachmentIdList attachment_ids;
   const unsigned num_attachments = 3;
   for (unsigned i = 0; i < num_attachments; ++i) {
-    attachment_ids.insert(AttachmentId::Create(0, 0));
+    attachment_ids.push_back(AttachmentId::Create(0, 0));
   }
   attachment_service()->UploadAttachments(attachment_ids);
 
   for (unsigned i = 0; i < num_attachments; ++i) {
     RunLoopAndFireTimer();
     // See that the service has issued a read for at least one of the
     // attachments.
     ASSERT_GE(store()->read_ids.size(), 1U);
-    store()->RespondToRead(attachment_ids);
+    store()->RespondToRead(AttachmentIdSetFromList(attachment_ids));
     RunLoop();
     ASSERT_GE(uploader()->upload_requests.size(), 1U);
     uploader()->RespondToUpload(uploader()->upload_requests.begin()->first,
                                 AttachmentUploader::UPLOAD_SUCCESS);
   }
   RunLoop();
   ASSERT_EQ(0U, store()->read_ids.size());
   ASSERT_EQ(0U, uploader()->upload_requests.size());
 
   // See that all the attachments were uploaded.
   ASSERT_EQ(attachment_ids.size(), on_attachment_uploaded_list().size());
-  AttachmentIdSet::const_iterator iter = attachment_ids.begin();
-  const AttachmentIdSet::const_iterator end = attachment_ids.end();
-  for (iter = attachment_ids.begin(); iter != end; ++iter) {
+  for (auto iter = attachment_ids.begin(); iter != attachment_ids.end();
+       ++iter) {
     EXPECT_THAT(on_attachment_uploaded_list(), testing::Contains(*iter));
   }
 }
 
 TEST_F(AttachmentServiceImplTest, UploadAttachments_Success_NoDelegate) {
   InitializeAttachmentService(make_scoped_ptr(new MockAttachmentUploader()),
                               make_scoped_ptr(new MockAttachmentDownloader()),
                               NULL);  // No delegate.
 
-  AttachmentIdSet attachment_ids;
-  attachment_ids.insert(AttachmentId::Create(0, 0));
+  AttachmentIdList attachment_ids;
+  attachment_ids.push_back(AttachmentId::Create(0, 0));
   attachment_service()->UploadAttachments(attachment_ids);
   RunLoopAndFireTimer();
   ASSERT_EQ(1U, store()->read_ids.size());
   ASSERT_EQ(0U, uploader()->upload_requests.size());
-  store()->RespondToRead(attachment_ids);
+  AttachmentIdSet id_set;
+  std::copy(attachment_ids.begin(), attachment_ids.end(),

[maniscalco, 2015/03/25 00:42:39]

Can you use AttachmentIdSetFromList here?

[pavely, 2015/03/25 00:52:11]

Done.

+            std::inserter(id_set, id_set.end()));
+  store()->RespondToRead(id_set);
   RunLoop();
   ASSERT_EQ(0U, store()->read_ids.size());
   ASSERT_EQ(1U, uploader()->upload_requests.size());
   uploader()->RespondToUpload(*attachment_ids.begin(),
                               AttachmentUploader::UPLOAD_SUCCESS);
   RunLoop();
   ASSERT_TRUE(on_attachment_uploaded_list().empty());
 }
 
 TEST_F(AttachmentServiceImplTest, UploadAttachments_SomeMissingFromStore) {
-  AttachmentIdSet attachment_ids;
-  attachment_ids.insert(AttachmentId::Create(0, 0));
-  attachment_ids.insert(AttachmentId::Create(0, 0));
+  AttachmentIdList attachment_ids;
+  attachment_ids.push_back(AttachmentId::Create(0, 0));
+  attachment_ids.push_back(AttachmentId::Create(0, 0));
   attachment_service()->UploadAttachments(attachment_ids);
   RunLoopAndFireTimer();
   ASSERT_GE(store()->read_ids.size(), 1U);
 
   ASSERT_EQ(0U, uploader()->upload_requests.size());
-  store()->RespondToRead(attachment_ids);
+  store()->RespondToRead(AttachmentIdSetFromList(attachment_ids));
   RunLoop();
   ASSERT_EQ(1U, uploader()->upload_requests.size());
 
   uploader()->RespondToUpload(uploader()->upload_requests.begin()->first,
                               AttachmentUploader::UPLOAD_SUCCESS);
   RunLoopAndFireTimer();
   ASSERT_EQ(1U, on_attachment_uploaded_list().size());
   ASSERT_GE(store()->read_ids.size(), 1U);
   // Not found!
   store()->RespondToRead(AttachmentIdSet());
   RunLoop();
   // No upload requests since the read failed.
   ASSERT_EQ(0U, uploader()->upload_requests.size());
 }
 
 TEST_F(AttachmentServiceImplTest, UploadAttachments_AllMissingFromStore) {
-  AttachmentIdSet attachment_ids;
+  AttachmentIdList attachment_ids;
   const unsigned num_attachments = 2;
   for (unsigned i = 0; i < num_attachments; ++i) {
-    attachment_ids.insert(AttachmentId::Create(0, 0));
+    attachment_ids.push_back(AttachmentId::Create(0, 0));
   }
   attachment_service()->UploadAttachments(attachment_ids);
 
   for (unsigned i = 0; i < num_attachments; ++i) {
     RunLoopAndFireTimer();
     ASSERT_GE(store()->read_ids.size(), 1U);
     // None found!
     store()->RespondToRead(AttachmentIdSet());
   }
   RunLoop();
 
   // Nothing uploaded.
   EXPECT_EQ(0U, uploader()->upload_requests.size());
   // See that the delegate was never called.
   ASSERT_EQ(0U, on_attachment_uploaded_list().size());
 }
 
 TEST_F(AttachmentServiceImplTest, UploadAttachments_NoUploader) {
   InitializeAttachmentService(make_scoped_ptr<MockAttachmentUploader>(NULL),
                               make_scoped_ptr(new MockAttachmentDownloader()),
                               this);
 
-  AttachmentIdSet attachment_ids;
-  attachment_ids.insert(AttachmentId::Create(0, 0));
+  AttachmentIdList attachment_ids;
+  attachment_ids.push_back(AttachmentId::Create(0, 0));
   attachment_service()->UploadAttachments(attachment_ids);
   RunLoop();
   EXPECT_EQ(0U, store()->read_ids.size());
   ASSERT_EQ(0U, on_attachment_uploaded_list().size());
 }
 
 // Upload three attachments.  For one of them, server responds with error.
 TEST_F(AttachmentServiceImplTest, UploadAttachments_OneUploadFails) {
-  AttachmentIdSet attachment_ids;
+  AttachmentIdList attachment_ids;
   const unsigned num_attachments = 3;
   for (unsigned i = 0; i < num_attachments; ++i) {
-    attachment_ids.insert(AttachmentId::Create(0, 0));
+    attachment_ids.push_back(AttachmentId::Create(0, 0));
   }
   attachment_service()->UploadAttachments(attachment_ids);
 
   for (unsigned i = 0; i < 3; ++i) {
     RunLoopAndFireTimer();
     ASSERT_GE(store()->read_ids.size(), 1U);
-    store()->RespondToRead(attachment_ids);
+    store()->RespondToRead(AttachmentIdSetFromList(attachment_ids));
     RunLoop();
     ASSERT_EQ(1U, uploader()->upload_requests.size());
     AttachmentUploader::UploadResult result =
         AttachmentUploader::UPLOAD_SUCCESS;
     // Fail the 2nd one.
     if (i == 2U) {
       result = AttachmentUploader::UPLOAD_UNSPECIFIED_ERROR;
     } else {
       result = AttachmentUploader::UPLOAD_SUCCESS;
     }
     uploader()->RespondToUpload(uploader()->upload_requests.begin()->first,
                                 result);
     RunLoop();
   }
   ASSERT_EQ(2U, on_attachment_uploaded_list().size());
 }
 
 // Attempt an upload, respond with transient error to trigger backoff, issue
 // network disconnect/connect events and see that backoff is cleared.
 TEST_F(AttachmentServiceImplTest,
        UploadAttachments_ResetBackoffAfterNetworkChange) {
-  AttachmentIdSet attachment_ids;
-  attachment_ids.insert(AttachmentId::Create(0, 0));
+  AttachmentIdList attachment_ids;
+  attachment_ids.push_back(AttachmentId::Create(0, 0));
   attachment_service()->UploadAttachments(attachment_ids);
 
   RunLoopAndFireTimer();
   ASSERT_EQ(1U, store()->read_ids.size());
-  store()->RespondToRead(attachment_ids);
+  store()->RespondToRead(AttachmentIdSetFromList(attachment_ids));
   RunLoop();
   ASSERT_EQ(1U, uploader()->upload_requests.size());
 
   uploader()->RespondToUpload(uploader()->upload_requests.begin()->first,
                               AttachmentUploader::UPLOAD_TRANSIENT_ERROR);
   RunLoop();
 
   // See that we are in backoff.
   ASSERT_TRUE(mock_timer()->IsRunning());
   ASSERT_GT(mock_timer()->GetCurrentDelay(), base::TimeDelta());
@@ skipping 11 matching lines @@
   net::NetworkChangeNotifier::NotifyObserversOfNetworkChangeForTests(
       net::NetworkChangeNotifier::CONNECTION_WIFI);
   RunLoop();
 
   // No longer in backoff.
   ASSERT_TRUE(mock_timer()->IsRunning());
   ASSERT_EQ(base::TimeDelta(), mock_timer()->GetCurrentDelay());
 }
 
 }  // namespace syncer