Bug 1423372 - Remove some unnecessary includes and fix unified build problems. r=jwwang

MozReview-Commit-ID: 7DgtGJQvgp7

--HG--
extra : rebase_source : 297baab1fd84e5302a5f90096e2bbe3bd5fbb20f

dom/media/MediaChannelStatistics.h

@@ -6,6 +6,8 @@
 #if !defined(MediaChannelStatistics_h_)
 #define MediaChannelStatistics_h_
 
+#include "mozilla/TimeStamp.h"
+
 namespace mozilla {
 
 // Number of bytes we have accumulated before we assume the connection download

dom/media/MediaDecoder.cpp

@@ -20,11 +20,7 @@
 #include "mozilla/Preferences.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/Telemetry.h"
-#include "mozilla/dom/AudioTrack.h"
-#include "mozilla/dom/AudioTrackList.h"
-#include "mozilla/dom/VideoTrack.h"
-#include "mozilla/dom/VideoTrackList.h"
-#include "mozilla/layers/ShadowLayers.h"
+#include "Visibility.h"
 #include "mozilla/Unused.h"
 #include "nsComponentManagerUtils.h"
 #include "nsContentUtils.h"

dom/media/MediaDecoderStateMachine.cpp

@@ -13,36 +13,24 @@
 #include <algorithm>
 #include <stdint.h>
 
-#include "gfx2DGlue.h"
-
 #include "mediasink/AudioSink.h"
 #include "mediasink/AudioSinkWrapper.h"
 #include "mediasink/DecodedStream.h"
 #include "mediasink/OutputStreamManager.h"
 #include "mediasink/VideoSink.h"
-#include "mozilla/DebugOnly.h"
 #include "mozilla/IndexSequence.h"
 #include "mozilla/Logging.h"
-#include "mozilla/mozalloc.h"
 #include "mozilla/MathAlgorithms.h"
+#include "mozilla/NotNull.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/SharedThreadPool.h"
 #include "mozilla/Sprintf.h"
+#include "mozilla/Telemetry.h"
 #include "mozilla/TaskQueue.h"
 #include "mozilla/Tuple.h"
-
-#include "nsComponentManagerUtils.h"
-#include "nsContentUtils.h"
-#include "nsIEventTarget.h"
 #include "nsIMemoryReporter.h"
-#include "nsITimer.h"
 #include "nsPrintfCString.h"
 #include "nsTArray.h"
-#include "nsDeque.h"
-#include "prenv.h"
-
-#include "AudioSegment.h"
-#include "DOMMediaStream.h"
 #include "ImageContainer.h"
 #include "MediaDecoder.h"
 #include "MediaDecoderStateMachine.h"
@@ -51,14 +39,10 @@
 #include "MediaTimer.h"
 #include "ReaderProxy.h"
 #include "TimeUnits.h"
-#include "VideoSegment.h"
 #include "VideoUtils.h"
-#include "gfxPrefs.h"
 
 namespace mozilla {
 
-using namespace mozilla::dom;
-using namespace mozilla::layers;
 using namespace mozilla::media;
 
 #define NS_DispatchToMainThread(...) CompileError_UseAbstractThreadDispatchInstead

dom/media/MediaFormatReader.cpp

@@ -7,19 +7,16 @@
 #include "MediaFormatReader.h"
 
 #include "AutoTaskQueue.h"
-#include "Layers.h"
 #include "MediaData.h"
-#include "MediaDecoderOwner.h"
 #include "MediaInfo.h"
-#include "MediaResource.h"
 #include "VideoFrameContainer.h"
 #include "VideoUtils.h"
 #include "mozilla/AbstractThread.h"
 #include "mozilla/CDMProxy.h"
 #include "mozilla/ClearOnShutdown.h"
+#include "mozilla/NotNull.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/SharedThreadPool.h"
-#include "mozilla/SyncRunnable.h"
 #include "mozilla/Telemetry.h"
 #include "mozilla/Unused.h"
 #include "nsContentUtils.h"
@@ -31,10 +28,6 @@
 
 using namespace mozilla::media;
 
-using mozilla::layers::Image;
-using mozilla::layers::LayerManager;
-using mozilla::layers::LayersBackend;
-
 static mozilla::LazyLogModule sFormatDecoderLog("MediaFormatReader");
 mozilla::LazyLogModule gMediaDemuxerLog("MediaDemuxer");