BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 5 insertions, 4 deletions

diff --git a/chromium/media/formats/common/offset_byte_queue.cc b/chromium/media/formats/common/offset_byte_queue.cc
index b355e1adf26..831c4d0ffe9 100644
--- a/chromium/media/formats/common/offset_byte_queue.cc
+++ b/chromium/media/formats/common/offset_byte_queue.cc
@@ -4,16 +4,17 @@
 
 #include "media/formats/common/offset_byte_queue.h"
 
+#include "base/check.h"
 #include "base/logging.h"
 
 namespace media {
 
-OffsetByteQueue::OffsetByteQueue() : buf_(NULL), size_(0), head_(0) {}
+OffsetByteQueue::OffsetByteQueue() : buf_(nullptr), size_(0), head_(0) {}
 OffsetByteQueue::~OffsetByteQueue() = default;
 
 void OffsetByteQueue::Reset() {
   queue_.Reset();
-  buf_ = NULL;
+  buf_ = nullptr;
   size_ = 0;
   head_ = 0;
 }
@@ -25,7 +26,7 @@ void OffsetByteQueue::Push(const uint8_t* buf, int size) {
 }
 
 void OffsetByteQueue::Peek(const uint8_t** buf, int* size) {
-  *buf = size_ > 0 ? buf_ : NULL;
+  *buf = size_ > 0 ? buf_ : nullptr;
   *size = size_;
 }
 
@@ -38,7 +39,7 @@ void OffsetByteQueue::Pop(int count) {
 void OffsetByteQueue::PeekAt(int64_t offset, const uint8_t** buf, int* size) {
   DCHECK(offset >= head());
   if (offset < head() || offset >= tail()) {
-    *buf = NULL;
+    *buf = nullptr;
     *size = 0;
     return;
   }