Bug 1837570 - Make WaitFor.h a global gtest helper. r=gbrown

Differential Revision: https://phabricator.services.mozilla.com/D180424

dom/media/gtest/TestAudioCallbackDriver.cpp

@@ -11,12 +11,12 @@
 #include "gtest/gtest.h"
 
 #include "MediaTrackGraphImpl.h"
+#include "mozilla/gtest/WaitFor.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/UniquePtr.h"
 #include "nsTArray.h"
 
 #include "MockCubeb.h"
-#include "WaitFor.h"
 
 using namespace mozilla;
 using IterationResult = GraphInterface::IterationResult;

dom/media/gtest/TestAudioDecoderInputTrack.cpp

@@ -12,9 +12,9 @@
 #include "gtest/gtest.h"
 #include "MediaInfo.h"
 #include "MediaTrackGraphImpl.h"
+#include "mozilla/gtest/WaitFor.h"
 #include "nsThreadUtils.h"
 #include "VideoUtils.h"
-#include "WaitFor.h"
 
 using namespace mozilla;
 using namespace mozilla::media;

dom/media/gtest/TestAudioInputSource.cpp

@@ -10,7 +10,7 @@
 #include "gtest/gtest.h"
 
 #include "MockCubeb.h"
-#include "WaitFor.h"
+#include "mozilla/gtest/WaitFor.h"
 #include "nsContentUtils.h"
 
 using namespace mozilla;

dom/media/gtest/TestAudioTrackGraph.cpp

@@ -15,10 +15,10 @@
 #  include "MediaEngineWebRTCAudio.h"
 #endif  // MOZ_WEBRTC
 #include "MockCubeb.h"
+#include "mozilla/gtest/WaitFor.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/SpinEventLoopUntil.h"
 #include "mozilla/StaticPrefs_media.h"
-#include "WaitFor.h"
 #include "WavDumper.h"
 
 #define DRIFT_BUFFERING_PREF "media.clockdrift.buffering"

dom/media/gtest/TestCubebInputStream.cpp

@@ -8,9 +8,8 @@
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
+#include "mozilla/gtest/WaitFor.h"
 #include "MockCubeb.h"
-#include "WaitFor.h"
 
 using namespace mozilla;
 

dom/media/gtest/TestDeviceInputTrack.cpp

@@ -12,7 +12,7 @@
 #include "AudioGenerator.h"
 #include "MediaTrackGraphImpl.h"
 #include "MockCubeb.h"
-#include "WaitFor.h"
+#include "mozilla/gtest/WaitFor.h"
 #include "mozilla/StaticPrefs_media.h"
 #include "nsContentUtils.h"
 

dom/media/gtest/TestPacer.cpp

@@ -6,9 +6,9 @@
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
+#include "mozilla/gtest/WaitFor.h"
 #include "Pacer.h"
 #include "VideoUtils.h"
-#include "WaitFor.h"
 
 using namespace mozilla;
 

dom/media/gtest/TestVideoFrameConverter.cpp

@@ -7,9 +7,9 @@
 
 #include "gtest/gtest.h"
 #include "libwebrtcglue/SystemTime.h"
+#include "mozilla/gtest/WaitFor.h"
 #include "MediaEventSource.h"
 #include "VideoFrameConverter.h"
-#include "WaitFor.h"
 #include "YUVBufferGenerator.h"
 
 using namespace mozilla;

dom/media/gtest/moz.build

@@ -69,7 +69,6 @@ UNIFIED_SOURCES += [
     "TestVPXDecoding.cpp",
     "TestWebMBuffered.cpp",
     "TestWebMWriter.cpp",
-    "WaitFor.cpp",
     "YUVBufferGenerator.cpp",
 ]
 

media/webrtc/signaling/gtest/Canonicals.h

@@ -7,9 +7,9 @@
 #ifndef MEDIA_WEBRTC_SIGNALING_GTEST_CANONICALS_H_
 #define MEDIA_WEBRTC_SIGNALING_GTEST_CANONICALS_H_
 
+#include "mozilla/gtest/WaitFor.h"
 #include "MediaConduitControl.h"
 #include "MediaPipeline.h"
-#include "WaitFor.h"
 
 namespace mozilla {
 

media/webrtc/signaling/gtest/audioconduit_unittests.cpp

@@ -9,7 +9,6 @@
 
 #include "AudioConduit.h"
 #include "Canonicals.h"
-#include "WaitFor.h"
 
 #include "MockCall.h"
 

media/webrtc/signaling/gtest/mediapipeline_unittest.cpp

@@ -29,7 +29,6 @@
 #include "MediaTransportHandler.h"
 #include "WebrtcCallWrapper.h"
 #include "PeerConnectionCtx.h"
-#include "WaitFor.h"
 
 #define GTEST_HAS_RTTI 0
 #include "gtest/gtest.h"

testing/gtest/mozilla/WaitFor.h

@@ -1,12 +1,14 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-*/
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-#ifndef WAITFOR_H_
-#define WAITFOR_H_
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+#ifndef TESTING_GTEST_MOZILLA_WAITFOR_H_
+#define TESTING_GTEST_MOZILLA_WAITFOR_H_
 
 #include "MediaEventSource.h"
-#include "MediaUtils.h"
+#include "mozilla/media/MediaUtils.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/MozPromise.h"
 #include "mozilla/ResultVariant.h"
@@ -131,4 +133,4 @@ inline void WaitForMirrors() { WaitForMirrors(GetCurrentSerialEventTarget()); }
 
 }  // namespace mozilla
 
-#endif  // WAITFOR_H_
+#endif  // TESTING_GTEST_MOZILLA_WAITFOR_H_

testing/gtest/mozilla/moz.build

@@ -20,6 +20,7 @@ if CONFIG["ENABLE_TESTS"]:
     EXPORTS.mozilla.gtest += [
         "MozAssertions.h",
         "MozHelpers.h",
+        "WaitFor.h",
     ]
 
     SOURCES += [
@@ -28,6 +29,7 @@ if CONFIG["ENABLE_TESTS"]:
         "MozGTestBench.cpp",
         "MozHelpers.cpp",
         "SanityTest.cpp",
+        "WaitFor.cpp",
     ]
 
     if CONFIG["OS_ARCH"] == "WINNT":