From c30a6232df03e1efbd9f3b226777b07e087a1122 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 12 Oct 2020 14:27:29 +0200 Subject: BASELINE: Update Chromium to 85.0.4183.140 Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen --- chromium/base/containers/ring_buffer.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'chromium/base/containers/ring_buffer.h') diff --git a/chromium/base/containers/ring_buffer.h b/chromium/base/containers/ring_buffer.h index ca4a48ddc9e..5c4e0aeb1e9 100644 --- a/chromium/base/containers/ring_buffer.h +++ b/chromium/base/containers/ring_buffer.h @@ -7,8 +7,7 @@ #include -#include "base/logging.h" -#include "base/macros.h" +#include "base/check.h" namespace base { @@ -25,6 +24,8 @@ template class RingBuffer { public: RingBuffer() : current_index_(0) {} + RingBuffer(const RingBuffer&) = delete; + RingBuffer& operator=(const RingBuffer&) = delete; size_t BufferSize() const { return kSize; } @@ -124,8 +125,6 @@ class RingBuffer { T buffer_[kSize]; size_t current_index_; - - DISALLOW_COPY_AND_ASSIGN(RingBuffer); }; } // namespace base -- cgit v1.2.1