From c30a6232df03e1efbd9f3b226777b07e087a1122 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
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 <allan.jensen@qt.io>
---
 chromium/base/containers/flat_tree_unittest.cc | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'chromium/base/containers/flat_tree_unittest.cc')

diff --git a/chromium/base/containers/flat_tree_unittest.cc b/chromium/base/containers/flat_tree_unittest.cc
index ea6af1f76fc..8eab5b6f682 100644
--- a/chromium/base/containers/flat_tree_unittest.cc
+++ b/chromium/base/containers/flat_tree_unittest.cc
@@ -35,7 +35,6 @@
 #include <string>
 #include <vector>
 
-#include "base/macros.h"
 #include "base/template_util.h"
 #include "base/test/move_only_int.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ -95,6 +94,8 @@ class Emplaceable {
     other.int_ = 0;
     other.double_ = 0.0;
   }
+  Emplaceable(const Emplaceable&) = delete;
+  Emplaceable& operator=(const Emplaceable&) = delete;
 
   Emplaceable& operator=(Emplaceable&& other) {
     int_ = other.int_;
@@ -115,8 +116,6 @@ class Emplaceable {
  private:
   int int_;
   double double_;
-
-  DISALLOW_COPY_AND_ASSIGN(Emplaceable);
 };
 
 struct TemplateConstructor {
-- 
cgit v1.2.1