Revert of [Sync] Add size and crc32c to AttachmentId.

sync/syncable/directory_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/syncable/directory_unittest.h"
 
 #include "base/strings/stringprintf.h"
 #include "base/test/values_test_util.h"
 #include "sync/internal_api/public/base/attachment_id_proto.h"
 #include "sync/syncable/syncable_proto_util.h"
@@ skipping 1621 matching lines @@
     base::PlatformThread::Join(threads[i]);
   }
 }
 
 // Verify that Directory is notifed when a MutableEntry's AttachmentMetadata
 // changes.
 TEST_F(SyncableDirectoryTest, MutableEntry_PutAttachmentMetadata) {
   sync_pb::AttachmentMetadata attachment_metadata;
   sync_pb::AttachmentMetadataRecord* record = attachment_metadata.add_record();
   sync_pb::AttachmentIdProto attachment_id_proto =
-      syncer::CreateAttachmentIdProto(0, 0);
+      syncer::CreateAttachmentIdProto();
   *record->mutable_id() = attachment_id_proto;
   ASSERT_FALSE(dir()->IsAttachmentLinked(attachment_id_proto));
   {
     WriteTransaction trans(FROM_HERE, UNITTEST, dir().get());
 
     // Create an entry with attachment metadata and see that the attachment id
     // is not linked.
     MutableEntry entry(
         &trans, CREATE, PREFERENCES, trans.root_id(), "some entry");
     entry.PutId(TestIdFactory::FromNumber(-1));
@@ skipping 23 matching lines @@
     ASSERT_TRUE(metahandles.empty());
   }
   ASSERT_FALSE(dir()->IsAttachmentLinked(attachment_id_proto));
 }
 
 // Verify that UpdateAttachmentId updates attachment_id and is_on_server flag.
 TEST_F(SyncableDirectoryTest, MutableEntry_UpdateAttachmentId) {
   sync_pb::AttachmentMetadata attachment_metadata;
   sync_pb::AttachmentMetadataRecord* r1 = attachment_metadata.add_record();
   sync_pb::AttachmentMetadataRecord* r2 = attachment_metadata.add_record();
-  *r1->mutable_id() = syncer::CreateAttachmentIdProto(0, 0);
-  *r2->mutable_id() = syncer::CreateAttachmentIdProto(0, 0);
+  *r1->mutable_id() = syncer::CreateAttachmentIdProto();
+  *r2->mutable_id() = syncer::CreateAttachmentIdProto();
   sync_pb::AttachmentIdProto attachment_id_proto = r1->id();
 
   WriteTransaction trans(FROM_HERE, UNITTEST, dir().get());
 
   MutableEntry entry(
       &trans, CREATE, PREFERENCES, trans.root_id(), "some entry");
   entry.PutId(TestIdFactory::FromNumber(-1));
   entry.PutAttachmentMetadata(attachment_metadata);
 
   const sync_pb::AttachmentMetadata& entry_metadata =
       entry.GetAttachmentMetadata();
   ASSERT_EQ(2, entry_metadata.record_size());
   ASSERT_FALSE(entry_metadata.record(0).is_on_server());
   ASSERT_FALSE(entry_metadata.record(1).is_on_server());
   ASSERT_FALSE(entry.GetIsUnsynced());
 
   entry.MarkAttachmentAsOnServer(attachment_id_proto);
 
   ASSERT_TRUE(entry_metadata.record(0).is_on_server());
   ASSERT_FALSE(entry_metadata.record(1).is_on_server());
   ASSERT_TRUE(entry.GetIsUnsynced());
 }
 
 // Verify that deleted entries with attachments will retain the attachments.
 TEST_F(SyncableDirectoryTest, Directory_DeleteDoesNotUnlinkAttachments) {
   sync_pb::AttachmentMetadata attachment_metadata;
   sync_pb::AttachmentMetadataRecord* record = attachment_metadata.add_record();
   sync_pb::AttachmentIdProto attachment_id_proto =
-      syncer::CreateAttachmentIdProto(0, 0);
+      syncer::CreateAttachmentIdProto();
   *record->mutable_id() = attachment_id_proto;
   ASSERT_FALSE(dir()->IsAttachmentLinked(attachment_id_proto));
   const Id id = TestIdFactory::FromNumber(-1);
 
   // Create an entry with attachment metadata and see that the attachment id
   // is linked.
   CreateEntryWithAttachmentMetadata(
       PREFERENCES, "some entry", id, attachment_metadata);
   ASSERT_TRUE(dir()->IsAttachmentLinked(attachment_id_proto));
 
   // Delete the entry and see that it's still linked because the entry hasn't
   // yet been purged.
   DeleteEntry(id);
   ASSERT_TRUE(dir()->IsAttachmentLinked(attachment_id_proto));
 
   // Reload the Directory, purging the deleted entry, and see that the
   // attachment is no longer linked.
   SimulateSaveAndReloadDir();
   ASSERT_FALSE(dir()->IsAttachmentLinked(attachment_id_proto));
 }
 
 // Verify that a given attachment can be referenced by multiple entries and that
 // any one of the references is sufficient to ensure it remains linked.
 TEST_F(SyncableDirectoryTest, Directory_LastReferenceUnlinksAttachments) {
   // Create one attachment.
   sync_pb::AttachmentMetadata attachment_metadata;
   sync_pb::AttachmentMetadataRecord* record = attachment_metadata.add_record();
   sync_pb::AttachmentIdProto attachment_id_proto =
-      syncer::CreateAttachmentIdProto(0, 0);
+      syncer::CreateAttachmentIdProto();
   *record->mutable_id() = attachment_id_proto;
 
   // Create two entries, each referencing the attachment.
   const Id id1 = TestIdFactory::FromNumber(-1);
   const Id id2 = TestIdFactory::FromNumber(-2);
   CreateEntryWithAttachmentMetadata(
       PREFERENCES, "some entry", id1, attachment_metadata);
   CreateEntryWithAttachmentMetadata(
       PREFERENCES, "some other entry", id2, attachment_metadata);
 
   // See that the attachment is considered linked.
   ASSERT_TRUE(dir()->IsAttachmentLinked(attachment_id_proto));
 
   // Delete the first entry, reload the Directory, see that the attachment is
   // still linked.
   DeleteEntry(id1);
   SimulateSaveAndReloadDir();
   ASSERT_TRUE(dir()->IsAttachmentLinked(attachment_id_proto));
 
   // Delete the second entry, reload the Directory, see that the attachment is
   // no loner linked.
   DeleteEntry(id2);
   SimulateSaveAndReloadDir();
   ASSERT_FALSE(dir()->IsAttachmentLinked(attachment_id_proto));
 }
 
 TEST_F(SyncableDirectoryTest, Directory_GetAttachmentIdsToUpload) {
   // Create one attachment, referenced by two entries.
-  AttachmentId attachment_id = AttachmentId::Create(0, 0);
+  AttachmentId attachment_id = AttachmentId::Create();
   sync_pb::AttachmentIdProto attachment_id_proto = attachment_id.GetProto();
   sync_pb::AttachmentMetadata attachment_metadata;
   sync_pb::AttachmentMetadataRecord* record = attachment_metadata.add_record();
   *record->mutable_id() = attachment_id_proto;
   const Id id1 = TestIdFactory::FromNumber(-1);
   const Id id2 = TestIdFactory::FromNumber(-2);
   CreateEntryWithAttachmentMetadata(
       PREFERENCES, "some entry", id1, attachment_metadata);
   CreateEntryWithAttachmentMetadata(
       PREFERENCES, "some other entry", id2, attachment_metadata);
@@ skipping 91 matching lines @@
     ASSERT_EQ(1, p_root.GetTotalNodeCount() - 1);
     Entry a_root(&trans, GET_BY_ID, a_root_id);
     ASSERT_EQ(item2_id, a_root.GetFirstChildId());
     ASSERT_EQ(1, a_root.GetTotalNodeCount() - 1);
   }
 }
 
 }  // namespace syncable
 
 }  // namespace syncer