Convert Pass()→std::move() in sync/

sync/internal_api/attachments/on_disk_attachment_store.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 <stdint.h>
-
 #include <string>
+#include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/location.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/sequenced_task_runner.h"
 #include "sync/internal_api/attachments/proto/attachment_store.pb.h"
 #include "sync/internal_api/public/attachments/attachment_util.h"
 #include "sync/protocol/attachments.pb.h"
@@ skipping 372 matching lines @@
   }
   DCHECK(status.ok());
 
   // Upgrade code goes here.
 
   if (metadata.schema_version() != kCurrentSchemaVersion) {
     DVLOG(1) << "Unknown schema version: " << metadata.schema_version();
     return AttachmentStore::UNSPECIFIED_ERROR;
   }
 
-  db_ = db.Pass();
+  db_ = std::move(db);
   return AttachmentStore::SUCCESS;
 }
 
 scoped_ptr<Attachment> OnDiskAttachmentStore::ReadSingleAttachment(
     const AttachmentId& attachment_id,
     AttachmentStore::Component component) {
   scoped_ptr<Attachment> attachment;
   attachment_store_pb::RecordMetadata record_metadata;
   if (!ReadSingleRecordMetadata(attachment_id, &record_metadata)) {
-    return attachment.Pass();
+    return attachment;
   }
   if (!AttachmentHasReferenceFromComponent(record_metadata,
                                            ComponentToProto(component)))
-    return attachment.Pass();
+    return attachment;
 
   const std::string key = MakeDataKeyFromAttachmentId(attachment_id);
   std::string data_str;
   leveldb::Status status = db_->Get(
       MakeNonCachingReadOptions(), key, &data_str);
   if (!status.ok()) {
     DVLOG(1) << "DB::Get for data failed: status=" << status.ToString();
-    return attachment.Pass();
+    return attachment;
   }
   scoped_refptr<base::RefCountedMemory> data =
       base::RefCountedString::TakeString(&data_str);
   uint32_t crc32c = ComputeCrc32c(data);
   if (record_metadata.has_crc32c()) {
     if (record_metadata.crc32c() != crc32c) {
       DVLOG(1) << "Attachment crc32c does not match value read from store";
-      return attachment.Pass();
+      return attachment;
     }
     if (record_metadata.crc32c() != attachment_id.GetCrc32c()) {
       DVLOG(1) << "Attachment crc32c does not match value in AttachmentId";
-      return attachment.Pass();
+      return attachment;
     }
   }
   attachment.reset(
       new Attachment(Attachment::CreateFromParts(attachment_id, data)));
-  return attachment.Pass();
+  return attachment;
 }
 
 bool OnDiskAttachmentStore::WriteSingleAttachment(
     const Attachment& attachment,
     AttachmentStore::Component component) {
   const std::string metadata_key =
       MakeMetadataKeyFromAttachmentId(attachment.GetId());
   const std::string data_key = MakeDataKeyFromAttachmentId(attachment.GetId());
 
   std::string metadata_str;
@@ skipping 80 matching lines @@
   return key;
 }
 
 AttachmentMetadata OnDiskAttachmentStore::MakeAttachmentMetadata(
     const AttachmentId& attachment_id,
     const attachment_store_pb::RecordMetadata& record_metadata) {
   return AttachmentMetadata(attachment_id, record_metadata.attachment_size());
 }
 
 }  // namespace syncer