Store attachment crc in AttachmentStore

sync/internal_api/attachments/attachment_store_test_template.h

 // 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.
 
 #ifndef SYNC_INTERNAL_API_ATTACHMENTS_ATTACHMENT_STORE_TEST_TEMPLATE_H_
 #define SYNC_INTERNAL_API_ATTACHMENTS_ATTACHMENT_STORE_TEST_TEMPLATE_H_
 
 #include "sync/api/attachments/attachment_store.h"
 
 #include "base/bind.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/thread_task_runner_handle.h"
 #include "sync/api/attachments/attachment.h"
+#include "sync/internal_api/public/attachments/attachment_util.h"
 #include "sync/protocol/sync.pb.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // AttachmentStoreTest defines tests for AttachmentStore. To instantiate these
 // tests for a particular implementation you need to:
 //  - Include this file in test.
 //  - Create factory class for attachment store that implements factory method.
 //  - add INSTANTIATE_TYPED_TEST_CASE_P statement.
 // Here is how to do it for MyAttachmentStore:
 //
@@ skipping 81 matching lines @@
     *destination_failed_attachment_ids = source_failed_attachment_ids.Pass();
   }
 };
 
 TYPED_TEST_CASE_P(AttachmentStoreTest);
 
 // Verify that we do not overwrite existing attachments and that we do not treat
 // it as an error.
 TYPED_TEST_P(AttachmentStoreTest, Write_NoOverwriteNoError) {
   // Create two attachments with the same id but different data.
-  Attachment attachment1 = Attachment::Create(this->some_data1);
+  Attachment attachment1 = Attachment::CreateNew(this->some_data1);
+  uint32_t crc = ComputeCrc32c(this->some_data2);
   Attachment attachment2 =
-      Attachment::CreateWithId(attachment1.GetId(), this->some_data2);
+      Attachment::RestoreExisting(attachment1.GetId(), this->some_data2, crc);
 
   // Write the first one.
   AttachmentList some_attachments;
   some_attachments.push_back(attachment1);
   this->store->Write(some_attachments, this->write_callback);
   this->ClearAndPumpLoop();
   EXPECT_EQ(this->result, AttachmentStore::SUCCESS);
 
   // Write the second one.
   some_attachments.clear();
@@ skipping 11 matching lines @@
   EXPECT_EQ(this->attachments->size(), 1U);
   EXPECT_EQ(this->failed_attachment_ids->size(), 0U);
   AttachmentMap::const_iterator a1 =
       this->attachments->find(attachment1.GetId());
   EXPECT_TRUE(a1 != this->attachments->end());
   EXPECT_TRUE(attachment1.GetData()->Equals(a1->second.GetData()));
 }
 
 // Verify that we can write some attachments and read them back.
 TYPED_TEST_P(AttachmentStoreTest, Write_RoundTrip) {
-  Attachment attachment1 = Attachment::Create(this->some_data1);
-  Attachment attachment2 = Attachment::Create(this->some_data2);
+  Attachment attachment1 = Attachment::CreateNew(this->some_data1);
+  Attachment attachment2 = Attachment::CreateNew(this->some_data2);
   AttachmentList some_attachments;
   some_attachments.push_back(attachment1);
   some_attachments.push_back(attachment2);
 
   this->store->Write(some_attachments, this->write_callback);
   this->ClearAndPumpLoop();
   EXPECT_EQ(this->result, AttachmentStore::SUCCESS);
 
   AttachmentIdList some_attachment_ids;
   some_attachment_ids.push_back(attachment1.GetId());
@@ skipping 10 matching lines @@
   EXPECT_TRUE(attachment1.GetData()->Equals(a1->second.GetData()));
 
   AttachmentMap::const_iterator a2 =
       this->attachments->find(attachment2.GetId());
   EXPECT_TRUE(a2 != this->attachments->end());
   EXPECT_TRUE(attachment2.GetData()->Equals(a2->second.GetData()));
 }
 
 // Try to read two attachments when only one exists.
 TYPED_TEST_P(AttachmentStoreTest, Read_OneNotFound) {
-  Attachment attachment1 = Attachment::Create(this->some_data1);
-  Attachment attachment2 = Attachment::Create(this->some_data2);
+  Attachment attachment1 = Attachment::CreateNew(this->some_data1);
+  Attachment attachment2 = Attachment::CreateNew(this->some_data2);
 
   AttachmentList some_attachments;
   // Write attachment1 only.
   some_attachments.push_back(attachment1);
   this->store->Write(some_attachments, this->write_callback);
   this->ClearAndPumpLoop();
   EXPECT_EQ(this->result, AttachmentStore::SUCCESS);
 
   // Try to read both attachment1 and attachment2.
   AttachmentIdList ids;
   ids.push_back(attachment1.GetId());
   ids.push_back(attachment2.GetId());
   this->store->Read(ids, this->read_callback);
   this->ClearAndPumpLoop();
 
   // See that only attachment1 was read.
   EXPECT_EQ(this->result, AttachmentStore::UNSPECIFIED_ERROR);
   EXPECT_EQ(this->attachments->size(), 1U);
   EXPECT_EQ(this->failed_attachment_ids->size(), 1U);
 }
 
 // Try to drop two attachments when only one exists. Verify that no error occurs
 // and that the existing attachment was dropped.
 TYPED_TEST_P(AttachmentStoreTest, Drop_DropTwoButOnlyOneExists) {
   // First, create two attachments.
-  Attachment attachment1 = Attachment::Create(this->some_data1);
-  Attachment attachment2 = Attachment::Create(this->some_data2);
+  Attachment attachment1 = Attachment::CreateNew(this->some_data1);
+  Attachment attachment2 = Attachment::CreateNew(this->some_data2);
   AttachmentList some_attachments;
   some_attachments.push_back(attachment1);
   some_attachments.push_back(attachment2);
   this->store->Write(some_attachments, this->write_callback);
   this->ClearAndPumpLoop();
   EXPECT_EQ(this->result, AttachmentStore::SUCCESS);
 
   // Drop attachment1 only.
   AttachmentIdList ids;
   ids.push_back(attachment1.GetId());
@@ skipping 24 matching lines @@
   this->ClearAndPumpLoop();
   EXPECT_EQ(this->result, AttachmentStore::UNSPECIFIED_ERROR);
   EXPECT_EQ(this->attachments->size(), 0U);
   EXPECT_EQ(this->failed_attachment_ids->size(), 1U);
   EXPECT_EQ((*this->failed_attachment_ids)[0], attachment2.GetId());
 }
 
 // Verify that attempting to drop an attachment that does not exist is not an
 // error.
 TYPED_TEST_P(AttachmentStoreTest, Drop_DoesNotExist) {
-  Attachment attachment1 = Attachment::Create(this->some_data1);
+  Attachment attachment1 = Attachment::CreateNew(this->some_data1);
   AttachmentList some_attachments;
   some_attachments.push_back(attachment1);
   this->store->Write(some_attachments, this->write_callback);
   this->ClearAndPumpLoop();
   EXPECT_EQ(this->result, AttachmentStore::SUCCESS);
 
   // Drop the attachment.
   AttachmentIdList ids;
   ids.push_back(attachment1.GetId());
   this->store->Drop(ids, this->drop_callback);
@@ skipping 19 matching lines @@
 REGISTER_TYPED_TEST_CASE_P(AttachmentStoreTest,
                            Write_NoOverwriteNoError,
                            Write_RoundTrip,
                            Read_OneNotFound,
                            Drop_DropTwoButOnlyOneExists,
                            Drop_DoesNotExist);
 
 }  // namespace syncer
 
 #endif  // SYNC_INTERNAL_API_ATTACHMENTS_ATTACHMENT_STORE_TEST_TEMPLATE_H_