Remove ScopedVector from content/browser/ [1].

content/browser/speech/chunked_byte_buffer.cc

 // Copyright (c) 2012 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 "content/browser/speech/chunked_byte_buffer.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/lazy_instance.h"
@@ skipping 60 matching lines @@
     insert_target->insert(insert_target->end(),
                           next_data,
                           next_data + insert_length);
     next_data += insert_length;
     remaining_bytes -= insert_length;
 
     if (header_completed) {
       DCHECK_EQ(partial_chunk_->header.size(), kHeaderLength);
       if (partial_chunk_->ExpectedContentLength() == 0) {
         // Handle zero-byte chunks.
-        chunks_.push_back(partial_chunk_.release());
+        chunks_.push_back(std::move(partial_chunk_));
         partial_chunk_.reset(new Chunk());
       } else {
         partial_chunk_->content->reserve(
             partial_chunk_->ExpectedContentLength());
       }
     } else if (content_completed) {
       DCHECK_EQ(partial_chunk_->content->size(),
                 partial_chunk_->ExpectedContentLength());
-      chunks_.push_back(partial_chunk_.release());
+      chunks_.push_back(std::move(partial_chunk_));
       partial_chunk_.reset(new Chunk());
     }
   }
   DCHECK_EQ(next_data, start + length);
   total_bytes_stored_ += length;
 }
 
 void ChunkedByteBuffer::Append(const std::string& string) {
   Append(reinterpret_cast<const uint8_t*>(string.data()), string.size());
 }
 
 bool ChunkedByteBuffer::HasChunks() const {
   return !chunks_.empty();
 }
 
 std::unique_ptr<std::vector<uint8_t>> ChunkedByteBuffer::PopChunk() {
   if (chunks_.empty())
     return std::unique_ptr<std::vector<uint8_t>>();
-  std::unique_ptr<Chunk> chunk(*chunks_.begin());
-  chunks_.weak_erase(chunks_.begin());
+  std::unique_ptr<Chunk> chunk = std::move(*chunks_.begin());
+  chunks_.erase(chunks_.begin());
   DCHECK_EQ(chunk->header.size(), kHeaderLength);
   DCHECK_EQ(chunk->content->size(), chunk->ExpectedContentLength());
   total_bytes_stored_ -= chunk->content->size();
   total_bytes_stored_ -= kHeaderLength;
   return std::move(chunk->content);
 }
 
 void ChunkedByteBuffer::Clear() {
   chunks_.clear();
   partial_chunk_.reset(new Chunk());
   total_bytes_stored_ = 0;
 }
 
 ChunkedByteBuffer::Chunk::Chunk() : content(new std::vector<uint8_t>()) {}
 
 ChunkedByteBuffer::Chunk::~Chunk() {
 }
 
 size_t ChunkedByteBuffer::Chunk::ExpectedContentLength() const {
   DCHECK_EQ(header.size(), kHeaderLength);
   return static_cast<size_t>(ReadBigEndian32(&header[0]));
 }
 
 }  // namespace content