Mojom updates for Motown.

services/media/common/media_pipe_base.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 "base/logging.h"
 #include "services/media/common/media_pipe_base.h"
 
 namespace mojo {
 namespace media {
 
@@ skipping 83 matching lines @@
   if (!buffer_) {
     cbk.Run(MediaResult::BAD_STATE);
     return;
   }
   DCHECK(buffer_size_);
 
   // The offset(s) and size(s) of this payload must to reside within the space
   // 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);
       return;
     }
 
     auto offset = (*r)->offset;
     auto length = (*r)->length;
     if ((offset > buffer_size_) || (length > (buffer_size_ - offset))) {
       cbk.Run(MediaResult::INVALID_ARGUMENT);
       return;
     }
 
-    if (i >= packet->extra_payload.size()) {
+    if (i >= extra_payload_size) {
       break;
     }
 
+    DCHECK(packet->extra_payload);
     r = &packet->extra_payload[i++];
   }
 
   // Looks good, send this packet up to the implementation layer.
   MediaPacketStatePtr ptr(new MediaPacketState(packet.Pass(), cbk));
   OnPacketReceived(std::move(ptr));
 }
 
 void MediaPipeBase::Flush(const FlushCallback& cbk) {
   // If we have not been successfully initialized, then we should not be getting
@@ skipping 18 matching lines @@
 }
 
 MediaPipeBase::MediaPacketState::MediaPacketState(
     MediaPacketPtr packet,
     const SendPacketCallback& cbk)
   : packet_(packet.Pass())
   , cbk_(cbk)
   , result_(MediaResult::OK) {
   DCHECK(packet_);
   DCHECK(packet_->payload);
-  DCHECK(packet_->extra_payload);
 }
 
 MediaPipeBase::MediaPacketState::~MediaPacketState() {
   cbk_.Run(result_);
 }
 
 void MediaPipeBase::MediaPacketState::SetResult(MediaResult result) {
   MediaResult tmp = MediaResult::OK;
   result_.compare_exchange_strong(tmp, result);
 }
 
 }  // namespace media
 }  // namespace mojo