[Sync] Add size and crc32c to AttachmentId.

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 352 matching lines @@
 // AttachmentService.
 TEST_F(SyncGenericChangeProcessorTest,
        ProcessSyncChanges_AddUpdateWithAttachment) {
   std::string tag = "client_tag";
   std::string title = "client_title";
   sync_pb::EntitySpecifics specifics;
   sync_pb::PreferenceSpecifics* pref_specifics = specifics.mutable_preference();
   pref_specifics->set_name("test");
 
   syncer::AttachmentIdList attachment_ids;
-  attachment_ids.push_back(syncer::AttachmentId::Create());
-  attachment_ids.push_back(syncer::AttachmentId::Create());
+  attachment_ids.push_back(syncer::AttachmentId::Create(0, 0));
+  attachment_ids.push_back(syncer::AttachmentId::Create(0, 0));
 
   // Add a SyncData with two attachments.
   syncer::SyncChangeList change_list;
   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_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());
+  new_attachment_ids.push_back(syncer::AttachmentId::Create(0, 0));
   mock_attachment_service()->attachment_id_sets()->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_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;
   sync_pb::PreferenceSpecifics* pref_specifics = specifics.mutable_preference();
   pref_specifics->set_name("test");
 
   syncer::AttachmentIdList attachment_ids;
-  attachment_ids.push_back(syncer::AttachmentId::Create());
+  attachment_ids.push_back(syncer::AttachmentId::Create(0, 0));
 
   // Add a SyncData with two attachments.
   syncer::SyncChangeList change_list;
   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());
 
   sync_pb::AttachmentIdProto attachment_id_proto = attachment_ids[0].GetProto();
   syncer::AttachmentId attachment_id =
       syncer::AttachmentId::CreateFromProto(attachment_id_proto);
 
   change_processor()->OnAttachmentUploaded(attachment_id);
   syncer::ReadTransaction read_transaction(FROM_HERE, user_share());
   syncer::ReadNode node(&read_transaction);
   ASSERT_EQ(node.InitByClientTagLookup(kType, tag), syncer::BaseNode::INIT_OK);
   attachment_ids = node.GetAttachmentIds();
   EXPECT_EQ(1U, attachment_ids.size());
 }
 
 // Verify that upon construction, all attachments not yet on the server are
 // scheduled for upload.
 TEST_F(SyncGenericChangeProcessorTest, UploadAllAttachmentsNotOnServer) {
   // Create two attachment ids.  id2 will be marked as "on server".
-  syncer::AttachmentId id1 = syncer::AttachmentId::Create();
-  syncer::AttachmentId id2 = syncer::AttachmentId::Create();
+  syncer::AttachmentId id1 = syncer::AttachmentId::Create(0, 0);
+  syncer::AttachmentId id2 = syncer::AttachmentId::Create(0, 0);
   {
     // Write an entry containing these two attachment ids.
     syncer::WriteTransaction trans(FROM_HERE, user_share());
     syncer::ReadNode root(&trans);
     ASSERT_EQ(syncer::BaseNode::INIT_OK, root.InitTypeRoot(kType));
     syncer::WriteNode node(&trans);
     node.InitUniqueByCreation(kType, root, "some node");
     sync_pb::AttachmentMetadata metadata;
     sync_pb::AttachmentMetadataRecord* record1 = metadata.add_record();
     *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(),
               testing::UnorderedElementsAre(id1));
 }
 
 }  // namespace
 
 }  // namespace sync_driver