media: Rename MediaKeys to ContentDecryptionModule

media/mojo/clients/mojo_cdm_factory.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/mojo/clients/mojo_cdm_factory.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 30 matching lines @@
     return;
   }
 
 // When MojoRenderer is used, the real Renderer is running in a remote process,
 // which cannot use an AesDecryptor running locally. In this case, always
 // create the MojoCdm, giving the remote CDM a chance to handle |key_system|.
 // Note: We should not run AesDecryptor in the browser process except for
 // testing. See http://crbug.com/441957
 #if !defined(ENABLE_MOJO_RENDERER)
   if (CanUseAesDecryptor(key_system)) {
-    scoped_refptr<MediaKeys> cdm(
+    scoped_refptr<ContentDecryptionModule> cdm(

[jrummell, 2016/12/12 22:08:40]

nit: Should probably include content_decryption_module.h.

[xhwang, 2016/12/12 22:32:51]

Done.

         new AesDecryptor(security_origin, session_message_cb, session_closed_cb,
                          session_keys_change_cb));
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE, base::Bind(cdm_created_cb, cdm, ""));
     return;
   }
 #endif
 
   mojom::ContentDecryptionModulePtr cdm_ptr;
   service_manager::GetInterface<mojom::ContentDecryptionModule>(
       interface_provider_, &cdm_ptr);
 
   MojoCdm::Create(key_system, security_origin, cdm_config, std::move(cdm_ptr),
                   session_message_cb, session_closed_cb, session_keys_change_cb,
                   session_expiration_update_cb, cdm_created_cb);
 }
 
 }  // namespace media