Wrap MediaMetadata in base::Optional in content and chrome

content/browser/media/android/browser_media_session_manager.cc

 // Copyright 2015 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 "content/browser/media/android/browser_media_session_manager.h"
 
 #include "content/browser/media/session/media_session.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/media/media_metadata_sanitizer.h"
 #include "content/common/media/media_session_messages_android.h"
@@ skipping 12 matching lines @@
   Send(new MediaSessionMsg_DidActivate(GetRoutingID(), request_id, false));
 }
 
 void BrowserMediaSessionManager::OnDeactivate(int session_id, int request_id) {
   NOTIMPLEMENTED();
   Send(new MediaSessionMsg_DidDeactivate(GetRoutingID(), 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;
   }
 
   NOTIMPLEMENTED();
 }
 
 int BrowserMediaSessionManager::GetRoutingID() const {
   return render_frame_host_->GetRoutingID();
 }
 
 bool BrowserMediaSessionManager::Send(IPC::Message* msg) {
   return render_frame_host_->Send(msg);
 }
 
 }  // namespace content