media: Rename MediaKeys to ContentDecryptionModule

media/base/android/android_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/base/android/android_cdm_factory.h"
 
 #include "base/feature_list.h"
 #include "base/strings/string_number_conversions.h"
 #include "media/base/android/media_drm_bridge.h"
 #include "media/base/bind_to_current_loop.h"
@@ skipping 26 matching lines @@
 
   if (!security_origin.is_valid()) {
     bound_cdm_created_cb.Run(nullptr, "Invalid origin.");
     return;
   }
 
   // Create AesDecryptor here to support External Clear Key key system.
   // This is used for testing.
   if (base::FeatureList::IsEnabled(media::kExternalClearKeyForTesting) &&
       IsExternalClearKey(key_system)) {
-    scoped_refptr<MediaKeys> cdm(
+    scoped_refptr<ContentDecryptionModule> cdm(

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

nit: Should include content_decryption_module.h since it's not included and the
matching .h file isn't in this change?

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

Done.

         new AesDecryptor(security_origin, session_message_cb, session_closed_cb,
                          session_keys_change_cb));
     bound_cdm_created_cb.Run(cdm, "");
     return;
   }
 
   std::string error_message;
 
   if (!MediaDrmBridge::IsKeySystemSupported(key_system)) {
     error_message = "Key system not supported unexpectedly: " + key_system;
@@ skipping 28 matching lines @@
     LOG(ERROR) << error_message;
     bound_cdm_created_cb.Run(nullptr, error_message);
     return;
   }
 
   // Success!
   bound_cdm_created_cb.Run(cdm, "");
 }
 
 }  // namespace media