Snap for 9690662 from c92def5d5b03dcdbbccbea6d74f99e7a25f707eb to udc-releaseandroid-vts-14.0_r4android-vts-14.0_r3android-vts-14.0_r2android-vts-14.0_r1android-security-14.0.0_r9android-security-14.0.0_r8android-security-14.0.0_r7android-security-14.0.0_r6android-security-14.0.0_r5android-security-14.0.0_r4android-security-14.0.0_r3android-security-14.0.0_r2android-security-14.0.0_r1android-platform-14.0.0_r8android-platform-14.0.0_r7android-platform-14.0.0_r6android-platform-14.0.0_r5android-platform-14.0.0_r4android-platform-14.0.0_r3android-platform-14.0.0_r2android-platform-14.0.0_r1android-cts-14.0_r4android-cts-14.0_r3android-cts-14.0_r2android-cts-14.0_r1android-14.0.0_r28android-14.0.0_r2android-14.0.0_r15android-14.0.0_r14android-14.0.0_r13android-14.0.0_r1android14-tests-releaseandroid14-security-releaseandroid14-s2-releaseandroid14-s1-releaseandroid14-releaseandroid14-platform-release

Change-Id: I0b249e117280351bbd5d7d98084f3dc88a78c01d

1 files changed, 3 insertions, 2 deletions

diff --git a/test/gtest-extra.h b/test/gtest-extra.h
index 01c70ddb..949ff50e 100644
--- a/test/gtest-extra.h
+++ b/test/gtest-extra.h
@@ -67,8 +67,6 @@ class OutputRedirect {
   fmt::file original_;  // Original file passed to redirector.
   fmt::file read_end_;  // Read end of the pipe where the output is redirected.
 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(OutputRedirect);
-
   void flush();
   void restore();
 
@@ -76,6 +74,9 @@ class OutputRedirect {
   explicit OutputRedirect(FILE* file);
   ~OutputRedirect() FMT_NOEXCEPT;
 
+  OutputRedirect(const OutputRedirect&) = delete;
+  OutputRedirect& operator=(const OutputRedirect&) = delete;
+
   // Restores the original file, reads output from the pipe into a string
   // and returns it.
   std::string restore_and_read();