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

media/formats/webm/cluster_builder.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 "media/formats/webm/cluster_builder.h"
 
+#include <utility>
+
 #include "base/logging.h"
 #include "media/base/data_buffer.h"
 #include "media/formats/webm/webm_constants.h"
 
 namespace media {
 
 static const uint8_t kClusterHeader[] = {
     0x1F, 0x43, 0xB6, 0x75,                          // CLUSTER ID
     0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // cluster(size = 0)
     0xE7,                                            // Timecode ID
@@ skipping 31 matching lines @@
 
   kBlockGroupSizeOffset = 1,
   kBlockGroupWithoutBlockDurationBlockSizeOffset = 10,
   kBlockGroupDurationOffset = 11,
   kBlockGroupBlockSizeOffset = 20,
 
   kInitialBufferSize = 32768,
 };
 
 Cluster::Cluster(scoped_ptr<uint8_t[]> data, int size)
-    : data_(data.Pass()), size_(size) {}
+    : data_(std::move(data)), size_(size) {}
 Cluster::~Cluster() {}
 
 ClusterBuilder::ClusterBuilder() { Reset(); }
 ClusterBuilder::~ClusterBuilder() {}
 
 void ClusterBuilder::SetClusterTimecode(int64_t cluster_timecode) {
   DCHECK_EQ(cluster_timecode_, -1);
 
   cluster_timecode_ = cluster_timecode;
 
@@ skipping 113 matching lines @@
   buf[2] = timecode_delta & 0xff;
   buf[3] = flags & 0xff;
   memcpy(buf + 4, data, size);
 }
 
 scoped_ptr<Cluster> ClusterBuilder::Finish() {
   DCHECK_NE(cluster_timecode_, -1);
 
   UpdateUInt64(kClusterSizeOffset, bytes_used_ - (kClusterSizeOffset + 8));
 
-  scoped_ptr<Cluster> ret(new Cluster(buffer_.Pass(), bytes_used_));
+  scoped_ptr<Cluster> ret(new Cluster(std::move(buffer_), bytes_used_));
   Reset();
-  return ret.Pass();
+  return ret;
 }
 
 scoped_ptr<Cluster> ClusterBuilder::FinishWithUnknownSize() {
   DCHECK_NE(cluster_timecode_, -1);
 
   UpdateUInt64(kClusterSizeOffset, kWebMUnknownSize);
 
-  scoped_ptr<Cluster> ret(new Cluster(buffer_.Pass(), bytes_used_));
+  scoped_ptr<Cluster> ret(new Cluster(std::move(buffer_), bytes_used_));
   Reset();
-  return ret.Pass();
+  return ret;
 }
 
 void ClusterBuilder::Reset() {
   buffer_size_ = kInitialBufferSize;
   buffer_.reset(new uint8_t[buffer_size_]);
   memcpy(buffer_.get(), kClusterHeader, sizeof(kClusterHeader));
   bytes_used_ = sizeof(kClusterHeader);
   cluster_timecode_ = -1;
 }
 
@@ skipping 15 matching lines @@
   uint8_t* buf = buffer_.get() + offset;
 
   // Fill the last 7 bytes of size field in big-endian order.
   for (int i = 7; i > 0; i--) {
     buf[i] = value & 0xff;
     value >>= 8;
   }
 }
 
 }  // namespace media