Store attachment crc in AttachmentStore

sync/internal_api/attachments/attachment_service_impl_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/attachment_service_impl.h"
 
 #include "base/bind.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/timer/mock_timer.h"
+#include "sync/internal_api/public/attachments/attachment_util.h"
 #include "sync/internal_api/public/attachments/fake_attachment_downloader.h"
 #include "sync/internal_api/public/attachments/fake_attachment_uploader.h"
 #include "testing/gmock/include/gmock/gmock-matchers.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace syncer {
 
 namespace {
 
 class MockAttachmentStore : public AttachmentStore,
@@ skipping 26 matching lines @@
     AttachmentIdList ids = read_ids.back();
     read_callbacks.pop_back();
     read_ids.pop_back();
 
     scoped_ptr<AttachmentMap> attachments(new AttachmentMap());
     scoped_ptr<AttachmentIdList> unavailable_attachments(
         new AttachmentIdList());
     for (AttachmentIdList::const_iterator iter = ids.begin(); iter != ids.end();
          ++iter) {
       if (local_attachments.find(*iter) != local_attachments.end()) {
-        Attachment attachment = Attachment::CreateWithId(*iter, data);
+        uint32_t crc = ComputeCrc32c(data);

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

crc -> crc32c (and elsewhere in this file)

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

Done.

+        Attachment attachment = Attachment::RestoreExisting(*iter, data, crc);
         attachments->insert(std::make_pair(*iter, attachment));
       } else {
         unavailable_attachments->push_back(*iter);
       }
     }
     Result result =
         unavailable_attachments->empty() ? SUCCESS : UNSPECIFIED_ERROR;
 
     base::MessageLoop::current()->PostTask(
         FROM_HERE,
@@ skipping 36 matching lines @@
     download_requests.insert(std::make_pair(id, callback));
   }
 
   // Multiple requests to download will be active at the same time.
   // RespondToDownload should respond to only one of them.
   void RespondToDownload(const AttachmentId& id, const DownloadResult& result) {
     ASSERT_TRUE(download_requests.find(id) != download_requests.end());
     scoped_ptr<Attachment> attachment;
     if (result == DOWNLOAD_SUCCESS) {
       scoped_refptr<base::RefCountedString> data = new base::RefCountedString();
-      attachment.reset(new Attachment(Attachment::CreateWithId(id, data)));
+      uint32_t crc = ComputeCrc32c(data);
+      attachment.reset(
+          new Attachment(Attachment::RestoreExisting(id, data, crc)));
     }
     base::MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(download_requests[id], result, base::Passed(&attachment)));
 
     download_requests.erase(id);
   }
 
   std::map<AttachmentId, DownloadCallback> download_requests;
 
@@ skipping 422 matching lines @@
   net::NetworkChangeNotifier::NotifyObserversOfNetworkChangeForTests(
       net::NetworkChangeNotifier::CONNECTION_WIFI);
   RunLoop();
 
   // No longer in backoff.
   ASSERT_TRUE(mock_timer()->IsRunning());
   ASSERT_EQ(base::TimeDelta(), mock_timer()->GetCurrentDelay());
 }
 
 }  // namespace syncer