Index: content/renderer/media/android/renderer_media_session_manager.cc |
diff --git a/content/renderer/media/android/renderer_media_session_manager.cc b/content/renderer/media/android/renderer_media_session_manager.cc |
index b5331c7472a30cacc4582ef5b350b0a0c67a6615..da956eced8f2b9f819e53f15287e3ae5ee6b5c55 100644 |
--- a/content/renderer/media/android/renderer_media_session_manager.cc |
+++ b/content/renderer/media/android/renderer_media_session_manager.cc |
@@ -5,6 +5,7 @@ |
#include "content/renderer/media/android/renderer_media_session_manager.h" |
#include "base/logging.h" |
+#include "content/common/media/media_metadata_sanitizer.h" |
#include "content/common/media/media_session_messages_android.h" |
#include "content/public/common/media_metadata.h" |
#include "content/public/renderer/render_thread.h" |
@@ -65,18 +66,13 @@ void RendererMediaSessionManager::Deactivate( |
void RendererMediaSessionManager::SetMetadata( |
int session_id, |
const MediaMetadata& metadata) { |
- // Apply some sanity checks on the MediaMetadata before sending over IPC. |
- MediaMetadata ipc_metadata; |
- ipc_metadata.title = |
- metadata.title.substr(0, MediaMetadata::kMaxIPCStringLength); |
- ipc_metadata.artist = |
- metadata.artist.substr(0, MediaMetadata::kMaxIPCStringLength); |
- ipc_metadata.album = |
- metadata.album.substr(0, MediaMetadata::kMaxIPCStringLength); |
- |
- Send(new MediaSessionHostMsg_SetMetadata(routing_id(), |
- session_id, |
- ipc_metadata)); |
+ |
+ // TODO(zqzhang): print a console warning when metadata is dirty. See |
+ // https://crbug.com/625244. |
+ Send(new MediaSessionHostMsg_SetMetadata( |
+ routing_id(), session_id, |
+ MediaMetadataSanitizer::CheckSanity(metadata) ? |
+ metadata : MediaMetadataSanitizer::Sanitize(metadata))); |
} |
void RendererMediaSessionManager::OnDidActivate(int request_id, bool success) { |