media: Rename MediaKeys to ContentDecryptionModule

media/base/android/media_player_android.cc

 // Copyright (c) 2013 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/media_player_android.h"
 
 #include <algorithm>
 
 #include "base/android/context_utils.h"
 #include "base/android/scoped_java_ref.h"
@@ skipping 57 matching lines @@
 }
 
 GURL MediaPlayerAndroid::GetUrl() {
   return GURL();
 }
 
 GURL MediaPlayerAndroid::GetFirstPartyForCookies() {
   return GURL();
 }
 
-void MediaPlayerAndroid::SetCdm(const scoped_refptr<MediaKeys>& /* cdm */) {
+void MediaPlayerAndroid::SetCdm(
+    const scoped_refptr<ContentDecryptionModule>& /* cdm */) {
   // Players that support EME should override this.
   LOG(ERROR) << "EME not supported on base MediaPlayerAndroid class.";
   return;
 }
 
 void MediaPlayerAndroid::OnVideoSizeChanged(int width, int height) {
   manager_->OnVideoSizeChanged(player_id(), width, height);
 }
 
 void MediaPlayerAndroid::OnMediaError(int error_type) {
@@ skipping 31 matching lines @@
 void MediaPlayerAndroid::DestroyListenerOnUIThread() {
   weak_factory_.InvalidateWeakPtrs();
   listener_.reset();
 }
 
 base::WeakPtr<MediaPlayerAndroid> MediaPlayerAndroid::WeakPtrForUIThread() {
   return weak_factory_.GetWeakPtr();
 }
 
 }  // namespace media