Convert various vector_as_array calls to vector::data.

media/cdm/ppapi/external_clear_key/clear_key_cdm.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/ppapi/external_clear_key/clear_key_cdm.h"
 
 #include <algorithm>
 #include <cstring>
 #include <sstream>
 
 #include "base/bind.h"
 #include "base/logging.h"
-#include "base/stl_util.h"
 #include "base/time/time.h"
 #include "base/trace_event/trace_event.h"
 #include "media/base/cdm_callback_promise.h"
 #include "media/base/cdm_key_information.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/decrypt_config.h"
 #include "media/base/key_systems.h"
 #include "media/cdm/json_web_key.h"
 #include "media/cdm/ppapi/cdm_file_io_test.h"
 #include "media/cdm/ppapi/external_clear_key/cdm_video_decoder.h"
@@ skipping 173 matching lines @@
 }
 
 // Shallow copy all the key information from |keys_info| into |keys_vector|.
 // |keys_vector| is only valid for the lifetime of |keys_info| because it
 // contains pointers into the latter.
 void ConvertCdmKeysInfo(const std::vector<media::CdmKeyInformation*>& keys_info,
                         std::vector<cdm::KeyInformation>* keys_vector) {
   keys_vector->reserve(keys_info.size());
   for (const auto& key_info : keys_info) {
     cdm::KeyInformation key;
-    key.key_id = vector_as_array(&key_info->key_id);
+    key.key_id = key_info->key_id.data();
     key.key_id_size = key_info->key_id.size();
     key.status = ConvertKeyStatus(key_info->status);
     key.system_code = key_info->system_code;
     keys_vector->push_back(key);
   }
 }
 
 void INITIALIZE_CDM_MODULE() {
   DVLOG(1) << __FUNCTION__;
 #if defined(CLEAR_KEY_CDM_USE_FFMPEG_DECODER)
@@ skipping 522 matching lines @@
     }
 
     // Loadable session has already been created, so pass this event on,
     // using the session_id callers expect to see.
     new_session_id = std::string(kLoadableSessionId);
   }
 
   std::vector<cdm::KeyInformation> keys_vector;
   ConvertCdmKeysInfo(keys_info.get(), &keys_vector);
   host_->OnSessionKeysChange(new_session_id.data(), new_session_id.length(),
-                             has_additional_usable_key,
-                             vector_as_array(&keys_vector), keys_vector.size());
+                             has_additional_usable_key, keys_vector.data(),
+                             keys_vector.size());
 }
 
 void ClearKeyCdm::OnSessionClosed(const std::string& session_id) {
   std::string new_session_id = session_id;
   if (new_session_id == session_id_for_emulated_loadsession_)
     new_session_id = std::string(kLoadableSessionId);
   host_->OnSessionClosed(new_session_id.data(), new_session_id.length());
 }
 
 void ClearKeyCdm::OnSessionCreated(uint32 promise_id,
@@ skipping 43 matching lines @@
   // TODO(jrummell): Once the order of events is fixed in the spec, either
   // require the keyschange event to have happened, or remove this code.
   // http://crbug.com/448225
   if (has_received_keys_change_event_for_emulated_loadsession_) {
     std::vector<cdm::KeyInformation> keys_vector;
     CdmKeysInfo keys_info;
     keys_info.swap(keys_info_for_emulated_loadsession_);
     has_received_keys_change_event_for_emulated_loadsession_ = false;
     DCHECK(!keys_vector.empty());
     ConvertCdmKeysInfo(keys_info.get(), &keys_vector);
-    host_->OnSessionKeysChange(
-        kLoadableSessionId, strlen(kLoadableSessionId), !keys_vector.empty(),
-        vector_as_array(&keys_vector), keys_vector.size());
+    host_->OnSessionKeysChange(kLoadableSessionId, strlen(kLoadableSessionId),
+                               !keys_vector.empty(), keys_vector.data(),
+                               keys_vector.size());
   }
 }
 
 void ClearKeyCdm::OnPromiseResolved(uint32 promise_id) {
   host_->OnResolvePromise(promise_id);
 }
 
 void ClearKeyCdm::OnPromiseFailed(uint32 promise_id,
                                   MediaKeys::Exception exception_code,
                                   uint32 system_code,
@@ skipping 74 matching lines @@
 void ClearKeyCdm::OnFileIOTestComplete(bool success) {
   DVLOG(1) << __FUNCTION__ << ": " << success;
   std::string message = GetFileIOTestResultMessage(success);
   host_->OnSessionMessage(last_session_id_.data(), last_session_id_.length(),
                           cdm::kLicenseRequest, message.data(),
                           message.length(), NULL, 0);
   file_io_test_runner_.reset();
 }
 
 }  // namespace media