Inject CanAddURLToHistory into TopSitesImpl

media/mojo/services/mojo_cdm_service.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/mojo/services/mojo_cdm_service.h"
 
 #include "base/bind.h"
 #include "media/base/cdm_key_information.h"
 #include "media/base/key_systems.h"
 #include "media/cdm/aes_decryptor.h"
@@ skipping 29 matching lines @@
 }
 
 void MojoCdmService::SetClient(mojo::ContentDecryptionModuleClientPtr client) {
   client_ = client.Pass();
 }
 
 // mojo::MediaRenderer implementation.
 void MojoCdmService::SetServerCertificate(
     mojo::Array<uint8_t> certificate_data,
     const mojo::Callback<void(mojo::CdmPromiseResultPtr)>& callback) {
-  const std::vector<uint8_t>& certificate_data_vector =
-      certificate_data.storage();
   cdm_->SetServerCertificate(
-      certificate_data_vector.empty() ? nullptr : &certificate_data_vector[0],
-      certificate_data_vector.size(),
+      certificate_data.storage(),
       scoped_ptr<SimpleCdmPromise>(new SimpleMojoCdmPromise(callback)));
 }
 
 void MojoCdmService::CreateSessionAndGenerateRequest(
     mojo::ContentDecryptionModule::SessionType session_type,
     mojo::ContentDecryptionModule::InitDataType init_data_type,
     mojo::Array<uint8_t> init_data,
     const mojo::Callback<void(mojo::CdmPromiseResultPtr, mojo::String)>&
         callback) {
-  const std::vector<uint8_t>& init_data_vector = init_data.storage();
   cdm_->CreateSessionAndGenerateRequest(
       static_cast<MediaKeys::SessionType>(session_type),
-      static_cast<EmeInitDataType>(init_data_type),
-      init_data_vector.empty() ? nullptr : &init_data_vector[0],
-      init_data_vector.size(),
+      static_cast<EmeInitDataType>(init_data_type), init_data.storage(),
       scoped_ptr<NewSessionCdmPromise>(new NewSessionMojoCdmPromise(callback)));
 }
 
 void MojoCdmService::LoadSession(
     mojo::ContentDecryptionModule::SessionType session_type,
     const mojo::String& session_id,
     const mojo::Callback<void(mojo::CdmPromiseResultPtr, mojo::String)>&
         callback) {
   cdm_->LoadSession(
       static_cast<MediaKeys::SessionType>(session_type),
       session_id.To<std::string>(),
       scoped_ptr<NewSessionCdmPromise>(new NewSessionMojoCdmPromise(callback)));
 }
 
 void MojoCdmService::UpdateSession(
     const mojo::String& session_id,
     mojo::Array<uint8_t> response,
     const mojo::Callback<void(mojo::CdmPromiseResultPtr)>& callback) {
-  const std::vector<uint8_t>& response_vector = response.storage();
   cdm_->UpdateSession(
-      session_id.To<std::string>(),
-      response_vector.empty() ? nullptr : &response_vector[0],
-      response_vector.size(),
+      session_id.To<std::string>(), response.storage(),
       scoped_ptr<SimpleCdmPromise>(new SimpleMojoCdmPromise(callback)));
 }
 
 void MojoCdmService::CloseSession(
     const mojo::String& session_id,
     const mojo::Callback<void(mojo::CdmPromiseResultPtr)>& callback) {
   cdm_->CloseSession(
       session_id.To<std::string>(),
       scoped_ptr<SimpleCdmPromise>(new SimpleMojoCdmPromise(callback)));
 }
@@ skipping 46 matching lines @@
 void MojoCdmService::OnLegacySessionError(const std::string& session_id,
                                           MediaKeys::Exception exception,
                                           uint32_t system_code,
                                           const std::string& error_message) {
   client_->OnLegacySessionError(session_id,
                                 static_cast<mojo::CdmException>(exception),
                                 system_code, error_message);
 }
 
 }  // namespace media