summaryrefslogtreecommitdiff
path: root/chromium/base/containers/flat_tree_unittest.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-12 14:27:29 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-13 09:35:20 +0000
commitc30a6232df03e1efbd9f3b226777b07e087a1122 (patch)
treee992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/base/containers/flat_tree_unittest.cc
parent7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff)
downloadqtwebengine-chromium-85-based.tar.gz
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/base/containers/flat_tree_unittest.cc')
-rw-r--r--chromium/base/containers/flat_tree_unittest.cc5
1 files changed, 2 insertions, 3 deletions
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 {