Wrap MediaMetadata in base::Optional in content and chrome

content/browser/media/android/browser_media_session_manager.cc

Index: content/browser/media/android/browser_media_session_manager.cc
diff --git a/content/browser/media/android/browser_media_session_manager.cc b/content/browser/media/android/browser_media_session_manager.cc
index 80d3173aa5533c49516c16eaa3079e3654d6cfbe..a9fcd80e9ef5d34c2783e77e675923e0fcb2bc30 100644
--- a/content/browser/media/android/browser_media_session_manager.cc
+++ b/content/browser/media/android/browser_media_session_manager.cc
@@ -30,10 +30,11 @@ void BrowserMediaSessionManager::OnDeactivate(int session_id, int request_id) {
 
 void BrowserMediaSessionManager::OnSetMetadata(
     int session_id,
-    const MediaMetadata& insecure_metadata) {
+    const base::Optional<MediaMetadata>& insecure_metadata) {
   // When receiving a MediaMetadata, the browser process can't trust that it is
   // coming from a known and secure source. It must be processed accordingly.
-  if (!MediaMetadataSanitizer::CheckSanity(insecure_metadata)) {
+  if (insecure_metadata &&

[mlamouri (slow - plz ping), 2016/09/01 17:47:49]

Maybe `insecure_metadata.has_value()`

[Zhiqiang Zhang (Slow), 2016/09/02 12:11:41]

Done.

+      !MediaMetadataSanitizer::CheckSanity(insecure_metadata.value())) {
     render_frame_host_->GetProcess()->ShutdownForBadMessage();
     return;
   }