Wrap MediaMetadata in base::Optional in content and chrome

content/renderer/media/android/renderer_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/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"
 #include "content/public/renderer/render_thread.h"
 #include "content/renderer/media/android/webmediasession_android.h"
 
 namespace content {
 
 RendererMediaSessionManager::RendererMediaSessionManager(
     RenderFrame* render_frame)
@@ skipping 39 matching lines @@
 
 void RendererMediaSessionManager::Deactivate(
     int session_id,
     std::unique_ptr<blink::WebMediaSessionDeactivateCallback> callback) {
   int request_id = pending_deactivation_requests_.Add(callback.release());
   Send(
       new MediaSessionHostMsg_Deactivate(routing_id(), session_id, request_id));
 }
 
 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) {
   DCHECK(pending_activation_requests_.Lookup(request_id)) << request_id;
   blink::WebMediaSessionActivateCallback* callback =
       pending_activation_requests_.Lookup(request_id);
   if (success) {
     callback->onSuccess();
   } else {
     callback->onError(
         blink::WebMediaSessionError(blink::WebMediaSessionError::Activate));
   }
   pending_activation_requests_.Remove(request_id);
 }
 
 void RendererMediaSessionManager::OnDidDeactivate(int request_id) {
   DCHECK(pending_deactivation_requests_.Lookup(request_id)) << request_id;
   pending_deactivation_requests_.Lookup(request_id)->onSuccess();
   pending_deactivation_requests_.Remove(request_id);
 }
 
 }  // namespace content