Wrap MediaMetadata in base::Optional in content and chrome

content/renderer/media/android/renderer_media_session_manager.cc

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 da956eced8f2b9f819e53f15287e3ae5ee6b5c55..3bc8b7c99e05c67aae3d333b2ce1c960923dcac5 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 "base/optional.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"
@@ -64,15 +65,16 @@ void RendererMediaSessionManager::Deactivate(
 }
 
 void RendererMediaSessionManager::SetMetadata(
-    int session_id,
-    const MediaMetadata& metadata) {
+    int session_id, const base::Optional<MediaMetadata>& 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)));
+      (!metadata.has_value() ||

[DaleCurtis, 2016/09/06 19:26:07]

Is this what git cl format did? It seems odd.

[Zhiqiang Zhang (Slow), 2016/09/07 10:45:06]

Done.

+       MediaMetadataSanitizer::CheckSanity(metadata.value()))
+      ? metadata
+      : MediaMetadataSanitizer::Sanitize(metadata.value())));
 }
 
 void RendererMediaSessionManager::OnDidActivate(int request_id, bool success) {