[Sync] Add size and crc32c to AttachmentId.

sync/engine/directory_update_handler_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/engine/directory_update_handler.h"
 
 #include "base/compiler_specific.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "sync/engine/syncer_proto_util.h"
@@ skipping 383 matching lines @@
   progress.mutable_gc_directive()->set_version_watermark(kDefaultVersion + 10);
 
   sync_pb::DataTypeContext context;
   context.set_data_type_id(GetSpecificsFieldNumberFromModelType(ARTICLES));
   context.set_context("context");
   context.set_version(1);
 
   scoped_ptr<sync_pb::SyncEntity> e1 = CreateUpdate(
       SyncableIdToProto(Id::CreateFromServerId("e1")), "", ARTICLES);
   sync_pb::AttachmentIdProto* attachment_id = e1->add_attachment_id();
-  *attachment_id = CreateAttachmentIdProto();
+  *attachment_id = CreateAttachmentIdProto(0, 0);
 
   SyncEntityList updates;
   updates.push_back(e1.get());
 
   // Process and apply updates.
   EXPECT_EQ(
       SYNCER_OK,
       handler.ProcessGetUpdatesResponse(progress, context, updates, &status));
   handler.ApplyUpdates(&status);
 
@@ skipping 658 matching lines @@
   }
 }
 
 TEST_F(DirectoryUpdateHandlerApplyUpdateTest,
        SimpleConflictDifferentAttachmentMetadata) {
   const bool is_folder = false;
   sync_pb::EntitySpecifics specifics;
   *specifics.mutable_article() = sync_pb::ArticleSpecifics();
   int64 handle = entry_factory()->CreateSyncedItem("art1", ARTICLES, is_folder);
 
-  sync_pb::AttachmentIdProto local_attachment_id = CreateAttachmentIdProto();
-  sync_pb::AttachmentIdProto server_attachment_id = CreateAttachmentIdProto();
+  sync_pb::AttachmentIdProto local_attachment_id =
+      CreateAttachmentIdProto(0, 0);
+  sync_pb::AttachmentIdProto server_attachment_id =
+      CreateAttachmentIdProto(0, 0);
 
   // Add an attachment to the local attachment metadata.
   sync_pb::AttachmentMetadata local_metadata;
   sync_pb::AttachmentMetadataRecord* local_record = local_metadata.add_record();
   *local_record->mutable_id() = local_attachment_id;
   local_record->set_is_on_server(true);
   entry_factory()->SetLocalAttachmentMetadataForItem(handle, local_metadata);
 
   // Add a different attachment to the server attachment metadata.
   sync_pb::AttachmentMetadata server_metadata;
@@ skipping 20 matching lines @@
             local_metadata.SerializeAsString());
 }
 
 TEST_F(DirectoryUpdateHandlerApplyUpdateTest,
        SimpleConflictSameAttachmentMetadataDifferentOrder) {
   const bool is_folder = false;
   sync_pb::EntitySpecifics specifics;
   *specifics.mutable_article() = sync_pb::ArticleSpecifics();
   int64 handle = entry_factory()->CreateSyncedItem("art1", ARTICLES, is_folder);
 
-  sync_pb::AttachmentIdProto id1 = CreateAttachmentIdProto();
-  sync_pb::AttachmentIdProto id2 = CreateAttachmentIdProto();
+  sync_pb::AttachmentIdProto id1 = CreateAttachmentIdProto(0, 0);
+  sync_pb::AttachmentIdProto id2 = CreateAttachmentIdProto(0, 0);
 
   // Add id1, then id2 to the local attachment metadata.
   sync_pb::AttachmentMetadata local_metadata;
   sync_pb::AttachmentMetadataRecord* record = local_metadata.add_record();
   *record->mutable_id() = id1;
   record->set_is_on_server(true);
   record = local_metadata.add_record();
   *record->mutable_id() = id2;
   record->set_is_on_server(true);
   entry_factory()->SetLocalAttachmentMetadataForItem(handle, local_metadata);
@@ skipping 17 matching lines @@
   const UpdateCounters& counters = GetArticlesUpdateCounters();
   EXPECT_EQ(1, counters.num_updates_applied);
   EXPECT_EQ(1, counters.num_local_overwrites);
   EXPECT_EQ(0, counters.num_server_overwrites);
   local_metadata = entry_factory()->GetLocalAttachmentMetadataForItem(handle);
   EXPECT_EQ(server_metadata.SerializeAsString(),
             local_metadata.SerializeAsString());
 }
 
 }  // namespace syncer