Remove deprecated GTest macro. am: 6205ebcc1d

Original change: https://android-review.googlesource.com/c/platform/external/fmtlib/+/2469727

Change-Id: Ia5a4b72286b6c84c2895802b6303a9993a1ebdae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/test/gtest-extra.h b/test/gtest-extra.h
index 01c70dd..949ff50 100644
--- a/test/gtest-extra.h
+++ b/test/gtest-extra.h
@@ -67,8 +67,6 @@
   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 @@
   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();