media: Rename MediaKeys to ContentDecryptionModule

media/mojo/services/mojo_renderer_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_renderer_service.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/optional.h"
 #include "media/base/audio_renderer_sink.h"
-#include "media/base/media_keys.h"
+#include "media/base/content_decryption_module.h"
 #include "media/base/media_url_demuxer.h"
 #include "media/base/renderer.h"
 #include "media/base/video_renderer_sink.h"
 #include "media/mojo/services/demuxer_stream_provider_shim.h"
 #include "media/mojo/services/mojo_cdm_service_context.h"
 
 namespace media {
 
 namespace {
 
@@ skipping 111 matching lines @@
 }
 
 void MojoRendererService::SetCdm(int32_t cdm_id,
                                  const SetCdmCallback& callback) {
   if (!mojo_cdm_service_context_) {
     DVLOG(1) << "CDM service context not available.";
     callback.Run(false);
     return;
   }
 
-  scoped_refptr<MediaKeys> cdm = mojo_cdm_service_context_->GetCdm(cdm_id);
+  scoped_refptr<ContentDecryptionModule> cdm =
+      mojo_cdm_service_context_->GetCdm(cdm_id);
   if (!cdm) {
     DVLOG(1) << "CDM not found: " << cdm_id;
     callback.Run(false);
     return;
   }
 
   CdmContext* cdm_context = cdm->GetCdmContext();
   if (!cdm_context) {
     DVLOG(1) << "CDM context not available: " << cdm_id;
     callback.Run(false);
@@ skipping 102 matching lines @@
 }
 
 void MojoRendererService::OnFlushCompleted(const FlushCallback& callback) {
   DVLOG(1) << __func__;
   DCHECK_EQ(state_, STATE_FLUSHING);
   state_ = STATE_PLAYING;
   callback.Run();
 }
 
 void MojoRendererService::OnCdmAttached(
-    scoped_refptr<MediaKeys> cdm,
+    scoped_refptr<ContentDecryptionModule> cdm,
     const base::Callback<void(bool)>& callback,
     bool success) {
   DVLOG(1) << __func__ << "(" << success << ")";
 
   if (success)
     cdm_ = cdm;
 
   callback.Run(success);
 }
 
 void MojoRendererService::InitiateScopedSurfaceRequest(
     const InitiateScopedSurfaceRequestCallback& callback) {
   if (initiate_surface_request_cb_.is_null()) {
     // |renderer_| is likely not of type MediaPlayerRenderer.
     // This is an unexpected call, and the connection should be closed.
     mojo::ReportBadMessage("Unexpected call to InitiateScopedSurfaceRequest.");
 
     // This may cause |this| to be destructed.
     DCHECK(!bad_message_cb_.is_null());
     bad_message_cb_.Run();
 
     return;
   }
 
   callback.Run(initiate_surface_request_cb_.Run());
 }
 
 }  // namespace media