Remove stl_util's deletion functions from media/.

media/formats/webm/webm_content_encodings_client.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/webm_content_encodings_client.h"
 
 #include "base/logging.h"
-#include "base/stl_util.h"
 #include "media/formats/webm/webm_constants.h"
 
 namespace media {
 
 WebMContentEncodingsClient::WebMContentEncodingsClient(
     const scoped_refptr<MediaLog>& media_log)
     : media_log_(media_log),
       content_encryption_encountered_(false),
       content_encodings_ready_(false) {
 }
 
 WebMContentEncodingsClient::~WebMContentEncodingsClient() {
-  base::STLDeleteElements(&content_encodings_);
 }
 
 const ContentEncodings& WebMContentEncodingsClient::content_encodings() const {
   DCHECK(content_encodings_ready_);
   return content_encodings_;
 }
 
 WebMParserClient* WebMContentEncodingsClient::OnListStart(int id) {
   if (id == kWebMIdContentEncodings) {
     DCHECK(!cur_content_encoding_.get());
     DCHECK(!content_encryption_encountered_);
-    base::STLDeleteElements(&content_encodings_);
+    content_encodings_.clear();
     content_encodings_ready_ = false;
     return this;
   }
 
   if (id == kWebMIdContentEncoding) {
     DCHECK(!cur_content_encoding_.get());
     DCHECK(!content_encryption_encountered_);
     cur_content_encoding_.reset(new ContentEncoding());
     return this;
   }
@@ skipping 61 matching lines @@
     }
 
     // Enforce mandatory elements without default values.
     DCHECK(cur_content_encoding_->type() == ContentEncoding::kTypeEncryption);
     if (!content_encryption_encountered_) {
       MEDIA_LOG(ERROR, media_log_) << "ContentEncodingType is encryption but"
                                    << " ContentEncryption is missing.";
       return false;
     }
 
-    content_encodings_.push_back(cur_content_encoding_.release());
+    content_encodings_.push_back(std::move(cur_content_encoding_));
     content_encryption_encountered_ = false;
     return true;
   }
 
   if (id == kWebMIdContentEncryption) {
     DCHECK(cur_content_encoding_.get());
     // Specify default value for elements that are not present.
     if (cur_content_encoding_->encryption_algo() ==
         ContentEncoding::kEncAlgoInvalid) {
       cur_content_encoding_->set_encryption_algo(
@@ skipping 141 matching lines @@
     cur_content_encoding_->SetEncryptionKeyId(data, size);
     return true;
   }
 
   // This should not happen if WebMListParser is working properly.
   DCHECK(false);
   return false;
 }
 
 }  // namespace media