commit b5e4730a7921fb19efd74c297ab2689de0d1950d
author John Park <johnhenryp@icloud.com> Wed Jan 08 19:58:18 2020 -0800
committer John Park <johnhenryp@icloud.com> Thu Jan 23 21:26:50 2020 -0800
tree 2774f9f95e5613b894d155eb6d1deb2793dd6c36
parent 05b704792460d881944ff62c857b1e274f84f002

Change TestLogging to absl::call_once()

Change-Id: Ie75a620d9992415d93ceb1846f650bd4c89883ab

aos/testing/test_logging.cc

diff --git a/aos/testing/test_logging.cc b/aos/testing/test_logging.cc
index bc60081..48e3686 100644
--- a/aos/testing/test_logging.cc
+++ b/aos/testing/test_logging.cc
@@ -8,7 +8,7 @@
 
 #include "aos/logging/implementations.h"
 #include "aos/mutex/mutex.h"
-#include "aos/once.h"
+#include "absl/base/call_once.h"
 
 using ::aos::logging::LogMessage;
 
@@ -39,8 +39,9 @@
   // This class has to be a singleton so that everybody can get access to the
   // same instance to read out the messages etc.
   static TestLogImplementation *GetInstance() {
-    static Once<TestLogImplementation> once(CreateInstance);
-    return once.Get();
+    static absl::once_flag once;
+    absl::call_once(once, CreateInstance);
+    return instance;
   }
 
   // Clears out all of the messages already recorded.
@@ -72,6 +73,7 @@
   void PrintMessagesAsTheyComeIn() { print_as_messages_come_in_ = true; }
 
  private:
+  static TestLogImplementation *instance;
   TestLogImplementation() {}
   ~TestLogImplementation() {
     if (output_file_ != stdout) {
@@ -79,8 +81,8 @@
     }
   }
 
-  static TestLogImplementation *CreateInstance() {
-    return new TestLogImplementation();
+    static void CreateInstance() {
+      instance = new TestLogImplementation();
   }
 
   virtual void HandleMessage(const LogMessage &message) override {
@@ -104,6 +106,8 @@
   static thread_local ::aos::monotonic_clock::time_point monotonic_now_;
 };
 
+TestLogImplementation *TestLogImplementation::instance;
+
 thread_local bool TestLogImplementation::mock_time_ = false;
 thread_local ::aos::monotonic_clock::time_point
     TestLogImplementation::monotonic_now_ = ::aos::monotonic_clock::min_time;
@@ -151,12 +155,12 @@
   return nullptr;
 }
 
-Once<void> enable_test_logging_once(DoEnableTestLogging);
+static absl::once_flag enable_test_logging_once;
 
 }  // namespace
 
 void EnableTestLogging() {
-  enable_test_logging_once.Get();
+  absl::call_once(enable_test_logging_once, DoEnableTestLogging);
 }
 
 void SetLogFileName(const char* filename) {