[Zucchini] Cleanup before adding ARM support for ELF files.

This CL performs some code cleanup to prepare for main CL that adds
ARM support for ELF files (https://crrev.com/c/2922822):
* Rename ARM32 / Arm32 to AArch32.
* Replace DISALLOW_COPY_AND_ASSIGN for affected files.

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

1 files changed, 5 insertions, 6 deletions

diff --git a/disassembler_elf.h b/disassembler_elf.h
index 60d524c..17e7523 100644
--- a/disassembler_elf.h
+++ b/disassembler_elf.h
@@ -12,7 +12,6 @@
 #include <string>
 #include <vector>
 
-#include "base/macros.h"
 #include "components/zucchini/address_translator.h"
 #include "components/zucchini/buffer_view.h"
 #include "components/zucchini/disassembler.h"
@@ -35,6 +34,7 @@ struct Elf32Traits {
 };
 
 // Architecture-specific definitions.
+
 struct Elf32IntelTraits : public Elf32Traits {
   static constexpr ExecutableType kExeType = kExeTypeElfX86;
   static const char kExeTypeString[];
@@ -72,6 +72,8 @@ class DisassemblerElf : public Disassembler {
   // of an executable. Returns true iff the check passes.
   static bool QuickDetect(ConstBufferView image);
 
+  DisassemblerElf(const DisassemblerElf&) = delete;
+  const DisassemblerElf& operator=(const DisassemblerElf&) = delete;
   ~DisassemblerElf() override;
 
   // Disassembler:
@@ -150,9 +152,6 @@ class DisassemblerElf : public Disassembler {
 
   // Sorted file offsets of abs32 locations.
   std::vector<offset_t> abs32_locations_;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(DisassemblerElf);
 };
 
 // Disassembler for ELF with Intel architectures.
@@ -162,6 +161,8 @@ class DisassemblerElfIntel : public DisassemblerElf<Traits> {
   enum ReferenceType : uint8_t { kReloc, kAbs32, kRel32, kTypeCount };
 
   DisassemblerElfIntel();
+  DisassemblerElfIntel(const DisassemblerElfIntel&) = delete;
+  const DisassemblerElfIntel& operator=(const DisassemblerElfIntel&) = delete;
   ~DisassemblerElfIntel() override;
 
   // Disassembler:
@@ -181,8 +182,6 @@ class DisassemblerElfIntel : public DisassemblerElf<Traits> {
   // Sorted file offsets of rel32 locations.
   // Using std::deque to reduce peak memory footprint.
   std::deque<offset_t> rel32_locations_;
-
-  DISALLOW_COPY_AND_ASSIGN(DisassemblerElfIntel);
 };
 
 using DisassemblerElfX86 = DisassemblerElfIntel<Elf32IntelTraits>;