Index: media/base/android/media_source_player_unittest.cc |
diff --git a/media/base/android/media_source_player_unittest.cc b/media/base/android/media_source_player_unittest.cc |
index c730c84792b3c4d056f5a6becd2854b0841b57c2..61fa9393bb184af0a2c4fd166726805ab1f6645c 100644 |
--- a/media/base/android/media_source_player_unittest.cc |
+++ b/media/base/android/media_source_player_unittest.cc |
@@ -72,7 +72,7 @@ class MockMediaPlayerManager : public MediaPlayerManager { |
virtual MediaPlayerAndroid* GetFullscreenPlayer() OVERRIDE { return NULL; } |
virtual MediaPlayerAndroid* GetPlayer(int player_id) OVERRIDE { return NULL; } |
virtual void DestroyAllMediaPlayers() OVERRIDE {} |
- virtual MediaDrmBridge* GetDrmBridge(int cdm_id) OVERRIDE { return NULL; } |
+ virtual MediaKeys* GetCdm(int cdm_id) OVERRIDE { return NULL; } |
virtual void RequestFullScreen(int player_id) OVERRIDE {} |
virtual void OnSessionCreated(int cdm_id, |
uint32 session_id, |
@@ -80,7 +80,7 @@ class MockMediaPlayerManager : public MediaPlayerManager { |
virtual void OnSessionMessage(int cdm_id, |
uint32 session_id, |
const std::vector<uint8>& message, |
- const GURL& destination_url) OVERRIDE {} |
+ const std::string& destination_url) OVERRIDE {} |
virtual void OnSessionReady(int cdm_id, uint32 session_id) OVERRIDE {} |
virtual void OnSessionClosed(int cdm_id, uint32 session_id) OVERRIDE {} |
virtual void OnSessionError(int cdm_id, |