commit f137bf4b5542b966abc4c08762c5e60b21913f4d
author Samuel Huang <huangs@chromium.org> Fri Aug 13 15:42:26 2021 +0000
committer Copybara-Service <copybara-worker@google.com> Fri Aug 13 08:54:54 2021 -0700
tree 09c6bdbdfaa7dd2f09d32a791a6aa364b0eeb2ba
parent fa10b05c4854c6d8a603ee47c2a213cbc23f8646

[Zucchini] Replace DISALLOW_* macros with =delete versions.

This CL replaces
* 30 instances of DISALLOW_COPY_AND_ASSIGN(Foo),
* 1 instance of DISALLOW_IMPLICIT_CONSTRUCTORS(Foo),
in Zucchini with:
  Foo() = delete;  // DISALLOW_IMPLICIT_CONSTRUCTORS only.
  Foo(const Foo&) = delete;
  const Foo& operator=(const Foo&) = delete;

All base/macros.h includes are removed.

Bug: 1010217
Change-Id: I13b3d5ed04f04e5c0b209d59e70ac018c5f4938c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3093198
Reviewed-by: Etienne Pierre-Doray <etiennep@chromium.org>
Commit-Queue: Samuel Huang <huangs@chromium.org>
Cr-Commit-Position: refs/heads/master@{#911751}
NOKEYCHECK=True
GitOrigin-RevId: ba0e1f56993c535faa59e2ca02c371bae2ebbb20

targets_affinity.h

diff --git a/targets_affinity.h b/targets_affinity.h
index 3a154e7..dff1741 100644
--- a/targets_affinity.h
+++ b/targets_affinity.h
@@ -10,7 +10,6 @@
 
 #include <vector>
 
-#include "base/macros.h"
 #include "components/zucchini/image_utils.h"
 
 namespace zucchini {
@@ -22,6 +21,8 @@
 class TargetsAffinity {
  public:
   TargetsAffinity();
+  TargetsAffinity(const TargetsAffinity&) = delete;
+  const TargetsAffinity& operator=(const TargetsAffinity&) = delete;
   ~TargetsAffinity();
 
   // Infers affinity between |old_targets| and |new_targets| using similarities
@@ -65,8 +66,6 @@
   // lookup, given |old_key| or |new_key|.
   std::vector<Association> forward_association_;
   std::vector<Association> backward_association_;
-
-  DISALLOW_COPY_AND_ASSIGN(TargetsAffinity);
 };
 
 }  // namespace zucchini