Convert various vector_as_array calls to vector::data.

media/cdm/cdm_adapter.cc

 // Copyright 2015 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/cdm_adapter.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
-#include "base/stl_util.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "media/base/cdm_context.h"
 #include "media/base/cdm_initialized_promise.h"
 #include "media/base/cdm_key_information.h"
 #include "media/base/limits.h"
 #include "media/cdm/cdm_wrapper.h"
 
 namespace media {
 
@@ skipping 236 matching lines @@
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   if (certificate.size() < limits::kMinCertificateLength ||
       certificate.size() > limits::kMaxCertificateLength) {
     promise->reject(MediaKeys::INVALID_ACCESS_ERROR, 0,
                     "Incorrect certificate.");
     return;
   }
 
   uint32_t promise_id = cdm_promise_adapter_.SavePromise(promise.Pass());
-  cdm_->SetServerCertificate(promise_id, vector_as_array(&certificate),
+  cdm_->SetServerCertificate(promise_id, certificate.data(),
                              certificate.size());
 }
 
 void CdmAdapter::CreateSessionAndGenerateRequest(
     SessionType session_type,
     EmeInitDataType init_data_type,
     const std::vector<uint8_t>& init_data,
     scoped_ptr<NewSessionCdmPromise> promise) {
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   uint32_t promise_id = cdm_promise_adapter_.SavePromise(promise.Pass());
   cdm_->CreateSessionAndGenerateRequest(
       promise_id, MediaSessionTypeToCdmSessionType(session_type),
-      MediaInitDataTypeToCdmInitDataType(init_data_type),
-      vector_as_array(&init_data), init_data.size());
+      MediaInitDataTypeToCdmInitDataType(init_data_type), init_data.data(),
+      init_data.size());
 }
 
 void CdmAdapter::LoadSession(SessionType session_type,
                              const std::string& session_id,
                              scoped_ptr<NewSessionCdmPromise> promise) {
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   uint32_t promise_id = cdm_promise_adapter_.SavePromise(promise.Pass());
   cdm_->LoadSession(promise_id, MediaSessionTypeToCdmSessionType(session_type),
                     session_id.data(), session_id.size());
 }
 
 void CdmAdapter::UpdateSession(const std::string& session_id,
                                const std::vector<uint8_t>& response,
                                scoped_ptr<SimpleCdmPromise> promise) {
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(!session_id.empty());
   DCHECK(!response.empty());
 
   uint32_t promise_id = cdm_promise_adapter_.SavePromise(promise.Pass());
   cdm_->UpdateSession(promise_id, session_id.data(), session_id.size(),
-                      vector_as_array(&response), response.size());
+                      response.data(), response.size());
 }
 
 void CdmAdapter::CloseSession(const std::string& session_id,
                               scoped_ptr<SimpleCdmPromise> promise) {
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(!session_id.empty());
 
   uint32_t promise_id = cdm_promise_adapter_.SavePromise(promise.Pass());
   cdm_->CloseSession(promise_id, session_id.data(), session_id.size());
 }
@@ skipping 182 matching lines @@
 // The CDM owns the returned object and must call FileIO::Close() to release it.
 cdm::FileIO* CdmAdapter::CreateFileIO(cdm::FileIOClient* client) {
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   // TODO(jrummell): This should use the mojo FileIO client.
   NOTIMPLEMENTED();
   return nullptr;
 }
 
 }  // namespace media