commit 989e2337c1cd9de5b72c84cb06025661881b86f6
author hscham <hscham@chromium.org> Tue Feb 15 00:59:29 2022
committer Commit Bot <commit-bot@chromium.org> Thu Feb 17 09:49:29 2022
tree 81bf2434270b80a9ffe9540418b9f41b3c302c95
parent 68ede0e457c18d41ce28bc182769544568badbb4

trousers: use delete ctor instead of DISALLOW_*

The deprecated macros will be removed from base/macros.h from libchrome
r938828.

BUG=b:211560276
TEST=FEATURES=test emerge-veyron_rialto trousers

Change-Id: Iabed2ee3199189191322b193f8cf41071e839393
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/trousers/+/3461260
Tested-by: Grace Cham <hscham@chromium.org>
Reviewed-by: Andrey Pronin <apronin@chromium.org>
Commit-Queue: Grace Cham <hscham@chromium.org>

src/include/trousers/scoped_tss_type.h

diff --git a/src/include/trousers/scoped_tss_type.h b/src/include/trousers/scoped_tss_type.h
index 1e64a50..caa9141 100644
--- a/src/include/trousers/scoped_tss_type.h
+++ b/src/include/trousers/scoped_tss_type.h
@@ -25,7 +25,6 @@
 #include <vector>
 
 #include <base/logging.h>
-#include <base/macros.h>
 #include <base/notreached.h>
 
 namespace trousers {
@@ -81,6 +80,9 @@
   explicit ScopedTssType(TSS_HCONTEXT c = 0, TssType t = 0) :
      context_(c),
      type_(t) {}
+  ScopedTssType(const ScopedTssType&) = delete;
+  ScopedTssType& operator=(const ScopedTssType&) = delete;
+
   virtual ~ScopedTssType() {
     release_(context_, type_);
   }
@@ -117,8 +119,6 @@
   ReleaseProc release_;
   TSS_HCONTEXT context_;
   TssType type_;
-
-  DISALLOW_COPY_AND_ASSIGN(ScopedTssType);
 };
 
 // Wrap ScopedTssObject to allow implicit conversion only when safe.