Bug 1668099 - Fix symbols that rely on unified build order in media gtests. r=jolin

Fix up includes so AnnexB.h and TestMediaDataEncoder.cpp don't rely on unified
build order. Reformat include lists to match style guide. Rework #include guard
on AnnexB.h to reflect style guide.

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

dom/media/gtest/TestMediaDataEncoder.cpp

@@ -5,14 +5,14 @@
 
 #include "gtest/gtest.h"
 
-#include "nsMimeTypes.h"
-#include "VideoUtils.h"
-#include "PEMFactory.h"
-#include "ImageContainer.h"
 #include "AnnexB.h"
-
+#include "ImageContainer.h"
 #include "mozilla/AbstractThread.h"
 #include "mozilla/media/MediaUtils.h"  // For media::Await
+#include "nsMimeTypes.h"
+#include "PEMFactory.h"
+#include "TimeUnits.h"
+#include "VideoUtils.h"
 
 #include <algorithm>
 

dom/media/platforms/agnostic/bytestreams/AnnexB.h

@@ -2,14 +2,15 @@
  * 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 MP4_DEMUXER_ANNEX_B_H_
-#define MP4_DEMUXER_ANNEX_B_H_
+#ifndef DOM_MEDIA_PLATFORMS_AGNOSTIC_BYTESTREAMS_ANNEX_B_H_
+#define DOM_MEDIA_PLATFORMS_AGNOSTIC_BYTESTREAMS_ANNEX_B_H_
 
-#include "mozilla/Result.h"
 #include "ErrorList.h"
+#include "mozilla/RefPtr.h"
+#include "mozilla/Result.h"
 
-template <class T>
-struct already_AddRefed;
+template <class>
+class nsTArray;
 
 namespace mozilla {
 class BufferReader;
@@ -62,4 +63,4 @@ class AnnexB {
 
 }  // namespace mozilla
 
-#endif  // MP4_DEMUXER_ANNEX_B_H_
+#endif  // DOM_MEDIA_PLATFORMS_AGNOSTIC_BYTESTREAMS_ANNEX_B_H_