Mojom updates for Motown.

services/media/common/media_pipe_base.cc

Index: services/media/common/media_pipe_base.cc
diff --git a/services/media/common/media_pipe_base.cc b/services/media/common/media_pipe_base.cc
index 8ae12b6c558373b34d115bedf8d45cb46c77ef19..b80c3d65274b4e14fff8dc3cc757c2c545f324bd 100644
--- a/services/media/common/media_pipe_base.cc
+++ b/services/media/common/media_pipe_base.cc
@@ -101,6 +101,8 @@ void MediaPipeBase::SendPacket(MediaPacketPtr packet,
   // of the shared buffer.  If any does not, this send operation is not valid.
   const MediaPacketRegionPtr* r = &packet->payload;
   size_t i = 0;
+  size_t extra_payload_size =
+      packet->extra_payload.is_null() ? 0 : packet->extra_payload.size();
   while (true) {
     if ((*r).is_null()) {
       cbk.Run(MediaResult::INVALID_ARGUMENT);
@@ -114,10 +116,11 @@ void MediaPipeBase::SendPacket(MediaPacketPtr packet,
       return;
     }
 
-    if (i >= packet->extra_payload.size()) {
+    if (i >= extra_payload_size) {
       break;
     }
 
+    DCHECK(packet->extra_payload);
     r = &packet->extra_payload[i++];
   }
 
@@ -156,7 +159,6 @@ MediaPipeBase::MediaPacketState::MediaPacketState(
   , result_(MediaResult::OK) {
   DCHECK(packet_);
   DCHECK(packet_->payload);
-  DCHECK(packet_->extra_payload);
 }
 
 MediaPipeBase::MediaPacketState::~MediaPacketState() {