Revert of Remove ScopedVector from all other codes in media/

media/cdm/aes_decryptor_unittest.cc

 // Copyright 2013 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/cdm/aes_decryptor.h"
 
 #include <stdint.h>
 #include <memory>
 #include <string>
 #include <vector>
@@ skipping 369 matching lines @@
         .Times(AtMost(1));
 
     cdm_->UpdateSession(session_id,
                         std::vector<uint8_t>(key.begin(), key.end()),
                         CreatePromise(expected_result));
   }
 
   bool KeysInfoContains(const std::vector<uint8_t>& expected_key_id,
                         CdmKeyInformation::KeyStatus expected_status =
                             CdmKeyInformation::USABLE) {
-    for (auto& key_id : cdm_client_.keys_info()) {
+    for (auto* key_id : cdm_client_.keys_info()) {
       if (key_id->key_id == expected_key_id &&
           key_id->status == expected_status) {
         return true;
       }
     }
     return false;
   }
 
   MOCK_METHOD2(BufferDecrypted, void(Decryptor::Status,
                                      const scoped_refptr<DecoderBuffer>&));
@@ skipping 651 matching lines @@
 INSTANTIATE_TEST_CASE_P(CdmAdapter,
                         AesDecryptorTest,
                         testing::Values("CdmAdapter"));
 #endif
 
 // TODO(jrummell): Once MojoCdm/MojoCdmService/MojoDecryptor/
 // MojoDecryptorService are implemented, add a third version that tests the
 // CDM via mojo.
 
 }  // namespace media