Store attachment crc in AttachmentStore

sync/internal_api/attachments/on_disk_attachment_store_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/on_disk_attachment_store.h"
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 136 matching lines @@
   AttachmentStore::CreateOnDiskStore(
       temp_dir_.path(),
       base::ThreadTaskRunnerHandle::Get(),
       base::Bind(&AttachmentStoreCreated, &store_, &result));
   RunLoop();
   EXPECT_EQ(result, AttachmentStore::SUCCESS);
 
   result = AttachmentStore::UNSPECIFIED_ERROR;
   std::string some_data = "data";
   Attachment attachment =
-      Attachment::Create(base::RefCountedString::TakeString(&some_data));
+      Attachment::CreateNew(base::RefCountedString::TakeString(&some_data));
   AttachmentList attachments;
   attachments.push_back(attachment);
   store_->Write(attachments,
                 base::Bind(&OnDiskAttachmentStoreSpecificTest::CopyResult,
                            base::Unretained(this),
                            &result));
   RunLoop();
   EXPECT_EQ(result, AttachmentStore::SUCCESS);
 
   // Close attachment store.
@@ skipping 91 matching lines @@
   result = AttachmentStore::SUCCESS;
   AttachmentStore::CreateOnDiskStore(
       temp_dir_.path(),
       base::ThreadTaskRunnerHandle::Get(),
       base::Bind(&AttachmentStoreCreated, &store_, &result));
   RunLoop();
   EXPECT_EQ(result, AttachmentStore::UNSPECIFIED_ERROR);
   EXPECT_EQ(store_.get(), nullptr);
 }
 
+// Ensure that attachment store correctly maintains metadata records for
+// attachments.
 TEST_F(OnDiskAttachmentStoreSpecificTest, RecordMetadata) {
   ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
   base::FilePath db_path =
       temp_dir_.path().Append(FILE_PATH_LITERAL("leveldb"));
 
   // Create attachment store.
   AttachmentStore::Result result = AttachmentStore::UNSPECIFIED_ERROR;
   AttachmentStore::CreateOnDiskStore(
       temp_dir_.path(),
       base::ThreadTaskRunnerHandle::Get(),
       base::Bind(&AttachmentStoreCreated, &store_, &result));
   RunLoop();
   EXPECT_EQ(result, AttachmentStore::SUCCESS);
 
   // Write two attachments.
   std::string some_data;
   AttachmentList attachments;
   some_data = "data1";
   attachments.push_back(
-      Attachment::Create(base::RefCountedString::TakeString(&some_data)));
+      Attachment::CreateNew(base::RefCountedString::TakeString(&some_data)));
   some_data = "data2";
   attachments.push_back(
-      Attachment::Create(base::RefCountedString::TakeString(&some_data)));
+      Attachment::CreateNew(base::RefCountedString::TakeString(&some_data)));
   store_->Write(attachments,
                 base::Bind(&OnDiskAttachmentStoreSpecificTest::CopyResult,
                            base::Unretained(this),
                            &result));
   RunLoop();
   EXPECT_EQ(result, AttachmentStore::SUCCESS);
 
   // Delete one of written attachments.
   AttachmentIdList attachment_ids;
   attachment_ids.push_back(attachments[0].GetId());
   store_->Drop(attachment_ids,
                base::Bind(&OnDiskAttachmentStoreSpecificTest::CopyResult,
                           base::Unretained(this),
                           &result));
   RunLoop();
   EXPECT_EQ(result, AttachmentStore::SUCCESS);
   store_ = nullptr;
   RunLoop();
 
   // Verify that attachment store contains only records for second attachment.
   VerifyAttachmentRecordsPresent(db_path, attachments[0].GetId(), false);
   VerifyAttachmentRecordsPresent(db_path, attachments[1].GetId(), true);
 }
 
+// Ensure that attachment store fails to load attachment with mismatched crc.
+TEST_F(OnDiskAttachmentStoreSpecificTest, MismatchedCrc) {
+  ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
+  // base::FilePath db_path =

[maniscalco, 2014/11/11 00:44:54]

Left over from a previous revision?

[pavely, 2014/11/11 22:27:15]

Done.

+  //     temp_dir_.path().Append(FILE_PATH_LITERAL("leveldb"));
+
+  // Create attachment store.
+  AttachmentStore::Result result = AttachmentStore::UNSPECIFIED_ERROR;
+  AttachmentStore::CreateOnDiskStore(
+      temp_dir_.path(), base::ThreadTaskRunnerHandle::Get(),
+      base::Bind(&AttachmentStoreCreated, &store_, &result));
+  RunLoop();
+  EXPECT_EQ(result, AttachmentStore::SUCCESS);
+
+  // Write attachment.
+  std::string some_data("data1");
+  Attachment attachment = Attachment::RestoreExisting(
+      AttachmentId::Create(), base::RefCountedString::TakeString(&some_data),
+      0);

[maniscalco, 2014/11/11 00:44:54]

Maybe put into a var named intentionally_wrong_crc32c or similar?

[pavely, 2014/11/11 22:27:15]

Done.

+  AttachmentList attachments;
+  attachments.push_back(attachment);
+  store_->Write(attachments,
+                base::Bind(&OnDiskAttachmentStoreSpecificTest::CopyResult,
+                           base::Unretained(this), &result));
+  RunLoop();
+  EXPECT_EQ(result, AttachmentStore::SUCCESS);
+
+  // Read attachment.
+  AttachmentIdList attachment_ids;
+  attachment_ids.push_back(attachment.GetId());
+  store_->Read(
+      attachment_ids,
+      base::Bind(&OnDiskAttachmentStoreSpecificTest::CopyResultAttachments,
+                 base::Unretained(this), &result));
+  RunLoop();
+  EXPECT_EQ(result, AttachmentStore::UNSPECIFIED_ERROR);
+}
+
 }  // namespace syncer