diff options
309 files changed, 310 insertions, 0 deletions
diff --git a/media/audio/agc_audio_stream.h b/media/audio/agc_audio_stream.h index b0117e1..8050788 100644 --- a/media/audio/agc_audio_stream.h +++ b/media/audio/agc_audio_stream.h @@ -6,6 +6,7 @@ #define MEDIA_AUDIO_AGC_AUDIO_STREAM_H_ #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/synchronization/lock.h" #include "base/threading/thread_checker.h" diff --git a/media/audio/alsa/alsa_input.h b/media/audio/alsa/alsa_input.h index b9272c7a..ed91446 100644 --- a/media/audio/alsa/alsa_input.h +++ b/media/audio/alsa/alsa_input.h @@ -10,6 +10,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" diff --git a/media/audio/alsa/alsa_output.h b/media/audio/alsa/alsa_output.h index 6ef3108..958f733 100644 --- a/media/audio/alsa/alsa_output.h +++ b/media/audio/alsa/alsa_output.h @@ -27,6 +27,7 @@ #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" diff --git a/media/audio/alsa/audio_manager_alsa.h b/media/audio/alsa/audio_manager_alsa.h index 46a28b1..d8410fd 100644 --- a/media/audio/alsa/audio_manager_alsa.h +++ b/media/audio/alsa/audio_manager_alsa.h @@ -7,6 +7,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/threading/thread.h" #include "media/audio/audio_manager_base.h" diff --git a/media/audio/android/audio_manager_android.h b/media/audio/android/audio_manager_android.h index d39ccef..f9b7db2 100644 --- a/media/audio/android/audio_manager_android.h +++ b/media/audio/android/audio_manager_android.h @@ -8,6 +8,7 @@ #include <set> #include "base/android/jni_android.h" +#include "base/macros.h" #include "base/synchronization/lock.h" #include "base/synchronization/waitable_event.h" #include "media/audio/audio_manager_base.h" diff --git a/media/audio/android/audio_record_input.h b/media/audio/android/audio_record_input.h index 6b0b36c..576bf08 100644 --- a/media/audio/android/audio_record_input.h +++ b/media/audio/android/audio_record_input.h @@ -6,6 +6,7 @@ #define MEDIA_AUDIO_ANDROID_AUDIO_RECORD_INPUT_H_ #include "base/android/jni_android.h" +#include "base/macros.h" #include "base/threading/thread_checker.h" #include "media/audio/audio_io.h" #include "media/audio/audio_parameters.h" diff --git a/media/audio/android/opensles_input.h b/media/audio/android/opensles_input.h index e8751f6..ecb4ec9 100644 --- a/media/audio/android/opensles_input.h +++ b/media/audio/android/opensles_input.h @@ -9,6 +9,7 @@ #include <SLES/OpenSLES_Android.h> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/synchronization/lock.h" #include "base/threading/thread_checker.h" #include "media/audio/android/opensles_util.h" diff --git a/media/audio/android/opensles_output.h b/media/audio/android/opensles_output.h index bc500f1..9571575 100644 --- a/media/audio/android/opensles_output.h +++ b/media/audio/android/opensles_output.h @@ -9,6 +9,7 @@ #include <SLES/OpenSLES_Android.h> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/synchronization/lock.h" #include "base/threading/thread_checker.h" #include "media/audio/android/opensles_util.h" diff --git a/media/audio/audio_input_controller.h b/media/audio/audio_input_controller.h index df38c16..fb722a4 100644 --- a/media/audio/audio_input_controller.h +++ b/media/audio/audio_input_controller.h @@ -9,6 +9,7 @@ #include "base/atomicops.h" #include "base/callback.h" #include "base/files/file.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/synchronization/lock.h" diff --git a/media/audio/audio_input_device.h b/media/audio/audio_input_device.h index b1b03ac..61b8829 100644 --- a/media/audio/audio_input_device.h +++ b/media/audio/audio_input_device.h @@ -56,6 +56,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/shared_memory.h" #include "media/audio/audio_device_thread.h" diff --git a/media/audio/audio_manager.h b/media/audio/audio_manager.h index 776b77f..1d88e44 100644 --- a/media/audio/audio_manager.h +++ b/media/audio/audio_manager.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/strings/string16.h" #include "media/audio/audio_device_name.h" diff --git a/media/audio/audio_manager_base.h b/media/audio/audio_manager_base.h index a0272f3..ced45be 100644 --- a/media/audio/audio_manager_base.h +++ b/media/audio/audio_manager_base.h @@ -9,6 +9,7 @@ #include <utility> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/observer_list.h" diff --git a/media/audio/audio_output_controller.h b/media/audio/audio_output_controller.h index 95be9f4..434f2e3 100644 --- a/media/audio/audio_output_controller.h +++ b/media/audio/audio_output_controller.h @@ -7,6 +7,7 @@ #include "base/atomic_ref_count.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/threading/thread_checker.h" #include "base/timer/timer.h" diff --git a/media/audio/audio_output_device.h b/media/audio/audio_output_device.h index d8e5425..26f711d 100644 --- a/media/audio/audio_output_device.h +++ b/media/audio/audio_output_device.h @@ -65,6 +65,7 @@ #include <string> #include "base/bind.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/shared_memory.h" #include "base/synchronization/waitable_event.h" diff --git a/media/audio/audio_output_dispatcher.h b/media/audio/audio_output_dispatcher.h index 74f55c7..fcdafb4 100644 --- a/media/audio/audio_output_dispatcher.h +++ b/media/audio/audio_output_dispatcher.h @@ -18,6 +18,7 @@ #ifndef MEDIA_AUDIO_AUDIO_OUTPUT_DISPATCHER_H_ #define MEDIA_AUDIO_AUDIO_OUTPUT_DISPATCHER_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "media/audio/audio_io.h" #include "media/audio/audio_manager.h" diff --git a/media/audio/audio_output_dispatcher_impl.h b/media/audio/audio_output_dispatcher_impl.h index 0b1a7c5..b35a567 100644 --- a/media/audio/audio_output_dispatcher_impl.h +++ b/media/audio/audio_output_dispatcher_impl.h @@ -16,6 +16,7 @@ #include <map> #include <vector> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/timer/timer.h" #include "media/audio/audio_io.h" diff --git a/media/audio/audio_output_proxy.h b/media/audio/audio_output_proxy.h index 7e93736..cc361ee 100644 --- a/media/audio/audio_output_proxy.h +++ b/media/audio/audio_output_proxy.h @@ -6,6 +6,7 @@ #define MEDIA_AUDIO_AUDIO_OUTPUT_PROXY_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/threading/non_thread_safe.h" #include "media/audio/audio_io.h" diff --git a/media/audio/audio_output_resampler.h b/media/audio/audio_output_resampler.h index 14c056f..b4fbf24 100644 --- a/media/audio/audio_output_resampler.h +++ b/media/audio/audio_output_resampler.h @@ -7,6 +7,7 @@ #include <map> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/time/time.h" #include "base/timer/timer.h" diff --git a/media/audio/audio_output_stream_sink.h b/media/audio/audio_output_stream_sink.h index b8eed26..39456fe 100644 --- a/media/audio/audio_output_stream_sink.h +++ b/media/audio/audio_output_stream_sink.h @@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/single_thread_task_runner.h" #include "base/synchronization/lock.h" #include "media/audio/audio_io.h" diff --git a/media/audio/audio_power_monitor.h b/media/audio/audio_power_monitor.h index f840bbf..1703d24 100644 --- a/media/audio/audio_power_monitor.h +++ b/media/audio/audio_power_monitor.h @@ -9,6 +9,7 @@ #include <utility> #include "base/callback.h" +#include "base/macros.h" #include "base/synchronization/lock.h" #include "media/base/media_export.h" diff --git a/media/audio/clockless_audio_sink.h b/media/audio/clockless_audio_sink.h index 96745a5..aad71b8 100644 --- a/media/audio/clockless_audio_sink.h +++ b/media/audio/clockless_audio_sink.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "media/base/audio_renderer_sink.h" diff --git a/media/audio/cras/audio_manager_cras.h b/media/audio/cras/audio_manager_cras.h index 91e763e..6ad4f0e 100644 --- a/media/audio/cras/audio_manager_cras.h +++ b/media/audio/cras/audio_manager_cras.h @@ -10,6 +10,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "media/audio/audio_manager_base.h" diff --git a/media/audio/cras/cras_input.h b/media/audio/cras/cras_input.h index 2efed6b..2e330dc 100644 --- a/media/audio/cras/cras_input.h +++ b/media/audio/cras/cras_input.h @@ -10,6 +10,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "media/audio/agc_audio_stream.h" #include "media/audio/audio_io.h" #include "media/audio/audio_parameters.h" diff --git a/media/audio/cras/cras_unified.h b/media/audio/cras/cras_unified.h index c0533d0..b069b3c 100644 --- a/media/audio/cras/cras_unified.h +++ b/media/audio/cras/cras_unified.h @@ -13,6 +13,7 @@ #include <cras_client.h> #include "base/compiler_specific.h" +#include "base/macros.h" #include "media/audio/audio_io.h" #include "media/audio/audio_parameters.h" diff --git a/media/audio/fake_audio_input_stream.h b/media/audio/fake_audio_input_stream.h index 7be559b..b3f1ea4 100644 --- a/media/audio/fake_audio_input_stream.h +++ b/media/audio/fake_audio_input_stream.h @@ -10,6 +10,7 @@ #include <vector> #include "base/callback_forward.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "media/audio/audio_io.h" #include "media/audio/audio_parameters.h" diff --git a/media/audio/fake_audio_log_factory.h b/media/audio/fake_audio_log_factory.h index 704fcc2..bbd31e9 100644 --- a/media/audio/fake_audio_log_factory.h +++ b/media/audio/fake_audio_log_factory.h @@ -6,6 +6,7 @@ #define MEDIA_AUDIO_FAKE_AUDIO_LOG_FACTORY_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "media/audio/audio_logging.h" #include "media/base/media_export.h" diff --git a/media/audio/fake_audio_manager.h b/media/audio/fake_audio_manager.h index ce24c3e..ee055c7 100644 --- a/media/audio/fake_audio_manager.h +++ b/media/audio/fake_audio_manager.h @@ -7,6 +7,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "media/audio/audio_manager_base.h" #include "media/audio/fake_audio_input_stream.h" #include "media/audio/fake_audio_output_stream.h" diff --git a/media/audio/fake_audio_output_stream.h b/media/audio/fake_audio_output_stream.h index 712a6b9..b36a2643 100644 --- a/media/audio/fake_audio_output_stream.h +++ b/media/audio/fake_audio_output_stream.h @@ -5,6 +5,7 @@ #ifndef MEDIA_AUDIO_FAKE_AUDIO_OUTPUT_STREAM_H_ #define MEDIA_AUDIO_FAKE_AUDIO_OUTPUT_STREAM_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "media/audio/audio_io.h" #include "media/audio/audio_parameters.h" diff --git a/media/audio/fake_audio_worker.h b/media/audio/fake_audio_worker.h index d3511a3..2d07260 100644 --- a/media/audio/fake_audio_worker.h +++ b/media/audio/fake_audio_worker.h @@ -6,6 +6,7 @@ #define MEDIA_AUDIO_FAKE_AUDIO_WORKER_H_ #include "base/callback_forward.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "media/base/media_export.h" diff --git a/media/audio/mac/audio_auhal_mac.h b/media/audio/mac/audio_auhal_mac.h index 6d0bc73..fe283c5 100644 --- a/media/audio/mac/audio_auhal_mac.h +++ b/media/audio/mac/audio_auhal_mac.h @@ -22,6 +22,7 @@ #include "base/cancelable_callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/synchronization/lock.h" #include "base/threading/thread_checker.h" #include "media/audio/audio_io.h" diff --git a/media/audio/mac/audio_device_listener_mac.h b/media/audio/mac/audio_device_listener_mac.h index 7f06e5c..1d02d9c 100644 --- a/media/audio/mac/audio_device_listener_mac.h +++ b/media/audio/mac/audio_device_listener_mac.h @@ -8,6 +8,7 @@ #include <CoreAudio/AudioHardware.h> #include "base/callback.h" +#include "base/macros.h" #include "base/threading/thread_checker.h" #include "media/base/media_export.h" diff --git a/media/audio/mac/audio_input_mac.h b/media/audio/mac/audio_input_mac.h index f13439c..0a0c443 100644 --- a/media/audio/mac/audio_input_mac.h +++ b/media/audio/mac/audio_input_mac.h @@ -10,6 +10,7 @@ #include "base/cancelable_callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/time/time.h" #include "media/audio/audio_io.h" #include "media/audio/audio_parameters.h" diff --git a/media/audio/mac/audio_low_latency_input_mac.h b/media/audio/mac/audio_low_latency_input_mac.h index 437b2a8..37167dc 100644 --- a/media/audio/mac/audio_low_latency_input_mac.h +++ b/media/audio/mac/audio_low_latency_input_mac.h @@ -41,6 +41,7 @@ #include "base/atomicops.h" #include "base/cancelable_callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/synchronization/lock.h" #include "base/threading/thread_checker.h" diff --git a/media/audio/mac/audio_manager_mac.h b/media/audio/mac/audio_manager_mac.h index c3ccb2c..013a7f7 100644 --- a/media/audio/mac/audio_manager_mac.h +++ b/media/audio/mac/audio_manager_mac.h @@ -11,6 +11,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "media/audio/audio_manager_base.h" #include "media/audio/mac/audio_device_listener_mac.h" diff --git a/media/audio/mock_audio_manager.h b/media/audio/mock_audio_manager.h index ae6f0d6..60a8b1e 100644 --- a/media/audio/mock_audio_manager.h +++ b/media/audio/mock_audio_manager.h @@ -5,6 +5,7 @@ #ifndef MEDIA_AUDIO_MOCK_AUDIO_MANAGER_H_ #define MEDIA_AUDIO_MOCK_AUDIO_MANAGER_H_ +#include "base/macros.h" #include "media/audio/audio_manager.h" namespace media { diff --git a/media/audio/mock_audio_source_callback.h b/media/audio/mock_audio_source_callback.h index df661fc..be933d3 100644 --- a/media/audio/mock_audio_source_callback.h +++ b/media/audio/mock_audio_source_callback.h @@ -5,6 +5,7 @@ #ifndef MEDIA_AUDIO_MOCK_AUDIO_SOURCE_CALLBACK_H_ #define MEDIA_AUDIO_MOCK_AUDIO_SOURCE_CALLBACK_H_ +#include "base/macros.h" #include "media/audio/audio_io.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/media/audio/null_audio_sink.h b/media/audio/null_audio_sink.h index 9bfa518..5d4e7bc 100644 --- a/media/audio/null_audio_sink.h +++ b/media/audio/null_audio_sink.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "media/base/audio_renderer_sink.h" diff --git a/media/audio/pulse/audio_manager_pulse.h b/media/audio/pulse/audio_manager_pulse.h index b704a09..93a1c94 100644 --- a/media/audio/pulse/audio_manager_pulse.h +++ b/media/audio/pulse/audio_manager_pulse.h @@ -9,6 +9,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "media/audio/audio_manager_base.h" diff --git a/media/audio/pulse/pulse_input.h b/media/audio/pulse/pulse_input.h index b21655b..e93c474 100644 --- a/media/audio/pulse/pulse_input.h +++ b/media/audio/pulse/pulse_input.h @@ -8,6 +8,7 @@ #include <pulse/pulseaudio.h> #include <string> +#include "base/macros.h" #include "base/threading/thread_checker.h" #include "media/audio/agc_audio_stream.h" #include "media/audio/audio_device_name.h" diff --git a/media/audio/pulse/pulse_output.h b/media/audio/pulse/pulse_output.h index 6ec55a3..c241b84 100644 --- a/media/audio/pulse/pulse_output.h +++ b/media/audio/pulse/pulse_output.h @@ -22,6 +22,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/threading/thread_checker.h" #include "media/audio/audio_io.h" diff --git a/media/audio/scoped_task_runner_observer.h b/media/audio/scoped_task_runner_observer.h index 85e5247..d7efe66 100644 --- a/media/audio/scoped_task_runner_observer.h +++ b/media/audio/scoped_task_runner_observer.h @@ -5,6 +5,7 @@ #ifndef MEDIA_AUDIO_SCOPED_TASK_RUNNER_OBSERVER_H_ #define MEDIA_AUDIO_SCOPED_TASK_RUNNER_OBSERVER_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/message_loop/message_loop.h" diff --git a/media/audio/sounds/audio_stream_handler.h b/media/audio/sounds/audio_stream_handler.h index 8be8914..865e0f6 100644 --- a/media/audio/sounds/audio_stream_handler.h +++ b/media/audio/sounds/audio_stream_handler.h @@ -6,6 +6,7 @@ #define MEDIA_AUDIO_SOUNDS_AUDIO_STREAM_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/strings/string_piece.h" #include "base/threading/non_thread_safe.h" #include "base/time/time.h" diff --git a/media/audio/sounds/sounds_manager.h b/media/audio/sounds/sounds_manager.h index a5f8a3a..004886d 100644 --- a/media/audio/sounds/sounds_manager.h +++ b/media/audio/sounds/sounds_manager.h @@ -6,6 +6,7 @@ #define MEDIA_AUDIO_SOUNDS_SOUNDS_MANAGER_H_ #include "base/containers/hash_tables.h" +#include "base/macros.h" #include "base/strings/string_piece.h" #include "base/threading/non_thread_safe.h" #include "base/time/time.h" diff --git a/media/audio/sounds/test_data.h b/media/audio/sounds/test_data.h index 0fca5ad..1736028 100644 --- a/media/audio/sounds/test_data.h +++ b/media/audio/sounds/test_data.h @@ -7,6 +7,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "media/audio/sounds/audio_stream_handler.h" namespace base { diff --git a/media/audio/test_audio_input_controller_factory.h b/media/audio/test_audio_input_controller_factory.h index e9555ab..5aee6a8 100644 --- a/media/audio/test_audio_input_controller_factory.h +++ b/media/audio/test_audio_input_controller_factory.h @@ -6,6 +6,7 @@ #define MEDIA_AUDIO_TEST_AUDIO_INPUT_CONTROLLER_FACTORY_H_ #include "base/bind.h" +#include "base/macros.h" #include "media/audio/audio_input_controller.h" namespace media { diff --git a/media/audio/virtual_audio_input_stream.h b/media/audio/virtual_audio_input_stream.h index dd82429..3370f36 100644 --- a/media/audio/virtual_audio_input_stream.h +++ b/media/audio/virtual_audio_input_stream.h @@ -8,6 +8,7 @@ #include <map> #include <set> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/synchronization/lock.h" #include "base/threading/thread_checker.h" diff --git a/media/audio/virtual_audio_output_stream.h b/media/audio/virtual_audio_output_stream.h index ef9863e..84b929c 100644 --- a/media/audio/virtual_audio_output_stream.h +++ b/media/audio/virtual_audio_output_stream.h @@ -6,6 +6,7 @@ #define MEDIA_AUDIO_VIRTUAL_AUDIO_OUTPUT_STREAM_H_ #include "base/callback.h" +#include "base/macros.h" #include "base/threading/thread_checker.h" #include "media/audio/audio_io.h" #include "media/audio/audio_parameters.h" diff --git a/media/audio/win/audio_device_listener_win.h b/media/audio/win/audio_device_listener_win.h index d789d0d..7e39031 100644 --- a/media/audio/win/audio_device_listener_win.h +++ b/media/audio/win/audio_device_listener_win.h @@ -9,6 +9,7 @@ #include <string> #include "base/callback.h" +#include "base/macros.h" #include "base/threading/thread_checker.h" #include "base/time/time.h" #include "base/win/scoped_comptr.h" diff --git a/media/audio/win/audio_low_latency_input_win.h b/media/audio/win/audio_low_latency_input_win.h index 35e6818..e5278b5 100644 --- a/media/audio/win/audio_low_latency_input_win.h +++ b/media/audio/win/audio_low_latency_input_win.h @@ -62,6 +62,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/threading/non_thread_safe.h" #include "base/threading/platform_thread.h" #include "base/threading/simple_thread.h" diff --git a/media/audio/win/audio_low_latency_output_win.h b/media/audio/win/audio_low_latency_output_win.h index 007b4e0..16f9649 100644 --- a/media/audio/win/audio_low_latency_output_win.h +++ b/media/audio/win/audio_low_latency_output_win.h @@ -99,6 +99,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/threading/platform_thread.h" #include "base/threading/simple_thread.h" diff --git a/media/audio/win/audio_manager_win.h b/media/audio/win/audio_manager_win.h index 9826566..583a98b 100644 --- a/media/audio/win/audio_manager_win.h +++ b/media/audio/win/audio_manager_win.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "media/audio/audio_manager_base.h" namespace media { diff --git a/media/audio/win/core_audio_util_win.h b/media/audio/win/core_audio_util_win.h index 3ca7ff4..3b04da2 100644 --- a/media/audio/win/core_audio_util_win.h +++ b/media/audio/win/core_audio_util_win.h @@ -15,6 +15,7 @@ #include <mmdeviceapi.h> #include <string> +#include "base/macros.h" #include "base/time/time.h" #include "base/win/scoped_comptr.h" #include "media/audio/audio_device_name.h" diff --git a/media/audio/win/wavein_input_win.h b/media/audio/win/wavein_input_win.h index 673eca3..b42b55a 100644 --- a/media/audio/win/wavein_input_win.h +++ b/media/audio/win/wavein_input_win.h @@ -11,6 +11,7 @@ #include <mmsystem.h> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/synchronization/lock.h" #include "base/threading/thread_checker.h" #include "base/win/scoped_handle.h" diff --git a/media/audio/win/waveout_output_win.h b/media/audio/win/waveout_output_win.h index ec0a410..62fe828 100644 --- a/media/audio/win/waveout_output_win.h +++ b/media/audio/win/waveout_output_win.h @@ -9,6 +9,7 @@ #include <mmsystem.h> #include <mmreg.h> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/synchronization/lock.h" #include "base/win/scoped_handle.h" diff --git a/media/base/android/audio_decoder_job.h b/media/base/android/audio_decoder_job.h index 5d13b1c..1537c04 100644 --- a/media/base/android/audio_decoder_job.h +++ b/media/base/android/audio_decoder_job.h @@ -9,6 +9,7 @@ #include <vector> #include "base/callback.h" +#include "base/macros.h" #include "media/base/android/media_decoder_job.h" namespace media { diff --git a/media/base/android/media_codec_audio_decoder.h b/media/base/android/media_codec_audio_decoder.h index 4faab61..6b9a143 100644 --- a/media/base/android/media_codec_audio_decoder.h +++ b/media/base/android/media_codec_audio_decoder.h @@ -5,6 +5,7 @@ #ifndef MEDIA_BASE_ANDROID_MEDIA_CODEC_AUDIO_DECODER_H_ #define MEDIA_BASE_ANDROID_MEDIA_CODEC_AUDIO_DECODER_H_ +#include "base/macros.h" #include "media/base/android/media_codec_decoder.h" namespace media { diff --git a/media/base/android/media_codec_bridge.h b/media/base/android/media_codec_bridge.h index 02a29f9..0b103ae 100644 --- a/media/base/android/media_codec_bridge.h +++ b/media/base/android/media_codec_bridge.h @@ -12,6 +12,7 @@ #include <vector> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/time/time.h" #include "media/base/android/media_codec_util.h" #include "media/base/media_export.h" diff --git a/media/base/android/media_codec_player.h b/media/base/android/media_codec_player.h index fff4129..0898b1f 100644 --- a/media/base/android/media_codec_player.h +++ b/media/base/android/media_codec_player.h @@ -6,6 +6,7 @@ #define MEDIA_BASE_ANDROID_MEDIA_CODEC_PLAYER_H_ #include "base/android/scoped_java_ref.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread.h" diff --git a/media/base/android/media_codec_video_decoder.h b/media/base/android/media_codec_video_decoder.h index 072a61c..b0fc798 100644 --- a/media/base/android/media_codec_video_decoder.h +++ b/media/base/android/media_codec_video_decoder.h @@ -6,6 +6,7 @@ #define MEDIA_BASE_ANDROID_MEDIA_CODEC_VIDEO_DECODER_H_ #include <set> +#include "base/macros.h" #include "media/base/android/media_codec_decoder.h" #include "ui/gfx/geometry/size.h" #include "ui/gl/android/scoped_java_surface.h" diff --git a/media/base/android/media_decoder_job.h b/media/base/android/media_decoder_job.h index d82f89a..7d45718 100644 --- a/media/base/android/media_decoder_job.h +++ b/media/base/android/media_decoder_job.h @@ -6,6 +6,7 @@ #define MEDIA_BASE_ANDROID_MEDIA_DECODER_JOB_H_ #include "base/callback.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "media/base/android/demuxer_stream_player_params.h" diff --git a/media/base/android/media_drm_bridge.h b/media/base/android/media_drm_bridge.h index 87c1af2..1227ba2 100644 --- a/media/base/android/media_drm_bridge.h +++ b/media/base/android/media_drm_bridge.h @@ -11,6 +11,7 @@ #include "base/android/scoped_java_ref.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "media/base/android/provision_fetcher.h" diff --git a/media/base/android/media_player_android.h b/media/base/android/media_player_android.h index 24fb599..3ef1e7b 100644 --- a/media/base/android/media_player_android.h +++ b/media/base/android/media_player_android.h @@ -9,6 +9,7 @@ #include <string> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "media/base/android/media_player_listener.h" diff --git a/media/base/android/media_player_bridge.h b/media/base/android/media_player_bridge.h index b5031e8..67681185 100644 --- a/media/base/android/media_player_bridge.h +++ b/media/base/android/media_player_bridge.h @@ -11,6 +11,7 @@ #include "base/android/scoped_java_ref.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/strings/string16.h" diff --git a/media/base/android/media_player_listener.h b/media/base/android/media_player_listener.h index e0ffb29..6d15c63 100644 --- a/media/base/android/media_player_listener.h +++ b/media/base/android/media_player_listener.h @@ -8,6 +8,7 @@ #include <jni.h> #include "base/android/scoped_java_ref.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" diff --git a/media/base/android/media_source_player.h b/media/base/android/media_source_player.h index 0cfcfd0..20017f1 100644 --- a/media/base/android/media_source_player.h +++ b/media/base/android/media_source_player.h @@ -13,6 +13,7 @@ #include "base/android/scoped_java_ref.h" #include "base/callback.h" #include "base/cancelable_callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread.h" diff --git a/media/base/android/video_decoder_job.h b/media/base/android/video_decoder_job.h index 29d5761..03b6764 100644 --- a/media/base/android/video_decoder_job.h +++ b/media/base/android/video_decoder_job.h @@ -7,6 +7,7 @@ #include <jni.h> +#include "base/macros.h" #include "media/base/android/media_decoder_job.h" namespace media { diff --git a/media/base/android/webaudio_media_codec_bridge.h b/media/base/android/webaudio_media_codec_bridge.h index 9fbcf06..2d61001 100644 --- a/media/base/android/webaudio_media_codec_bridge.h +++ b/media/base/android/webaudio_media_codec_bridge.h @@ -10,6 +10,7 @@ #include "base/android/scoped_java_ref.h" #include "base/callback.h" #include "base/file_descriptor_posix.h" +#include "base/macros.h" #include "base/memory/shared_memory.h" #include "media/base/media_export.h" diff --git a/media/base/audio_block_fifo.h b/media/base/audio_block_fifo.h index 94786b9..a90a3df 100644 --- a/media/base/audio_block_fifo.h +++ b/media/base/audio_block_fifo.h @@ -5,6 +5,7 @@ #ifndef MEDIA_BASE_AUDIO_BLOCK_FIFO_H_ #define MEDIA_BASE_AUDIO_BLOCK_FIFO_H_ +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "media/base/audio_bus.h" #include "media/base/media_export.h" diff --git a/media/base/audio_buffer.h b/media/base/audio_buffer.h index fb73c34..8508689 100644 --- a/media/base/audio_buffer.h +++ b/media/base/audio_buffer.h @@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "base/memory/aligned_memory.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/media/base/audio_buffer_queue.h b/media/base/audio_buffer_queue.h index 28cd5bc..9871965 100644 --- a/media/base/audio_buffer_queue.h +++ b/media/base/audio_buffer_queue.h @@ -7,6 +7,7 @@ #include <deque> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "media/base/audio_buffer.h" #include "media/base/media_export.h" diff --git a/media/base/audio_bus.h b/media/base/audio_bus.h index 25e34e3..3a245b7 100644 --- a/media/base/audio_bus.h +++ b/media/base/audio_bus.h @@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "base/memory/aligned_memory.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/media/base/audio_converter.h b/media/base/audio_converter.h index 0b546dc..647cfd2 100644 --- a/media/base/audio_converter.h +++ b/media/base/audio_converter.h @@ -21,6 +21,7 @@ #include <list> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "media/audio/audio_parameters.h" diff --git a/media/base/audio_decoder.h b/media/base/audio_decoder.h index 337d2a7..681fac3 100644 --- a/media/base/audio_decoder.h +++ b/media/base/audio_decoder.h @@ -8,6 +8,7 @@ #include <string> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "media/base/audio_decoder_config.h" #include "media/base/cdm_context.h" diff --git a/media/base/audio_discard_helper.h b/media/base/audio_discard_helper.h index 7708a2f..94cf2e5 100644 --- a/media/base/audio_discard_helper.h +++ b/media/base/audio_discard_helper.h @@ -5,6 +5,7 @@ #ifndef MEDIA_BASE_AUDIO_DISCARD_HELPER_H_ #define MEDIA_BASE_AUDIO_DISCARD_HELPER_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/time/time.h" #include "media/base/audio_timestamp_helper.h" diff --git a/media/base/audio_fifo.h b/media/base/audio_fifo.h index c00dd40..213a61e 100644 --- a/media/base/audio_fifo.h +++ b/media/base/audio_fifo.h @@ -5,6 +5,7 @@ #ifndef MEDIA_BASE_AUDIO_FIFO_H_ #define MEDIA_BASE_AUDIO_FIFO_H_ +#include "base/macros.h" #include "media/base/audio_bus.h" #include "media/base/media_export.h" diff --git a/media/base/audio_hardware_config.h b/media/base/audio_hardware_config.h index 46f3192..f7d2678 100644 --- a/media/base/audio_hardware_config.h +++ b/media/base/audio_hardware_config.h @@ -6,6 +6,7 @@ #define MEDIA_BASE_AUDIO_HARDWARE_CONFIG_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/synchronization/lock.h" #include "media/audio/audio_parameters.h" #include "media/base/channel_layout.h" diff --git a/media/base/audio_hash.h b/media/base/audio_hash.h index 4f47d97..71a6507 100644 --- a/media/base/audio_hash.h +++ b/media/base/audio_hash.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/strings/string_piece.h" #include "media/base/media_export.h" diff --git a/media/base/audio_pull_fifo.h b/media/base/audio_pull_fifo.h index 338f9b4..a839c8d 100644 --- a/media/base/audio_pull_fifo.h +++ b/media/base/audio_pull_fifo.h @@ -6,6 +6,7 @@ #define MEDIA_BASE_AUDIO_PULL_FIFO_H_ #include "base/callback.h" +#include "base/macros.h" #include "media/base/media_export.h" namespace media { diff --git a/media/base/audio_renderer.h b/media/base/audio_renderer.h index aa59bf3..79438c7 100644 --- a/media/base/audio_renderer.h +++ b/media/base/audio_renderer.h @@ -6,6 +6,7 @@ #define MEDIA_BASE_AUDIO_RENDERER_H_ #include "base/callback.h" +#include "base/macros.h" #include "base/time/time.h" #include "media/base/buffering_state.h" #include "media/base/cdm_context.h" diff --git a/media/base/audio_renderer_mixer.h b/media/base/audio_renderer_mixer.h index 80e9d9b..c84779d 100644 --- a/media/base/audio_renderer_mixer.h +++ b/media/base/audio_renderer_mixer.h @@ -8,6 +8,7 @@ #include <map> #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/synchronization/lock.h" #include "base/time/time.h" diff --git a/media/base/audio_renderer_mixer_input.h b/media/base/audio_renderer_mixer_input.h index 9ec4518..50f54bd 100644 --- a/media/base/audio_renderer_mixer_input.h +++ b/media/base/audio_renderer_mixer_input.h @@ -8,6 +8,7 @@ #include <string> #include "base/callback.h" +#include "base/macros.h" #include "media/base/audio_converter.h" #include "media/base/audio_renderer_sink.h" #include "url/origin.h" diff --git a/media/base/audio_splicer.h b/media/base/audio_splicer.h index db25e53..bd07776 100644 --- a/media/base/audio_splicer.h +++ b/media/base/audio_splicer.h @@ -5,6 +5,7 @@ #ifndef MEDIA_BASE_AUDIO_SPLICER_H_ #define MEDIA_BASE_AUDIO_SPLICER_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" diff --git a/media/base/audio_timestamp_helper.h b/media/base/audio_timestamp_helper.h index 6862209..1ec4120 100644 --- a/media/base/audio_timestamp_helper.h +++ b/media/base/audio_timestamp_helper.h @@ -5,6 +5,7 @@ #ifndef MEDIA_BASE_AUDIO_TIMESTAMP_HELPER_H_ #define MEDIA_BASE_AUDIO_TIMESTAMP_HELPER_H_ +#include "base/macros.h" #include "base/time/time.h" #include "media/base/media_export.h" diff --git a/media/base/bit_reader.h b/media/base/bit_reader.h index 0dcd895..b91145c 100644 --- a/media/base/bit_reader.h +++ b/media/base/bit_reader.h @@ -6,6 +6,7 @@ #define MEDIA_BASE_BIT_READER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "media/base/bit_reader_core.h" #include "media/base/media_export.h" diff --git a/media/base/bit_reader_core.h b/media/base/bit_reader_core.h index 587d71d..a40e405 100644 --- a/media/base/bit_reader_core.h +++ b/media/base/bit_reader_core.h @@ -6,6 +6,7 @@ #define MEDIA_BASE_BIT_READER_CORE_H_ #include "base/logging.h" +#include "base/macros.h" #include "media/base/media_export.h" namespace media { diff --git a/media/base/byte_queue.h b/media/base/byte_queue.h index 1533adb..e9aedd9 100644 --- a/media/base/byte_queue.h +++ b/media/base/byte_queue.h @@ -5,6 +5,7 @@ #ifndef MEDIA_BASE_BYTE_QUEUE_H_ #define MEDIA_BASE_BYTE_QUEUE_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "media/base/media_export.h" diff --git a/media/base/cdm_callback_promise.h b/media/base/cdm_callback_promise.h index e4b5849..875fb78 100644 --- a/media/base/cdm_callback_promise.h +++ b/media/base/cdm_callback_promise.h @@ -8,6 +8,7 @@ #include <string> #include "base/callback.h" +#include "base/macros.h" #include "media/base/cdm_promise.h" #include "media/base/media_export.h" #include "media/base/media_keys.h" diff --git a/media/base/cdm_factory.h b/media/base/cdm_factory.h index a120707..d7f4961 100644 --- a/media/base/cdm_factory.h +++ b/media/base/cdm_factory.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "media/base/media_export.h" #include "media/base/media_keys.h" diff --git a/media/base/cdm_promise.h b/media/base/cdm_promise.h index fa15cb9..2c74483 100644 --- a/media/base/cdm_promise.h +++ b/media/base/cdm_promise.h @@ -8,6 +8,7 @@ #include <string> #include "base/logging.h" +#include "base/macros.h" #include "media/base/media_export.h" #include "media/base/media_keys.h" diff --git a/media/base/data_buffer.h b/media/base/data_buffer.h index bb81921..6ae50f1 100644 --- a/media/base/data_buffer.h +++ b/media/base/data_buffer.h @@ -6,6 +6,7 @@ #define MEDIA_BASE_DATA_BUFFER_H_ #include "base/logging.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" diff --git a/media/base/data_source.h b/media/base/data_source.h index 8a63d6b..cfd185f 100644 --- a/media/base/data_source.h +++ b/media/base/data_source.h @@ -6,6 +6,7 @@ #define MEDIA_BASE_DATA_SOURCE_H_ #include "base/callback.h" +#include "base/macros.h" #include "base/time/time.h" #include "media/base/media_export.h" diff --git a/media/base/decoder_buffer.h b/media/base/decoder_buffer.h index 3e57f29..ea4b044 100644 --- a/media/base/decoder_buffer.h +++ b/media/base/decoder_buffer.h @@ -9,6 +9,7 @@ #include <utility> #include "base/logging.h" +#include "base/macros.h" #include "base/memory/aligned_memory.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/media/base/decoder_buffer_queue.h b/media/base/decoder_buffer_queue.h index 9c2c2dc..8a097f6 100644 --- a/media/base/decoder_buffer_queue.h +++ b/media/base/decoder_buffer_queue.h @@ -7,6 +7,7 @@ #include <deque> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/time/time.h" #include "media/base/media_export.h" diff --git a/media/base/decrypt_config.h b/media/base/decrypt_config.h index c9e2373..cc6ccae 100644 --- a/media/base/decrypt_config.h +++ b/media/base/decrypt_config.h @@ -9,6 +9,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "media/base/media_export.h" diff --git a/media/base/decryptor.h b/media/base/decryptor.h index 04435f2..9c7f64d 100644 --- a/media/base/decryptor.h +++ b/media/base/decryptor.h @@ -8,6 +8,7 @@ #include <list> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "media/base/audio_buffer.h" #include "media/base/media_export.h" diff --git a/media/base/demuxer.h b/media/base/demuxer.h index 5e3fc4a..7be31ab 100644 --- a/media/base/demuxer.h +++ b/media/base/demuxer.h @@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "base/time/time.h" #include "media/base/data_source.h" #include "media/base/demuxer_stream.h" diff --git a/media/base/demuxer_stream_provider.h b/media/base/demuxer_stream_provider.h index 1d27092..e5289f3 100644 --- a/media/base/demuxer_stream_provider.h +++ b/media/base/demuxer_stream_provider.h @@ -5,6 +5,7 @@ #ifndef MEDIA_BASE_DEMUXER_STREAM_PROVIDER_H_ #define MEDIA_BASE_DEMUXER_STREAM_PROVIDER_H_ +#include "base/macros.h" #include "media/base/demuxer_stream.h" #include "media/base/media_export.h" diff --git a/media/base/fake_audio_render_callback.h b/media/base/fake_audio_render_callback.h index 49d64ba..87c3382 100644 --- a/media/base/fake_audio_render_callback.h +++ b/media/base/fake_audio_render_callback.h @@ -5,6 +5,7 @@ #ifndef MEDIA_BASE_FAKE_AUDIO_RENDER_CALLBACK_H_ #define MEDIA_BASE_FAKE_AUDIO_RENDER_CALLBACK_H_ +#include "base/macros.h" #include "media/base/audio_converter.h" #include "media/base/audio_renderer_sink.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/media/base/fake_audio_renderer_sink.h b/media/base/fake_audio_renderer_sink.h index 765257d..8ac055a 100644 --- a/media/base/fake_audio_renderer_sink.h +++ b/media/base/fake_audio_renderer_sink.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "media/audio/audio_parameters.h" #include "media/base/audio_renderer_sink.h" diff --git a/media/base/fake_demuxer_stream.h b/media/base/fake_demuxer_stream.h index ef2af06..c927636 100644 --- a/media/base/fake_demuxer_stream.h +++ b/media/base/fake_demuxer_stream.h @@ -5,6 +5,7 @@ #ifndef MEDIA_BASE_FAKE_DEMUXER_STREAM_H_ #define MEDIA_BASE_FAKE_DEMUXER_STREAM_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "media/base/audio_decoder_config.h" #include "media/base/demuxer_stream.h" diff --git a/media/base/fake_output_device.h b/media/base/fake_output_device.h index 121a375..45a6abb 100644 --- a/media/base/fake_output_device.h +++ b/media/base/fake_output_device.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "media/base/output_device.h" namespace media { diff --git a/media/base/fake_text_track_stream.h b/media/base/fake_text_track_stream.h index bbfbe8b..6088286 100644 --- a/media/base/fake_text_track_stream.h +++ b/media/base/fake_text_track_stream.h @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "media/base/audio_decoder_config.h" #include "media/base/demuxer_stream.h" diff --git a/media/base/keyboard_event_counter.h b/media/base/keyboard_event_counter.h index accb659..47c31a9 100644 --- a/media/base/keyboard_event_counter.h +++ b/media/base/keyboard_event_counter.h @@ -7,6 +7,7 @@ #include <set> +#include "base/macros.h" #include "base/synchronization/lock.h" #include "media/base/media_export.h" #include "ui/events/event_constants.h" diff --git a/media/base/mac/corevideo_glue.h b/media/base/mac/corevideo_glue.h index ca40047..302953d 100644 --- a/media/base/mac/corevideo_glue.h +++ b/media/base/mac/corevideo_glue.h @@ -5,6 +5,7 @@ #ifndef MEDIA_BASE_MAC_COREVIDEO_GLUE_H_ #define MEDIA_BASE_MAC_COREVIDEO_GLUE_H_ +#include "base/macros.h" #include "media/base/media_export.h" // Although CoreVideo exists in 10.6, not all of its types and functions were diff --git a/media/base/media_file_checker.h b/media/base/media_file_checker.h index 03be321..86db498 100644 --- a/media/base/media_file_checker.h +++ b/media/base/media_file_checker.h @@ -6,6 +6,7 @@ #define MEDIA_BASE_MEDIA_FILE_CHECKER_H_ #include "base/files/file.h" +#include "base/macros.h" #include "media/base/media_export.h" namespace base { diff --git a/media/base/media_keys.h b/media/base/media_keys.h index 37b3019..63ca4eb 100644 --- a/media/base/media_keys.h +++ b/media/base/media_keys.h @@ -9,6 +9,7 @@ #include <vector> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" diff --git a/media/base/media_log.h b/media/base/media_log.h index 24fabb2..680ae3d 100644 --- a/media/base/media_log.h +++ b/media/base/media_log.h @@ -9,6 +9,7 @@ #include <string> #include "base/logging.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "media/base/media_export.h" diff --git a/media/base/mock_audio_renderer_sink.h b/media/base/mock_audio_renderer_sink.h index a966f71..2194bc9 100644 --- a/media/base/mock_audio_renderer_sink.h +++ b/media/base/mock_audio_renderer_sink.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "media/audio/audio_parameters.h" #include "media/base/audio_renderer_sink.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/media/base/mock_demuxer_host.h b/media/base/mock_demuxer_host.h index f9e8e43..614f971 100644 --- a/media/base/mock_demuxer_host.h +++ b/media/base/mock_demuxer_host.h @@ -5,6 +5,7 @@ #ifndef MEDIA_BASE_MOCK_DEMUXER_HOST_H_ #define MEDIA_BASE_MOCK_DEMUXER_HOST_H_ +#include "base/macros.h" #include "media/base/demuxer.h" #include "media/base/text_track_config.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/media/base/mock_media_log.h b/media/base/mock_media_log.h index 421c2d2..f58dc1d 100644 --- a/media/base/mock_media_log.h +++ b/media/base/mock_media_log.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "media/base/media_log.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/media/base/moving_average.h b/media/base/moving_average.h index 948fe31..bb28653 100644 --- a/media/base/moving_average.h +++ b/media/base/moving_average.h @@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "base/time/time.h" #include "media/base/media_export.h" diff --git a/media/base/multi_channel_resampler.h b/media/base/multi_channel_resampler.h index 690f750..84c50b9 100644 --- a/media/base/multi_channel_resampler.h +++ b/media/base/multi_channel_resampler.h @@ -8,6 +8,7 @@ #include <vector> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "media/base/sinc_resampler.h" diff --git a/media/base/null_video_sink.h b/media/base/null_video_sink.h index b5a384b..cafcbf0 100644 --- a/media/base/null_video_sink.h +++ b/media/base/null_video_sink.h @@ -6,6 +6,7 @@ #define MEDIA_AUDIO_NULL_VIDEO_SINK_H_ #include "base/cancelable_callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/time/default_tick_clock.h" #include "base/time/tick_clock.h" diff --git a/media/base/pipeline.h b/media/base/pipeline.h index 3ec8feb..ba99348 100644 --- a/media/base/pipeline.h +++ b/media/base/pipeline.h @@ -6,6 +6,7 @@ #define MEDIA_BASE_PIPELINE_H_ #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/synchronization/lock.h" diff --git a/media/base/player_tracker.h b/media/base/player_tracker.h index aba01b3..57c59ab 100644 --- a/media/base/player_tracker.h +++ b/media/base/player_tracker.h @@ -6,6 +6,7 @@ #define MEDIA_BASE_PLAYER_TRACKER_H_ #include "base/callback.h" +#include "base/macros.h" #include "media/base/media_export.h" namespace media { diff --git a/media/base/renderer.h b/media/base/renderer.h index d5b323b..89e349a 100644 --- a/media/base/renderer.h +++ b/media/base/renderer.h @@ -6,6 +6,7 @@ #define MEDIA_BASE_RENDERER_H_ #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/time/time.h" #include "media/base/buffering_state.h" diff --git a/media/base/seekable_buffer.h b/media/base/seekable_buffer.h index 42c3abc..91b68db 100644 --- a/media/base/seekable_buffer.h +++ b/media/base/seekable_buffer.h @@ -35,6 +35,7 @@ #include <list> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/time/time.h" #include "media/base/media_export.h" diff --git a/media/base/serial_runner.h b/media/base/serial_runner.h index fb1b660..4847e4c 100644 --- a/media/base/serial_runner.h +++ b/media/base/serial_runner.h @@ -9,6 +9,7 @@ #include <queue> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" diff --git a/media/base/sinc_resampler.h b/media/base/sinc_resampler.h index e12f381..f320633 100644 --- a/media/base/sinc_resampler.h +++ b/media/base/sinc_resampler.h @@ -7,6 +7,7 @@ #include "base/callback.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/aligned_memory.h" #include "base/memory/scoped_ptr.h" #include "build/build_config.h" diff --git a/media/base/stream_parser.h b/media/base/stream_parser.h index 0554d29..1db22dd 100644 --- a/media/base/stream_parser.h +++ b/media/base/stream_parser.h @@ -11,6 +11,7 @@ #include <vector> #include "base/callback_forward.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" diff --git a/media/base/stream_parser_buffer.h b/media/base/stream_parser_buffer.h index 06b0c0d..26f5742 100644 --- a/media/base/stream_parser_buffer.h +++ b/media/base/stream_parser_buffer.h @@ -7,6 +7,7 @@ #include <deque> +#include "base/macros.h" #include "media/base/decoder_buffer.h" #include "media/base/demuxer_stream.h" #include "media/base/media_export.h" diff --git a/media/base/test_helpers.h b/media/base/test_helpers.h index ff89c59a..293e517 100644 --- a/media/base/test_helpers.h +++ b/media/base/test_helpers.h @@ -6,6 +6,7 @@ #define MEDIA_BASE_TEST_HELPERS_H_ #include "base/callback.h" +#include "base/macros.h" #include "media/base/channel_layout.h" #include "media/base/media_log.h" #include "media/base/pipeline_status.h" diff --git a/media/base/text_cue.h b/media/base/text_cue.h index 2afae8d..08f5c24 100644 --- a/media/base/text_cue.h +++ b/media/base/text_cue.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/time/time.h" #include "media/base/media_export.h" diff --git a/media/base/text_renderer.h b/media/base/text_renderer.h index 5890952..2888daf 100644 --- a/media/base/text_renderer.h +++ b/media/base/text_renderer.h @@ -9,6 +9,7 @@ #include <set> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "media/base/demuxer_stream.h" diff --git a/media/base/time_delta_interpolator.h b/media/base/time_delta_interpolator.h index f05a74c..75f355f 100644 --- a/media/base/time_delta_interpolator.h +++ b/media/base/time_delta_interpolator.h @@ -5,6 +5,7 @@ #ifndef MEDIA_BASE_TIME_DELTA_INTERPOLATOR_H_ #define MEDIA_BASE_TIME_DELTA_INTERPOLATOR_H_ +#include "base/macros.h" #include "base/time/time.h" #include "media/base/media_export.h" diff --git a/media/base/user_input_monitor.h b/media/base/user_input_monitor.h index 8016a00..574d695 100644 --- a/media/base/user_input_monitor.h +++ b/media/base/user_input_monitor.h @@ -5,6 +5,7 @@ #ifndef MEDIA_BASE_USER_INPUT_MONITOR_H_ #define MEDIA_BASE_USER_INPUT_MONITOR_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list_threadsafe.h" diff --git a/media/base/video_decoder.h b/media/base/video_decoder.h index 074718b..68737c7 100644 --- a/media/base/video_decoder.h +++ b/media/base/video_decoder.h @@ -8,6 +8,7 @@ #include <string> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "media/base/cdm_context.h" #include "media/base/media_export.h" diff --git a/media/base/video_frame_metadata.h b/media/base/video_frame_metadata.h index 5e4c900..b35225b 100644 --- a/media/base/video_frame_metadata.h +++ b/media/base/video_frame_metadata.h @@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/time/time.h" #include "base/values.h" #include "media/base/media_export.h" diff --git a/media/base/video_frame_pool.h b/media/base/video_frame_pool.h index d5c1690..167c0e9 100644 --- a/media/base/video_frame_pool.h +++ b/media/base/video_frame_pool.h @@ -5,6 +5,7 @@ #ifndef MEDIA_BASE_VIDEO_FRAME_POOL_H_ #define MEDIA_BASE_VIDEO_FRAME_POOL_H_ +#include "base/macros.h" #include "media/base/media_export.h" #include "media/base/video_frame.h" diff --git a/media/base/video_renderer.h b/media/base/video_renderer.h index d85ec60..6acce77 100644 --- a/media/base/video_renderer.h +++ b/media/base/video_renderer.h @@ -6,6 +6,7 @@ #define MEDIA_BASE_VIDEO_RENDERER_H_ #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/time/time.h" #include "media/base/buffering_state.h" diff --git a/media/base/wall_clock_time_source.h b/media/base/wall_clock_time_source.h index 4046e8e..a19b1c8 100644 --- a/media/base/wall_clock_time_source.h +++ b/media/base/wall_clock_time_source.h @@ -5,6 +5,7 @@ #ifndef MEDIA_BASE_WALL_CLOCK_TIME_SOURCE_H_ #define MEDIA_BASE_WALL_CLOCK_TIME_SOURCE_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/synchronization/lock.h" #include "base/time/default_tick_clock.h" diff --git a/media/blink/active_loader.h b/media/blink/active_loader.h index 5d5d22c..d6a52b5 100644 --- a/media/blink/active_loader.h +++ b/media/blink/active_loader.h @@ -5,6 +5,7 @@ #ifndef MEDIA_BLINK_ACTIVE_LOADER_H_ #define MEDIA_BLINK_ACTIVE_LOADER_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "media/blink/media_blink_export.h" diff --git a/media/blink/buffered_data_source.h b/media/blink/buffered_data_source.h index 5b4546b..5208499 100644 --- a/media/blink/buffered_data_source.h +++ b/media/blink/buffered_data_source.h @@ -9,6 +9,7 @@ #include <vector> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/synchronization/lock.h" diff --git a/media/blink/buffered_data_source_host_impl.h b/media/blink/buffered_data_source_host_impl.h index cf61846..f50084e 100644 --- a/media/blink/buffered_data_source_host_impl.h +++ b/media/blink/buffered_data_source_host_impl.h @@ -5,6 +5,7 @@ #ifndef MEDIA_BLINK_BUFFERED_DATA_SOURCE_HOST_IMPL_H_ #define MEDIA_BLINK_BUFFERED_DATA_SOURCE_HOST_IMPL_H_ +#include "base/macros.h" #include "base/time/time.h" #include "media/blink/buffered_data_source.h" #include "media/blink/media_blink_export.h" diff --git a/media/blink/buffered_resource_loader.h b/media/blink/buffered_resource_loader.h index 942949e..4410866 100644 --- a/media/blink/buffered_resource_loader.h +++ b/media/blink/buffered_resource_loader.h @@ -8,6 +8,7 @@ #include <string> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "media/base/seekable_buffer.h" #include "media/blink/active_loader.h" diff --git a/media/blink/cdm_result_promise.h b/media/blink/cdm_result_promise.h index c3410b7..d34912f 100644 --- a/media/blink/cdm_result_promise.h +++ b/media/blink/cdm_result_promise.h @@ -5,6 +5,7 @@ #ifndef MEDIA_BLINK_CDM_RESULT_PROMISE_H_ #define MEDIA_BLINK_CDM_RESULT_PROMISE_H_ +#include "base/macros.h" #include "media/base/cdm_promise.h" #include "media/base/media_keys.h" #include "media/blink/cdm_result_promise_helper.h" diff --git a/media/blink/cdm_session_adapter.h b/media/blink/cdm_session_adapter.h index 5fe3ffc..1acdf7a 100644 --- a/media/blink/cdm_session_adapter.h +++ b/media/blink/cdm_session_adapter.h @@ -10,6 +10,7 @@ #include <vector> #include "base/containers/hash_tables.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "media/base/media_keys.h" diff --git a/media/blink/encrypted_media_player_support.h b/media/blink/encrypted_media_player_support.h index dbc9f46..e2f1cfd 100644 --- a/media/blink/encrypted_media_player_support.h +++ b/media/blink/encrypted_media_player_support.h @@ -9,6 +9,7 @@ #include <vector> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "media/base/cdm_context.h" diff --git a/media/blink/key_system_config_selector.h b/media/blink/key_system_config_selector.h index 55e6b33..b45700a 100644 --- a/media/blink/key_system_config_selector.h +++ b/media/blink/key_system_config_selector.h @@ -10,6 +10,7 @@ #include "base/bind.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "media/base/eme_constants.h" diff --git a/media/blink/mock_weburlloader.h b/media/blink/mock_weburlloader.h index 68cf6da..6072ad0 100644 --- a/media/blink/mock_weburlloader.h +++ b/media/blink/mock_weburlloader.h @@ -5,6 +5,7 @@ #ifndef MEDIA_BLINK_MOCK_WEBURLLOADER_H_ #define MEDIA_BLINK_MOCK_WEBURLLOADER_H_ +#include "base/macros.h" #include "testing/gmock/include/gmock/gmock.h" #include "third_party/WebKit/public/platform/WebURLLoader.h" diff --git a/media/blink/new_session_cdm_result_promise.h b/media/blink/new_session_cdm_result_promise.h index 48d58f6..4ab9267 100644 --- a/media/blink/new_session_cdm_result_promise.h +++ b/media/blink/new_session_cdm_result_promise.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "media/base/cdm_promise.h" #include "media/base/media_keys.h" #include "media/blink/media_blink_export.h" diff --git a/media/blink/test_response_generator.h b/media/blink/test_response_generator.h index 1a8b16e..0341e5e1 100644 --- a/media/blink/test_response_generator.h +++ b/media/blink/test_response_generator.h @@ -5,6 +5,7 @@ #ifndef MEDIA_BLINK_TEST_RESPONSE_GENERATOR_H_ #define MEDIA_BLINK_TEST_RESPONSE_GENERATOR_H_ +#include "base/macros.h" #include "third_party/WebKit/public/platform/WebURLError.h" #include "third_party/WebKit/public/platform/WebURLResponse.h" #include "url/gurl.h" diff --git a/media/blink/texttrack_impl.h b/media/blink/texttrack_impl.h index 5dcae15..5ebb657 100644 --- a/media/blink/texttrack_impl.h +++ b/media/blink/texttrack_impl.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "media/base/text_track.h" diff --git a/media/blink/video_frame_compositor.h b/media/blink/video_frame_compositor.h index ed40617..f7c495d 100644 --- a/media/blink/video_frame_compositor.h +++ b/media/blink/video_frame_compositor.h @@ -6,6 +6,7 @@ #define MEDIA_BLINK_VIDEO_FRAME_COMPOSITOR_H_ #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/single_thread_task_runner.h" #include "base/synchronization/lock.h" diff --git a/media/blink/webaudiosourceprovider_impl.h b/media/blink/webaudiosourceprovider_impl.h index 947c33c..1feb33f 100644 --- a/media/blink/webaudiosourceprovider_impl.h +++ b/media/blink/webaudiosourceprovider_impl.h @@ -8,6 +8,7 @@ #include <string> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/synchronization/lock.h" #include "media/base/audio_renderer_sink.h" diff --git a/media/blink/webcontentdecryptionmodule_impl.h b/media/blink/webcontentdecryptionmodule_impl.h index d75adb8..c11295e 100644 --- a/media/blink/webcontentdecryptionmodule_impl.h +++ b/media/blink/webcontentdecryptionmodule_impl.h @@ -5,6 +5,7 @@ #ifndef MEDIA_BLINK_WEBCONTENTDECRYPTIONMODULE_IMPL_H_ #define MEDIA_BLINK_WEBCONTENTDECRYPTIONMODULE_IMPL_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" diff --git a/media/blink/webcontentdecryptionmoduleaccess_impl.h b/media/blink/webcontentdecryptionmoduleaccess_impl.h index 72e3de9..629878a 100644 --- a/media/blink/webcontentdecryptionmoduleaccess_impl.h +++ b/media/blink/webcontentdecryptionmoduleaccess_impl.h @@ -5,6 +5,7 @@ #ifndef MEDIA_BLINK_WEBCONTENTDECRYPTIONMODULEACCESS_IMPL_H_ #define MEDIA_BLINK_WEBCONTENTDECRYPTIONMODULEACCESS_IMPL_H_ +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "media/base/cdm_config.h" #include "third_party/WebKit/public/platform/WebContentDecryptionModuleAccess.h" diff --git a/media/blink/webcontentdecryptionmodulesession_impl.h b/media/blink/webcontentdecryptionmodulesession_impl.h index 4a41d83..956c18d 100644 --- a/media/blink/webcontentdecryptionmodulesession_impl.h +++ b/media/blink/webcontentdecryptionmodulesession_impl.h @@ -9,6 +9,7 @@ #include <vector> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h" diff --git a/media/blink/webinbandtexttrack_impl.h b/media/blink/webinbandtexttrack_impl.h index 3225dac..cf3d947 100644 --- a/media/blink/webinbandtexttrack_impl.h +++ b/media/blink/webinbandtexttrack_impl.h @@ -5,6 +5,7 @@ #ifndef MEDIA_BLINK_WEBINBANDTEXTTRACK_IMPL_H_ #define MEDIA_BLINK_WEBINBANDTEXTTRACK_IMPL_H_ +#include "base/macros.h" #include "third_party/WebKit/public/platform/WebInbandTextTrack.h" #include "third_party/WebKit/public/platform/WebString.h" diff --git a/media/blink/webmediaplayer_impl.h b/media/blink/webmediaplayer_impl.h index 1e602f0..c5ef54c 100644 --- a/media/blink/webmediaplayer_impl.h +++ b/media/blink/webmediaplayer_impl.h @@ -9,6 +9,7 @@ #include <vector> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/media/blink/webmediaplayer_params.h b/media/blink/webmediaplayer_params.h index 8022431..7e6cf29 100644 --- a/media/blink/webmediaplayer_params.h +++ b/media/blink/webmediaplayer_params.h @@ -6,6 +6,7 @@ #define MEDIA_BLINK_WEBMEDIAPLAYER_PARAMS_H_ #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "media/blink/media_blink_export.h" #include "media/filters/context_3d.h" diff --git a/media/blink/webmediasource_impl.h b/media/blink/webmediasource_impl.h index 6ee8da4..68e17834 100644 --- a/media/blink/webmediasource_impl.h +++ b/media/blink/webmediasource_impl.h @@ -8,6 +8,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "media/base/media_log.h" #include "media/blink/media_blink_export.h" #include "third_party/WebKit/public/platform/WebMediaSource.h" diff --git a/media/capture/content/screen_capture_device_core.h b/media/capture/content/screen_capture_device_core.h index d7250e7..7e30154 100644 --- a/media/capture/content/screen_capture_device_core.h +++ b/media/capture/content/screen_capture_device_core.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h" diff --git a/media/capture/content/smooth_event_sampler.h b/media/capture/content/smooth_event_sampler.h index ef78ae9..6b69a10 100644 --- a/media/capture/content/smooth_event_sampler.h +++ b/media/capture/content/smooth_event_sampler.h @@ -5,6 +5,7 @@ #ifndef MEDIA_CAPTURE_SMOOTH_EVENT_SAMPLER_H_ #define MEDIA_CAPTURE_SMOOTH_EVENT_SAMPLER_H_ +#include "base/macros.h" #include "base/time/time.h" #include "media/base/media_export.h" diff --git a/media/capture/video/android/video_capture_device_android.h b/media/capture/video/android/video_capture_device_android.h index 200e35c..cfddf7d 100644 --- a/media/capture/video/android/video_capture_device_android.h +++ b/media/capture/video/android/video_capture_device_android.h @@ -9,6 +9,7 @@ #include <string> #include "base/android/scoped_java_ref.h" +#include "base/macros.h" #include "base/synchronization/lock.h" #include "base/threading/thread.h" #include "base/time/time.h" diff --git a/media/capture/video/android/video_capture_device_factory_android.h b/media/capture/video/android/video_capture_device_factory_android.h index 5ca432a..da500a0 100644 --- a/media/capture/video/android/video_capture_device_factory_android.h +++ b/media/capture/video/android/video_capture_device_factory_android.h @@ -10,6 +10,7 @@ #include <jni.h> #include "base/android/scoped_java_ref.h" +#include "base/macros.h" #include "media/capture/video/video_capture_device.h" namespace media { diff --git a/media/capture/video/fake_video_capture_device.h b/media/capture/video/fake_video_capture_device.h index ce94e24..c311104 100644 --- a/media/capture/video/fake_video_capture_device.h +++ b/media/capture/video/fake_video_capture_device.h @@ -11,6 +11,7 @@ #include <string> #include "base/atomicops.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread.h" diff --git a/media/capture/video/file_video_capture_device.h b/media/capture/video/file_video_capture_device.h index 76edf8d..7a02a92 100644 --- a/media/capture/video/file_video_capture_device.h +++ b/media/capture/video/file_video_capture_device.h @@ -9,6 +9,7 @@ #include "base/files/file.h" #include "base/files/memory_mapped_file.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/threading/thread.h" #include "base/threading/thread_checker.h" diff --git a/media/capture/video/linux/v4l2_capture_delegate.h b/media/capture/video/linux/v4l2_capture_delegate.h index 28cec82..c07dccf 100644 --- a/media/capture/video/linux/v4l2_capture_delegate.h +++ b/media/capture/video/linux/v4l2_capture_delegate.h @@ -12,6 +12,7 @@ #endif #include "base/files/scoped_file.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "media/capture/video/video_capture_device.h" diff --git a/media/capture/video/linux/video_capture_device_chromeos.h b/media/capture/video/linux/video_capture_device_chromeos.h index 832d8ce..8b5fafc 100644 --- a/media/capture/video/linux/video_capture_device_chromeos.h +++ b/media/capture/video/linux/video_capture_device_chromeos.h @@ -5,6 +5,7 @@ #ifndef MEDIA_VIDEO_CAPTURE_LINUX_VIDEO_CAPTURE_DEVICE_CHROMEOS_H_ #define MEDIA_VIDEO_CAPTURE_LINUX_VIDEO_CAPTURE_DEVICE_CHROMEOS_H_ +#include "base/macros.h" #include "media/capture/video/linux/video_capture_device_linux.h" namespace gfx { diff --git a/media/capture/video/linux/video_capture_device_factory_linux.h b/media/capture/video/linux/video_capture_device_factory_linux.h index 5a9c140..6c6747c 100644 --- a/media/capture/video/linux/video_capture_device_factory_linux.h +++ b/media/capture/video/linux/video_capture_device_factory_linux.h @@ -9,6 +9,7 @@ #include "media/capture/video/video_capture_device_factory.h" +#include "base/macros.h" #include "media/base/video_capture_types.h" namespace media { diff --git a/media/capture/video/linux/video_capture_device_linux.h b/media/capture/video/linux/video_capture_device_linux.h index b8918e5..27e44ae 100644 --- a/media/capture/video/linux/video_capture_device_linux.h +++ b/media/capture/video/linux/video_capture_device_linux.h @@ -14,6 +14,7 @@ #include "base/files/file_util.h" #include "base/files/scoped_file.h" +#include "base/macros.h" #include "base/threading/thread.h" #include "media/base/video_capture_types.h" #include "media/capture/video/video_capture_device.h" diff --git a/media/capture/video/mac/video_capture_device_decklink_mac.h b/media/capture/video/mac/video_capture_device_decklink_mac.h index 5a584b0..641fba6 100644 --- a/media/capture/video/mac/video_capture_device_decklink_mac.h +++ b/media/capture/video/mac/video_capture_device_decklink_mac.h @@ -12,6 +12,7 @@ #import <Foundation/Foundation.h> +#include "base/macros.h" #include "base/synchronization/lock.h" #include "base/threading/thread_checker.h" diff --git a/media/capture/video/mac/video_capture_device_factory_mac.h b/media/capture/video/mac/video_capture_device_factory_mac.h index bc2df52..f5649b9 100644 --- a/media/capture/video/mac/video_capture_device_factory_mac.h +++ b/media/capture/video/mac/video_capture_device_factory_mac.h @@ -7,6 +7,7 @@ #ifndef MEDIA_VIDEO_CAPTURE_VIDEO_CAPTURE_DEVICE_FACTORY_MAC_H_ #define MEDIA_VIDEO_CAPTURE_VIDEO_CAPTURE_DEVICE_FACTORY_MAC_H_ +#include "base/macros.h" #include "media/capture/video/video_capture_device_factory.h" namespace media { diff --git a/media/capture/video/mac/video_capture_device_mac.h b/media/capture/video/mac/video_capture_device_mac.h index 4d4f228..1ce41e4 100644 --- a/media/capture/video/mac/video_capture_device_mac.h +++ b/media/capture/video/mac/video_capture_device_mac.h @@ -16,6 +16,7 @@ #include "base/compiler_specific.h" #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "media/base/video_capture_types.h" diff --git a/media/capture/video/video_capture_device_factory.h b/media/capture/video/video_capture_device_factory.h index 1cd5d17..a0f3c80 100644 --- a/media/capture/video/video_capture_device_factory.h +++ b/media/capture/video/video_capture_device_factory.h @@ -5,6 +5,7 @@ #ifndef MEDIA_VIDEO_CAPTURE_VIDEO_CAPTURE_DEVICE_FACTORY_H_ #define MEDIA_VIDEO_CAPTURE_VIDEO_CAPTURE_DEVICE_FACTORY_H_ +#include "base/macros.h" #include "base/threading/thread_checker.h" #include "media/capture/video/video_capture_device.h" diff --git a/media/capture/video/win/filter_base_win.h b/media/capture/video/win/filter_base_win.h index 2294742..ef0f677 100644 --- a/media/capture/video/win/filter_base_win.h +++ b/media/capture/video/win/filter_base_win.h @@ -12,6 +12,7 @@ #define NO_DSHOW_STRSAFE #include <dshow.h> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/win/scoped_comptr.h" diff --git a/media/capture/video/win/sink_filter_win.h b/media/capture/video/win/sink_filter_win.h index ec8d6b4..043f57e 100644 --- a/media/capture/video/win/sink_filter_win.h +++ b/media/capture/video/win/sink_filter_win.h @@ -10,6 +10,7 @@ #include <windows.h> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "media/base/video_capture_types.h" #include "media/capture/video/video_capture_device.h" diff --git a/media/capture/video/win/sink_input_pin_win.h b/media/capture/video/win/sink_input_pin_win.h index 2d62783..ecfb1bf 100644 --- a/media/capture/video/win/sink_input_pin_win.h +++ b/media/capture/video/win/sink_input_pin_win.h @@ -8,6 +8,7 @@ #ifndef MEDIA_VIDEO_CAPTURE_WIN_SINK_INPUT_PIN_WIN_H_ #define MEDIA_VIDEO_CAPTURE_WIN_SINK_INPUT_PIN_WIN_H_ +#include "base/macros.h" #include "media/base/video_capture_types.h" #include "media/capture/video/video_capture_device.h" #include "media/capture/video/win/pin_base_win.h" diff --git a/media/capture/video/win/video_capture_device_factory_win.h b/media/capture/video/win/video_capture_device_factory_win.h index 1512925..df4be02 100644 --- a/media/capture/video/win/video_capture_device_factory_win.h +++ b/media/capture/video/win/video_capture_device_factory_win.h @@ -7,6 +7,7 @@ #ifndef MEDIA_VIDEO_CAPTURE_VIDEO_CAPTURE_DEVICE_FACTORY_WIN_H_ #define MEDIA_VIDEO_CAPTURE_VIDEO_CAPTURE_DEVICE_FACTORY_WIN_H_ +#include "base/macros.h" #include "media/capture/video/video_capture_device_factory.h" namespace media { diff --git a/media/capture/video/win/video_capture_device_mf_win.h b/media/capture/video/win/video_capture_device_mf_win.h index 8ca664a..7e21c55 100644 --- a/media/capture/video/win/video_capture_device_mf_win.h +++ b/media/capture/video/win/video_capture_device_mf_win.h @@ -14,6 +14,7 @@ #include <vector> +#include "base/macros.h" #include "base/synchronization/lock.h" #include "base/threading/non_thread_safe.h" #include "base/win/scoped_comptr.h" diff --git a/media/capture/video/win/video_capture_device_win.h b/media/capture/video/win/video_capture_device_win.h index 419c3a5..6a7727f 100644 --- a/media/capture/video/win/video_capture_device_win.h +++ b/media/capture/video/win/video_capture_device_win.h @@ -15,6 +15,7 @@ #include <map> #include <string> +#include "base/macros.h" #include "base/threading/thread_checker.h" #include "base/win/scoped_comptr.h" #include "media/base/video_capture_types.h" diff --git a/media/capture/webm_muxer.h b/media/capture/webm_muxer.h index 9a4287f..4b6b27c 100644 --- a/media/capture/webm_muxer.h +++ b/media/capture/webm_muxer.h @@ -6,6 +6,7 @@ #define MEDIA_FILTERS_LIBWEBM_MUXER_H_ #include "base/callback.h" +#include "base/macros.h" #include "base/numerics/safe_math.h" #include "base/strings/string_piece.h" #include "base/threading/thread_checker.h" diff --git a/media/cast/cast_environment.h b/media/cast/cast_environment.h index 39c556b..78710a7 100644 --- a/media/cast/cast_environment.h +++ b/media/cast/cast_environment.h @@ -5,6 +5,7 @@ #ifndef MEDIA_CAST_CAST_ENVIRONMENT_H_ #define MEDIA_CAST_CAST_ENVIRONMENT_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/single_thread_task_runner.h" diff --git a/media/cast/cast_sender_impl.h b/media/cast/cast_sender_impl.h index 6ada926..f43bcd6 100644 --- a/media/cast/cast_sender_impl.h +++ b/media/cast/cast_sender_impl.h @@ -4,6 +4,7 @@ #ifndef MEDIA_CAST_CAST_SENDER_IMPL_H_ #define MEDIA_CAST_CAST_SENDER_IMPL_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "media/cast/cast_environment.h" diff --git a/media/cast/common/transport_encryption_handler.h b/media/cast/common/transport_encryption_handler.h index d89a1b87..8ae064d 100644 --- a/media/cast/common/transport_encryption_handler.h +++ b/media/cast/common/transport_encryption_handler.h @@ -8,6 +8,7 @@ // Helper class to handle encryption for the Cast Transport library. #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string_piece.h" #include "base/threading/non_thread_safe.h" diff --git a/media/cast/logging/encoding_event_subscriber.h b/media/cast/logging/encoding_event_subscriber.h index f72fe33..55dbdf3 100644 --- a/media/cast/logging/encoding_event_subscriber.h +++ b/media/cast/logging/encoding_event_subscriber.h @@ -7,6 +7,7 @@ #include <map> +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/threading/thread_checker.h" #include "media/cast/logging/logging_defines.h" diff --git a/media/cast/logging/receiver_time_offset_estimator_impl.h b/media/cast/logging/receiver_time_offset_estimator_impl.h index 77d5275..10260d2 100644 --- a/media/cast/logging/receiver_time_offset_estimator_impl.h +++ b/media/cast/logging/receiver_time_offset_estimator_impl.h @@ -7,6 +7,7 @@ #include <map> +#include "base/macros.h" #include "base/time/time.h" #include "base/threading/thread_checker.h" #include "media/cast/common/mod_util.h" diff --git a/media/cast/logging/simple_event_subscriber.h b/media/cast/logging/simple_event_subscriber.h index 1bdce45..d594cc2 100644 --- a/media/cast/logging/simple_event_subscriber.h +++ b/media/cast/logging/simple_event_subscriber.h @@ -8,6 +8,7 @@ #include <vector> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/threading/thread_checker.h" #include "media/cast/logging/raw_event_subscriber.h" diff --git a/media/cast/logging/stats_event_subscriber.h b/media/cast/logging/stats_event_subscriber.h index c1a1e19..e8cdb94 100644 --- a/media/cast/logging/stats_event_subscriber.h +++ b/media/cast/logging/stats_event_subscriber.h @@ -6,6 +6,7 @@ #define MEDIA_CAST_LOGGING_STATS_EVENT_SUBSCRIBER_H_ #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" #include "base/threading/thread_checker.h" diff --git a/media/cast/net/cast_transport_defines.h b/media/cast/net/cast_transport_defines.h index cddd055..2cf015a 100644 --- a/media/cast/net/cast_transport_defines.h +++ b/media/cast/net/cast_transport_defines.h @@ -12,6 +12,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/time/time.h" diff --git a/media/cast/net/cast_transport_sender_impl.h b/media/cast/net/cast_transport_sender_impl.h index 2e32ac2..16c51fe 100644 --- a/media/cast/net/cast_transport_sender_impl.h +++ b/media/cast/net/cast_transport_sender_impl.h @@ -29,6 +29,7 @@ #include "base/callback.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" diff --git a/media/cast/net/pacing/paced_sender.h b/media/cast/net/pacing/paced_sender.h index c2a32d2..11dedb1 100644 --- a/media/cast/net/pacing/paced_sender.h +++ b/media/cast/net/pacing/paced_sender.h @@ -9,6 +9,7 @@ #include <tuple> #include <vector> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/single_thread_task_runner.h" diff --git a/media/cast/net/rtcp/receiver_rtcp_event_subscriber.h b/media/cast/net/rtcp/receiver_rtcp_event_subscriber.h index 54ee477..0f4a4b2 100644 --- a/media/cast/net/rtcp/receiver_rtcp_event_subscriber.h +++ b/media/cast/net/rtcp/receiver_rtcp_event_subscriber.h @@ -8,6 +8,7 @@ #include <deque> #include <vector> +#include "base/macros.h" #include "base/threading/thread_checker.h" #include "media/cast/logging/logging_defines.h" #include "media/cast/logging/raw_event_subscriber.h" diff --git a/media/cast/net/rtcp/rtcp_builder.h b/media/cast/net/rtcp/rtcp_builder.h index c7470a3..6ec4eb3 100644 --- a/media/cast/net/rtcp/rtcp_builder.h +++ b/media/cast/net/rtcp/rtcp_builder.h @@ -10,6 +10,7 @@ #include <string> #include "base/big_endian.h" +#include "base/macros.h" #include "media/cast/net/cast_transport_config.h" #include "media/cast/net/cast_transport_defines.h" #include "media/cast/net/rtcp/receiver_rtcp_event_subscriber.h" diff --git a/media/cast/net/rtcp/rtcp_utility.h b/media/cast/net/rtcp/rtcp_utility.h index 4092951..3371d05 100644 --- a/media/cast/net/rtcp/rtcp_utility.h +++ b/media/cast/net/rtcp/rtcp_utility.h @@ -6,6 +6,7 @@ #define MEDIA_CAST_RTCP_RTCP_UTILITY_H_ #include "base/big_endian.h" +#include "base/macros.h" #include "media/cast/logging/logging_defines.h" #include "media/cast/net/cast_transport_config.h" #include "media/cast/net/rtcp/rtcp_defines.h" diff --git a/media/cast/net/rtcp/test_rtcp_packet_builder.h b/media/cast/net/rtcp/test_rtcp_packet_builder.h index 04ceb05..ae76b3b 100644 --- a/media/cast/net/rtcp/test_rtcp_packet_builder.h +++ b/media/cast/net/rtcp/test_rtcp_packet_builder.h @@ -8,6 +8,7 @@ #define MEDIA_CAST_RTCP_TEST_RTCP_PACKET_BUILDER_H_ #include "base/big_endian.h" +#include "base/macros.h" #include "media/cast/net/cast_transport_defines.h" #include "media/cast/net/rtcp/rtcp_defines.h" diff --git a/media/cast/net/rtp/cast_message_builder.h b/media/cast/net/rtp/cast_message_builder.h index 3b956b8..2e6531c 100644 --- a/media/cast/net/rtp/cast_message_builder.h +++ b/media/cast/net/rtp/cast_message_builder.h @@ -10,6 +10,7 @@ #include <deque> #include <map> +#include "base/macros.h" #include "media/cast/net/rtcp/rtcp.h" #include "media/cast/net/rtp/rtp_defines.h" diff --git a/media/cast/net/rtp/frame_buffer.h b/media/cast/net/rtp/frame_buffer.h index a558ae8..62d21c2 100644 --- a/media/cast/net/rtp/frame_buffer.h +++ b/media/cast/net/rtp/frame_buffer.h @@ -8,6 +8,7 @@ #include <map> #include <vector> +#include "base/macros.h" #include "media/cast/net/cast_transport_config.h" #include "media/cast/net/rtp/rtp_defines.h" diff --git a/media/cast/net/rtp/framer.h b/media/cast/net/rtp/framer.h index b215f7a..246ea2e 100644 --- a/media/cast/net/rtp/framer.h +++ b/media/cast/net/rtp/framer.h @@ -7,6 +7,7 @@ #include <map> +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" #include "base/time/tick_clock.h" diff --git a/media/cast/net/rtp/packet_storage.h b/media/cast/net/rtp/packet_storage.h index 370cf5d..7c8c9b4 100644 --- a/media/cast/net/rtp/packet_storage.h +++ b/media/cast/net/rtp/packet_storage.h @@ -7,6 +7,7 @@ #include <deque> +#include "base/macros.h" #include "media/cast/net/pacing/paced_sender.h" namespace media { diff --git a/media/cast/net/rtp/receiver_stats.h b/media/cast/net/rtp/receiver_stats.h index 127e04a..bd2f056 100644 --- a/media/cast/net/rtp/receiver_stats.h +++ b/media/cast/net/rtp/receiver_stats.h @@ -5,6 +5,7 @@ #ifndef MEDIA_CAST_NET_RTP_RECEIVER_STATS_H_ #define MEDIA_CAST_NET_RTP_RECEIVER_STATS_H_ +#include "base/macros.h" #include "base/time/tick_clock.h" #include "base/time/time.h" #include "media/cast/net/rtcp/rtcp.h" diff --git a/media/cast/net/rtp/rtp_packet_builder.h b/media/cast/net/rtp/rtp_packet_builder.h index bfed1c3..a7714ba 100644 --- a/media/cast/net/rtp/rtp_packet_builder.h +++ b/media/cast/net/rtp/rtp_packet_builder.h @@ -7,6 +7,7 @@ #ifndef MEDIA_CAST_NET_RTP_RTP_PACKET_BUILDER_H_ #define MEDIA_CAST_NET_RTP_RTP_PACKET_BUILDER_H_ +#include "base/macros.h" #include "media/cast/net/rtp/rtp_defines.h" namespace media { diff --git a/media/cast/net/rtp/rtp_parser.h b/media/cast/net/rtp/rtp_parser.h index e3f39012..db07755 100644 --- a/media/cast/net/rtp/rtp_parser.h +++ b/media/cast/net/rtp/rtp_parser.h @@ -5,6 +5,7 @@ #ifndef MEDIA_CAST_NET_RTP_RTP_PARSER_H_ #define MEDIA_CAST_NET_RTP_RTP_PARSER_H_ +#include "base/macros.h" #include "media/cast/net/cast_transport_defines.h" #include "media/cast/net/rtp/rtp_defines.h" diff --git a/media/cast/net/rtp/rtp_sender.h b/media/cast/net/rtp/rtp_sender.h index 68cb601..71c2c4c 100644 --- a/media/cast/net/rtp/rtp_sender.h +++ b/media/cast/net/rtp/rtp_sender.h @@ -10,6 +10,7 @@ #include <map> #include <set> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" diff --git a/media/cast/net/udp_transport.h b/media/cast/net/udp_transport.h index a942236..ee66206 100644 --- a/media/cast/net/udp_transport.h +++ b/media/cast/net/udp_transport.h @@ -5,6 +5,7 @@ #ifndef MEDIA_CAST_NET_UDP_TRANSPORT_H_ #define MEDIA_CAST_NET_UDP_TRANSPORT_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" diff --git a/media/cast/receiver/audio_decoder.h b/media/cast/receiver/audio_decoder.h index d437069..c452bf4 100644 --- a/media/cast/receiver/audio_decoder.h +++ b/media/cast/receiver/audio_decoder.h @@ -6,6 +6,7 @@ #define MEDIA_CAST_RECEIVER_AUDIO_DECODER_H_ #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "media/base/audio_bus.h" #include "media/cast/cast_environment.h" diff --git a/media/cast/receiver/cast_receiver_impl.h b/media/cast/receiver/cast_receiver_impl.h index f94735c..ca2b765 100644 --- a/media/cast/receiver/cast_receiver_impl.h +++ b/media/cast/receiver/cast_receiver_impl.h @@ -5,6 +5,7 @@ #ifndef MEDIA_CAST_RECEIVER_CAST_RECEIVER_IMPL_H_ #define MEDIA_CAST_RECEIVER_CAST_RECEIVER_IMPL_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "media/cast/cast_environment.h" diff --git a/media/cast/receiver/frame_receiver.h b/media/cast/receiver/frame_receiver.h index 6bb96e1..1d89d22 100644 --- a/media/cast/receiver/frame_receiver.h +++ b/media/cast/receiver/frame_receiver.h @@ -7,6 +7,7 @@ #include <list> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" diff --git a/media/cast/receiver/video_decoder.h b/media/cast/receiver/video_decoder.h index 97dfa2a..0229be1 100644 --- a/media/cast/receiver/video_decoder.h +++ b/media/cast/receiver/video_decoder.h @@ -6,6 +6,7 @@ #define MEDIA_CAST_RECEIVER_VIDEO_DECODER_H_ #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "media/base/video_frame.h" diff --git a/media/cast/sender/audio_encoder.h b/media/cast/sender/audio_encoder.h index 4cb0315..436c599 100644 --- a/media/cast/sender/audio_encoder.h +++ b/media/cast/sender/audio_encoder.h @@ -5,6 +5,7 @@ #ifndef MEDIA_CAST_SENDER_AUDIO_ENCODER_H_ #define MEDIA_CAST_SENDER_AUDIO_ENCODER_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/threading/thread_checker.h" diff --git a/media/cast/sender/audio_sender.h b/media/cast/sender/audio_sender.h index 2991b03..34aeda3 100644 --- a/media/cast/sender/audio_sender.h +++ b/media/cast/sender/audio_sender.h @@ -6,6 +6,7 @@ #define MEDIA_CAST_SENDER_AUDIO_SENDER_H_ #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" diff --git a/media/cast/sender/external_video_encoder.h b/media/cast/sender/external_video_encoder.h index 9ff1c1f..e935107 100644 --- a/media/cast/sender/external_video_encoder.h +++ b/media/cast/sender/external_video_encoder.h @@ -5,6 +5,7 @@ #ifndef MEDIA_CAST_SENDER_EXTERNAL_VIDEO_ENCODER_H_ #define MEDIA_CAST_SENDER_EXTERNAL_VIDEO_ENCODER_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "media/cast/cast_environment.h" diff --git a/media/cast/sender/fake_video_encode_accelerator_factory.h b/media/cast/sender/fake_video_encode_accelerator_factory.h index 73c8feb..6048271 100644 --- a/media/cast/sender/fake_video_encode_accelerator_factory.h +++ b/media/cast/sender/fake_video_encode_accelerator_factory.h @@ -6,6 +6,7 @@ #define MEDIA_CAST_SENDER_FAKE_VIDEO_ENCODE_ACCELERATOR_FACTORY_H_ #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/shared_memory.h" diff --git a/media/cast/sender/h264_vt_encoder.h b/media/cast/sender/h264_vt_encoder.h index 15318bf..1769b31 100644 --- a/media/cast/sender/h264_vt_encoder.h +++ b/media/cast/sender/h264_vt_encoder.h @@ -6,6 +6,7 @@ #define MEDIA_CAST_SENDER_H264_VT_ENCODER_H_ #include "base/mac/scoped_cftyperef.h" +#include "base/macros.h" #include "base/power_monitor/power_observer.h" #include "base/threading/thread_checker.h" #include "media/base/mac/videotoolbox_glue.h" diff --git a/media/cast/sender/size_adaptable_video_encoder_base.h b/media/cast/sender/size_adaptable_video_encoder_base.h index a450a99..e6a5230 100644 --- a/media/cast/sender/size_adaptable_video_encoder_base.h +++ b/media/cast/sender/size_adaptable_video_encoder_base.h @@ -5,6 +5,7 @@ #ifndef MEDIA_CAST_SENDER_SIZE_ADAPTABLE_VIDEO_ENCODER_BASE_H_ #define MEDIA_CAST_SENDER_SIZE_ADAPTABLE_VIDEO_ENCODER_BASE_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" diff --git a/media/cast/sender/video_encoder_impl.h b/media/cast/sender/video_encoder_impl.h index 8c84df1..f22f40d 100644 --- a/media/cast/sender/video_encoder_impl.h +++ b/media/cast/sender/video_encoder_impl.h @@ -5,6 +5,7 @@ #ifndef MEDIA_CAST_SENDER_VIDEO_ENCODER_IMPL_H_ #define MEDIA_CAST_SENDER_VIDEO_ENCODER_IMPL_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "media/cast/cast_config.h" #include "media/cast/cast_environment.h" diff --git a/media/cast/sender/video_sender.h b/media/cast/sender/video_sender.h index 8869454..dec9dc7 100644 --- a/media/cast/sender/video_sender.h +++ b/media/cast/sender/video_sender.h @@ -6,6 +6,7 @@ #define MEDIA_CAST_SENDER_VIDEO_SENDER_H_ #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" diff --git a/media/cast/sender/vp8_encoder.h b/media/cast/sender/vp8_encoder.h index ffb95e22..008f658 100644 --- a/media/cast/sender/vp8_encoder.h +++ b/media/cast/sender/vp8_encoder.h @@ -5,6 +5,7 @@ #ifndef MEDIA_CAST_SENDER_CODECS_VP8_VP8_ENCODER_H_ #define MEDIA_CAST_SENDER_CODECS_VP8_VP8_ENCODER_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/threading/thread_checker.h" #include "media/cast/cast_config.h" diff --git a/media/cast/test/fake_media_source.h b/media/cast/test/fake_media_source.h index af100aa..427643a 100644 --- a/media/cast/test/fake_media_source.h +++ b/media/cast/test/fake_media_source.h @@ -14,6 +14,7 @@ #include "base/files/file_path.h" #include "base/files/memory_mapped_file.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/single_thread_task_runner.h" diff --git a/media/cast/test/fake_receiver_time_offset_estimator.h b/media/cast/test/fake_receiver_time_offset_estimator.h index cd98c0d..339e3fc 100644 --- a/media/cast/test/fake_receiver_time_offset_estimator.h +++ b/media/cast/test/fake_receiver_time_offset_estimator.h @@ -5,6 +5,7 @@ #ifndef MEDIA_CAST_TEST_FAKE_RECEIVER_TIME_OFFSET_ESTIMATOR_H_ #define MEDIA_CAST_TEST_FAKE_RECEIVER_TIME_OFFSET_ESTIMATOR_H_ +#include "base/macros.h" #include "base/time/time.h" #include "base/threading/thread_checker.h" #include "media/cast/logging/logging_defines.h" diff --git a/media/cast/test/fake_single_thread_task_runner.h b/media/cast/test/fake_single_thread_task_runner.h index bae0507..83e50d8 100644 --- a/media/cast/test/fake_single_thread_task_runner.h +++ b/media/cast/test/fake_single_thread_task_runner.h @@ -7,6 +7,7 @@ #include <map> +#include "base/macros.h" #include "base/single_thread_task_runner.h" #include "base/test/simple_test_tick_clock.h" #include "base/test/test_pending_task.h" diff --git a/media/cast/test/loopback_transport.h b/media/cast/test/loopback_transport.h index 52eeb47..feed238 100644 --- a/media/cast/test/loopback_transport.h +++ b/media/cast/test/loopback_transport.h @@ -5,6 +5,7 @@ #ifndef MEDIA_CAST_TEST_LOOPBACK_TRANSPORT_H_ #define MEDIA_CAST_TEST_LOOPBACK_TRANSPORT_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "media/cast/cast_environment.h" diff --git a/media/cast/test/skewed_single_thread_task_runner.h b/media/cast/test/skewed_single_thread_task_runner.h index b3b0c92..a8ffa52 100644 --- a/media/cast/test/skewed_single_thread_task_runner.h +++ b/media/cast/test/skewed_single_thread_task_runner.h @@ -7,6 +7,7 @@ #include <map> +#include "base/macros.h" #include "base/single_thread_task_runner.h" #include "base/test/simple_test_tick_clock.h" #include "base/test/test_pending_task.h" diff --git a/media/cast/test/skewed_tick_clock.h b/media/cast/test/skewed_tick_clock.h index e1dc81e..e9a3a59 100644 --- a/media/cast/test/skewed_tick_clock.h +++ b/media/cast/test/skewed_tick_clock.h @@ -5,6 +5,7 @@ #ifndef CAST_MEDIA_TEST_SKEWED_TICK_CLOCK_H #define CAST_MEDIA_TEST_SKEWED_TICK_CLOCK_H +#include "base/macros.h" #include "base/time/tick_clock.h" #include "base/time/time.h" diff --git a/media/cast/test/utility/audio_utility.h b/media/cast/test/utility/audio_utility.h index f2362e6..6b8ae68 100644 --- a/media/cast/test/utility/audio_utility.h +++ b/media/cast/test/utility/audio_utility.h @@ -5,6 +5,7 @@ #ifndef MEDIA_CAST_TEST_UTILITY_AUDIO_UTILITY_H_ #define MEDIA_CAST_TEST_UTILITY_AUDIO_UTILITY_H_ +#include "base/macros.h" #include "media/audio/simple_sources.h" namespace base { diff --git a/media/cast/test/utility/in_process_receiver.h b/media/cast/test/utility/in_process_receiver.h index 545699b..cd957d4 100644 --- a/media/cast/test/utility/in_process_receiver.h +++ b/media/cast/test/utility/in_process_receiver.h @@ -5,6 +5,7 @@ #ifndef MEDIA_CAST_TEST_IN_PROCESS_RECEIVER_H_ #define MEDIA_CAST_TEST_IN_PROCESS_RECEIVER_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" diff --git a/media/cast/test/utility/standalone_cast_environment.h b/media/cast/test/utility/standalone_cast_environment.h index 206de21..004843a 100644 --- a/media/cast/test/utility/standalone_cast_environment.h +++ b/media/cast/test/utility/standalone_cast_environment.h @@ -5,6 +5,7 @@ #ifndef MEDIA_CAST_TEST_UTILITY_STANDALONE_CAST_ENVIRONMENT_H_ #define MEDIA_CAST_TEST_UTILITY_STANDALONE_CAST_ENVIRONMENT_H_ +#include "base/macros.h" #include "base/threading/thread.h" #include "base/threading/thread_checker.h" #include "media/cast/cast_environment.h" diff --git a/media/cast/test/utility/udp_proxy.h b/media/cast/test/utility/udp_proxy.h index 7fda438..003dce7 100644 --- a/media/cast/test/utility/udp_proxy.h +++ b/media/cast/test/utility/udp_proxy.h @@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/media/cdm/aes_decryptor.h b/media/cdm/aes_decryptor.h index 56330ef..59ff4f9 100644 --- a/media/cdm/aes_decryptor.h +++ b/media/cdm/aes_decryptor.h @@ -10,6 +10,7 @@ #include <vector> #include "base/containers/scoped_ptr_hash_map.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/synchronization/lock.h" diff --git a/media/cdm/cdm_wrapper.h b/media/cdm/cdm_wrapper.h index 8ba71a7..156dbf5 100644 --- a/media/cdm/cdm_wrapper.h +++ b/media/cdm/cdm_wrapper.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "media/cdm/api/content_decryption_module.h" #include "media/cdm/supported_cdm_versions.h" diff --git a/media/cdm/external_clear_key_test_helper.h b/media/cdm/external_clear_key_test_helper.h index fb048a2..3a72b39 100644 --- a/media/cdm/external_clear_key_test_helper.h +++ b/media/cdm/external_clear_key_test_helper.h @@ -8,6 +8,7 @@ #include <string> #include "base/files/file_path.h" +#include "base/macros.h" #include "base/scoped_native_library.h" namespace media { diff --git a/media/cdm/player_tracker_impl.h b/media/cdm/player_tracker_impl.h index 54de500..e2dc4a5 100644 --- a/media/cdm/player_tracker_impl.h +++ b/media/cdm/player_tracker_impl.h @@ -8,6 +8,7 @@ #include <map> #include "base/callback.h" +#include "base/macros.h" #include "base/synchronization/lock.h" #include "media/base/media_export.h" #include "media/base/player_tracker.h" diff --git a/media/cdm/ppapi/cdm_file_io_test.h b/media/cdm/ppapi/cdm_file_io_test.h index 36b9cdc..2c538ce 100644 --- a/media/cdm/ppapi/cdm_file_io_test.h +++ b/media/cdm/ppapi/cdm_file_io_test.h @@ -14,6 +14,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "media/cdm/api/content_decryption_module.h" namespace media { diff --git a/media/cdm/ppapi/external_clear_key/clear_key_cdm.h b/media/cdm/ppapi/external_clear_key/clear_key_cdm.h index bc990c7..e6f9222 100644 --- a/media/cdm/ppapi/external_clear_key/clear_key_cdm.h +++ b/media/cdm/ppapi/external_clear_key/clear_key_cdm.h @@ -11,6 +11,7 @@ #include <vector> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/synchronization/lock.h" diff --git a/media/cdm/ppapi/external_clear_key/fake_cdm_video_decoder.h b/media/cdm/ppapi/external_clear_key/fake_cdm_video_decoder.h index bd81a3f..7e84bfe 100644 --- a/media/cdm/ppapi/external_clear_key/fake_cdm_video_decoder.h +++ b/media/cdm/ppapi/external_clear_key/fake_cdm_video_decoder.h @@ -6,6 +6,7 @@ #define MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_FAKE_CDM_VIDEO_DECODER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "media/cdm/api/content_decryption_module.h" #include "media/cdm/ppapi/external_clear_key/cdm_video_decoder.h" diff --git a/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_audio_decoder.h b/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_audio_decoder.h index c5fe344..0ae4bcf 100644 --- a/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_audio_decoder.h +++ b/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_audio_decoder.h @@ -8,6 +8,7 @@ #include <vector> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "media/cdm/ppapi/external_clear_key/clear_key_cdm_common.h" diff --git a/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.h b/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.h index ca27355..4d0fb23 100644 --- a/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.h +++ b/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.h @@ -6,6 +6,7 @@ #define MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_FFMPEG_CDM_VIDEO_DECODER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "media/cdm/ppapi/external_clear_key/cdm_video_decoder.h" #include "media/cdm/ppapi/external_clear_key/clear_key_cdm_common.h" diff --git a/media/cdm/ppapi/external_clear_key/libvpx_cdm_video_decoder.h b/media/cdm/ppapi/external_clear_key/libvpx_cdm_video_decoder.h index 992f825..17f7a58 100644 --- a/media/cdm/ppapi/external_clear_key/libvpx_cdm_video_decoder.h +++ b/media/cdm/ppapi/external_clear_key/libvpx_cdm_video_decoder.h @@ -6,6 +6,7 @@ #define MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_LIBVPX_CDM_VIDEO_DECODER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "media/cdm/api/content_decryption_module.h" #include "media/cdm/ppapi/external_clear_key/cdm_video_decoder.h" diff --git a/media/cdm/ppapi/ppapi_cdm_adapter.h b/media/cdm/ppapi/ppapi_cdm_adapter.h index 6240f28..f1a196c 100644 --- a/media/cdm/ppapi/ppapi_cdm_adapter.h +++ b/media/cdm/ppapi/ppapi_cdm_adapter.h @@ -10,6 +10,7 @@ #include "base/compiler_specific.h" #include "build/build_config.h" +#include "base/macros.h" #include "media/cdm/api/content_decryption_module.h" #include "media/cdm/cdm_helpers.h" #include "media/cdm/cdm_wrapper.h" diff --git a/media/cdm/proxy_decryptor.h b/media/cdm/proxy_decryptor.h index 14a2b82..575e14a 100644 --- a/media/cdm/proxy_decryptor.h +++ b/media/cdm/proxy_decryptor.h @@ -9,6 +9,7 @@ #include <vector> #include "base/containers/hash_tables.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" diff --git a/media/cdm/stub/stub_cdm.h b/media/cdm/stub/stub_cdm.h index a96e6bd..6f9a623 100644 --- a/media/cdm/stub/stub_cdm.h +++ b/media/cdm/stub/stub_cdm.h @@ -5,6 +5,7 @@ #ifndef MEDIA_CDM_STUB_STUB_CDM_H_ #define MEDIA_CDM_STUB_STUB_CDM_H_ +#include "base/macros.h" #include "media/cdm/api/content_decryption_module.h" namespace media { diff --git a/media/filters/audio_clock.h b/media/filters/audio_clock.h index 63159b5..4a92da5 100644 --- a/media/filters/audio_clock.h +++ b/media/filters/audio_clock.h @@ -7,6 +7,7 @@ #include <deque> +#include "base/macros.h" #include "base/time/time.h" #include "media/base/media_export.h" diff --git a/media/filters/audio_file_reader.h b/media/filters/audio_file_reader.h index 68a4c92..818f8c4 100644 --- a/media/filters/audio_file_reader.h +++ b/media/filters/audio_file_reader.h @@ -5,6 +5,7 @@ #ifndef MEDIA_FILTERS_AUDIO_FILE_READER_H_ #define MEDIA_FILTERS_AUDIO_FILE_READER_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "media/base/media_export.h" #include "media/filters/ffmpeg_glue.h" diff --git a/media/filters/audio_renderer_algorithm.h b/media/filters/audio_renderer_algorithm.h index ba285fa..9192f39 100644 --- a/media/filters/audio_renderer_algorithm.h +++ b/media/filters/audio_renderer_algorithm.h @@ -21,6 +21,7 @@ #ifndef MEDIA_FILTERS_AUDIO_RENDERER_ALGORITHM_H_ #define MEDIA_FILTERS_AUDIO_RENDERER_ALGORITHM_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "media/audio/audio_parameters.h" diff --git a/media/filters/blocking_url_protocol.h b/media/filters/blocking_url_protocol.h index c749c36..2ff5b9c3 100644 --- a/media/filters/blocking_url_protocol.h +++ b/media/filters/blocking_url_protocol.h @@ -6,6 +6,7 @@ #define MEDIA_FILTERS_BLOCKING_URL_PROTOCOL_H_ #include "base/callback.h" +#include "base/macros.h" #include "base/synchronization/waitable_event.h" #include "media/filters/ffmpeg_glue.h" diff --git a/media/filters/decoder_selector.h b/media/filters/decoder_selector.h index c8a8ff9..4e7af7c 100644 --- a/media/filters/decoder_selector.h +++ b/media/filters/decoder_selector.h @@ -6,6 +6,7 @@ #define MEDIA_FILTERS_DECODER_SELECTOR_H_ #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" diff --git a/media/filters/decrypting_audio_decoder.h b/media/filters/decrypting_audio_decoder.h index 43db799..36013b8 100644 --- a/media/filters/decrypting_audio_decoder.h +++ b/media/filters/decrypting_audio_decoder.h @@ -6,6 +6,7 @@ #define MEDIA_FILTERS_DECRYPTING_AUDIO_DECODER_H_ #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" diff --git a/media/filters/decrypting_demuxer_stream.h b/media/filters/decrypting_demuxer_stream.h index c128cf7..0bb8ae3 100644 --- a/media/filters/decrypting_demuxer_stream.h +++ b/media/filters/decrypting_demuxer_stream.h @@ -6,6 +6,7 @@ #define MEDIA_FILTERS_DECRYPTING_DEMUXER_STREAM_H_ #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "media/base/audio_decoder_config.h" diff --git a/media/filters/decrypting_video_decoder.h b/media/filters/decrypting_video_decoder.h index 14e1746..860f78f 100644 --- a/media/filters/decrypting_video_decoder.h +++ b/media/filters/decrypting_video_decoder.h @@ -6,6 +6,7 @@ #define MEDIA_FILTERS_DECRYPTING_VIDEO_DECODER_H_ #include "base/callback.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "media/base/cdm_context.h" #include "media/base/decryptor.h" diff --git a/media/filters/default_media_permission.h b/media/filters/default_media_permission.h index 9ad295a..434e1f5 100644 --- a/media/filters/default_media_permission.h +++ b/media/filters/default_media_permission.h @@ -5,6 +5,7 @@ #ifndef MEDIA_FILTERS_DEFAULT_MEDIA_PERMISSION_H_ #define MEDIA_FILTERS_DEFAULT_MEDIA_PERMISSION_H_ +#include "base/macros.h" #include "media/base/media_export.h" #include "media/base/media_permission.h" diff --git a/media/filters/fake_video_decoder.h b/media/filters/fake_video_decoder.h index 14d19569..9d7863c 100644 --- a/media/filters/fake_video_decoder.h +++ b/media/filters/fake_video_decoder.h @@ -10,6 +10,7 @@ #include "base/bind.h" #include "base/callback.h" #include "base/callback_helpers.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h" #include "media/base/callback_holder.h" diff --git a/media/filters/ffmpeg_audio_decoder.h b/media/filters/ffmpeg_audio_decoder.h index c3bf60c..2d53039 100644 --- a/media/filters/ffmpeg_audio_decoder.h +++ b/media/filters/ffmpeg_audio_decoder.h @@ -8,6 +8,7 @@ #include <list> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "media/base/audio_decoder.h" diff --git a/media/filters/ffmpeg_demuxer.h b/media/filters/ffmpeg_demuxer.h index b0d0812..d6beb32 100644 --- a/media/filters/ffmpeg_demuxer.h +++ b/media/filters/ffmpeg_demuxer.h @@ -27,6 +27,7 @@ #include <vector> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/threading/thread.h" diff --git a/media/filters/ffmpeg_glue.h b/media/filters/ffmpeg_glue.h index ddc49b1..296ab72 100644 --- a/media/filters/ffmpeg_glue.h +++ b/media/filters/ffmpeg_glue.h @@ -25,6 +25,7 @@ #ifndef MEDIA_FILTERS_FFMPEG_GLUE_H_ #define MEDIA_FILTERS_FFMPEG_GLUE_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "media/base/media_export.h" #include "media/ffmpeg/ffmpeg_deleters.h" diff --git a/media/filters/ffmpeg_h264_to_annex_b_bitstream_converter.h b/media/filters/ffmpeg_h264_to_annex_b_bitstream_converter.h index afcd4a5..6e30647 100644 --- a/media/filters/ffmpeg_h264_to_annex_b_bitstream_converter.h +++ b/media/filters/ffmpeg_h264_to_annex_b_bitstream_converter.h @@ -5,6 +5,7 @@ #ifndef MEDIA_FILTERS_FFMPEG_H264_TO_ANNEX_B_BITSTREAM_CONVERTER_H_ #define MEDIA_FILTERS_FFMPEG_H264_TO_ANNEX_B_BITSTREAM_CONVERTER_H_ +#include "base/macros.h" #include "media/base/media_export.h" #include "media/filters/ffmpeg_bitstream_converter.h" #include "media/filters/h264_to_annex_b_bitstream_converter.h" diff --git a/media/filters/ffmpeg_h265_to_annex_b_bitstream_converter.h b/media/filters/ffmpeg_h265_to_annex_b_bitstream_converter.h index 6c2ad03..436b50f 100644 --- a/media/filters/ffmpeg_h265_to_annex_b_bitstream_converter.h +++ b/media/filters/ffmpeg_h265_to_annex_b_bitstream_converter.h @@ -5,6 +5,7 @@ #ifndef MEDIA_FILTERS_FFMPEG_H265_TO_ANNEX_B_BITSTREAM_CONVERTER_H_ #define MEDIA_FILTERS_FFMPEG_H265_TO_ANNEX_B_BITSTREAM_CONVERTER_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "media/base/media_export.h" #include "media/filters/ffmpeg_bitstream_converter.h" diff --git a/media/filters/ffmpeg_video_decoder.h b/media/filters/ffmpeg_video_decoder.h index 54a62be..ba12be9 100644 --- a/media/filters/ffmpeg_video_decoder.h +++ b/media/filters/ffmpeg_video_decoder.h @@ -8,6 +8,7 @@ #include <list> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/threading/thread_checker.h" #include "media/base/video_decoder.h" diff --git a/media/filters/file_data_source.h b/media/filters/file_data_source.h index 9232608..800c02a 100644 --- a/media/filters/file_data_source.h +++ b/media/filters/file_data_source.h @@ -10,6 +10,7 @@ #include "base/files/file.h" #include "base/files/file_path.h" #include "base/files/memory_mapped_file.h" +#include "base/macros.h" #include "media/base/data_source.h" namespace media { diff --git a/media/filters/frame_processor.h b/media/filters/frame_processor.h index 5c9348e..68148f4 100644 --- a/media/filters/frame_processor.h +++ b/media/filters/frame_processor.h @@ -8,6 +8,7 @@ #include <map> #include "base/callback_forward.h" +#include "base/macros.h" #include "base/time/time.h" #include "media/base/media_export.h" #include "media/base/media_log.h" diff --git a/media/filters/gpu_video_decoder.h b/media/filters/gpu_video_decoder.h index b079e01..b295e59 100644 --- a/media/filters/gpu_video_decoder.h +++ b/media/filters/gpu_video_decoder.h @@ -11,6 +11,7 @@ #include <utility> #include <vector> +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "media/base/pipeline_status.h" #include "media/base/video_decoder.h" diff --git a/media/filters/h264_parser.h b/media/filters/h264_parser.h index 7aec208..e5b1e5a 100644 --- a/media/filters/h264_parser.h +++ b/media/filters/h264_parser.h @@ -12,6 +12,7 @@ #include <map> #include <vector> +#include "base/macros.h" #include "media/base/media_export.h" #include "media/base/ranges.h" #include "media/filters/h264_bit_reader.h" diff --git a/media/filters/in_memory_url_protocol.h b/media/filters/in_memory_url_protocol.h index f4b8fa4..652f6e3 100644 --- a/media/filters/in_memory_url_protocol.h +++ b/media/filters/in_memory_url_protocol.h @@ -6,6 +6,7 @@ #define MEDIA_FILTERS_IN_MEMORY_URL_PROTOCOL_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "media/filters/ffmpeg_glue.h" namespace media { diff --git a/media/filters/opus_audio_decoder.h b/media/filters/opus_audio_decoder.h index 4095656..d185b80 100644 --- a/media/filters/opus_audio_decoder.h +++ b/media/filters/opus_audio_decoder.h @@ -6,6 +6,7 @@ #define MEDIA_FILTERS_OPUS_AUDIO_DECODER_H_ #include "base/callback.h" +#include "base/macros.h" #include "base/time/time.h" #include "media/base/audio_decoder.h" #include "media/base/demuxer_stream.h" diff --git a/media/filters/source_buffer_range.h b/media/filters/source_buffer_range.h index 32a8321..e7cdeb7 100644 --- a/media/filters/source_buffer_range.h +++ b/media/filters/source_buffer_range.h @@ -8,6 +8,7 @@ #include <map> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "media/base/stream_parser_buffer.h" diff --git a/media/filters/source_buffer_stream.h b/media/filters/source_buffer_stream.h index 4a6d435..00d3d42 100644 --- a/media/filters/source_buffer_stream.h +++ b/media/filters/source_buffer_stream.h @@ -16,6 +16,7 @@ #include <utility> #include <vector> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "media/base/audio_decoder_config.h" #include "media/base/media_export.h" diff --git a/media/filters/video_cadence_estimator.h b/media/filters/video_cadence_estimator.h index f3d589a..6442932 100644 --- a/media/filters/video_cadence_estimator.h +++ b/media/filters/video_cadence_estimator.h @@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "base/time/time.h" #include "media/base/media_export.h" diff --git a/media/filters/video_renderer_algorithm.h b/media/filters/video_renderer_algorithm.h index 31e6628..2e01623 100644 --- a/media/filters/video_renderer_algorithm.h +++ b/media/filters/video_renderer_algorithm.h @@ -8,6 +8,7 @@ #include <deque> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/time/time.h" #include "media/base/media_export.h" diff --git a/media/filters/vp8_bool_decoder.h b/media/filters/vp8_bool_decoder.h index 50cbb44..1c59cd2 100644 --- a/media/filters/vp8_bool_decoder.h +++ b/media/filters/vp8_bool_decoder.h @@ -46,6 +46,7 @@ #include <sys/types.h> #include "base/logging.h" +#include "base/macros.h" #include "media/base/media_export.h" namespace media { diff --git a/media/filters/vp8_parser.h b/media/filters/vp8_parser.h index dc7bc24..5b83180 100644 --- a/media/filters/vp8_parser.h +++ b/media/filters/vp8_parser.h @@ -8,6 +8,7 @@ #ifndef MEDIA_FILTERS_VP8_PARSER_H_ #define MEDIA_FILTERS_VP8_PARSER_H_ +#include "base/macros.h" #include "media/base/media_export.h" #include "media/filters/vp8_bool_decoder.h" diff --git a/media/filters/vpx_video_decoder.h b/media/filters/vpx_video_decoder.h index 73dd3de..c900017 100644 --- a/media/filters/vpx_video_decoder.h +++ b/media/filters/vpx_video_decoder.h @@ -6,6 +6,7 @@ #define MEDIA_FILTERS_VPX_VIDEO_DECODER_H_ #include "base/callback.h" +#include "base/macros.h" #include "base/threading/thread_checker.h" #include "media/base/demuxer_stream.h" #include "media/base/video_decoder.h" diff --git a/media/formats/common/offset_byte_queue.h b/media/formats/common/offset_byte_queue.h index 326609d4..6ec6405 100644 --- a/media/formats/common/offset_byte_queue.h +++ b/media/formats/common/offset_byte_queue.h @@ -5,6 +5,7 @@ #ifndef MEDIA_FORMATS_COMMON_OFFSET_BYTE_QUEUE_H_ #define MEDIA_FORMATS_COMMON_OFFSET_BYTE_QUEUE_H_ +#include "base/macros.h" #include "media/base/byte_queue.h" #include "media/base/media_export.h" diff --git a/media/formats/common/stream_parser_test_base.h b/media/formats/common/stream_parser_test_base.h index f9e483a..f3431cd 100644 --- a/media/formats/common/stream_parser_test_base.h +++ b/media/formats/common/stream_parser_test_base.h @@ -5,6 +5,7 @@ #ifndef MEDIA_FORMATS_COMMON_STREAM_PARSER_TEST_BASE_H_ #define MEDIA_FORMATS_COMMON_STREAM_PARSER_TEST_BASE_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "media/base/audio_decoder_config.h" #include "media/base/stream_parser.h" diff --git a/media/formats/mp2t/es_adapter_video.h b/media/formats/mp2t/es_adapter_video.h index 50c162e..564f5e8 100644 --- a/media/formats/mp2t/es_adapter_video.h +++ b/media/formats/mp2t/es_adapter_video.h @@ -10,6 +10,7 @@ #include <utility> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/time/time.h" #include "media/base/media_export.h" diff --git a/media/formats/mp2t/es_parser.h b/media/formats/mp2t/es_parser.h index 591c115..6e4dd7e 100644 --- a/media/formats/mp2t/es_parser.h +++ b/media/formats/mp2t/es_parser.h @@ -9,6 +9,7 @@ #include <utility> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/time/time.h" #include "media/base/media_export.h" diff --git a/media/formats/mp2t/es_parser_adts.h b/media/formats/mp2t/es_parser_adts.h index 87b1aad..02b7356a 100644 --- a/media/formats/mp2t/es_parser_adts.h +++ b/media/formats/mp2t/es_parser_adts.h @@ -10,6 +10,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "media/base/audio_decoder_config.h" diff --git a/media/formats/mp2t/es_parser_h264.h b/media/formats/mp2t/es_parser_h264.h index 1a52c57..b220c36 100644 --- a/media/formats/mp2t/es_parser_h264.h +++ b/media/formats/mp2t/es_parser_h264.h @@ -10,6 +10,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "media/base/media_export.h" diff --git a/media/formats/mp2t/es_parser_mpeg1audio.h b/media/formats/mp2t/es_parser_mpeg1audio.h index d1833e6..c110887 100644 --- a/media/formats/mp2t/es_parser_mpeg1audio.h +++ b/media/formats/mp2t/es_parser_mpeg1audio.h @@ -10,6 +10,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "media/base/audio_decoder_config.h" diff --git a/media/formats/mp2t/mp2t_stream_parser.h b/media/formats/mp2t/mp2t_stream_parser.h index f1aff27..90e1d3e 100644 --- a/media/formats/mp2t/mp2t_stream_parser.h +++ b/media/formats/mp2t/mp2t_stream_parser.h @@ -8,6 +8,7 @@ #include <list> #include <map> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "media/base/audio_decoder_config.h" diff --git a/media/formats/mp2t/ts_section_pat.h b/media/formats/mp2t/ts_section_pat.h index f550a7f..8381401 100644 --- a/media/formats/mp2t/ts_section_pat.h +++ b/media/formats/mp2t/ts_section_pat.h @@ -7,6 +7,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "media/formats/mp2t/ts_section_psi.h" namespace media { diff --git a/media/formats/mp2t/ts_section_pes.h b/media/formats/mp2t/ts_section_pes.h index ec12c8f..fd4d143 100644 --- a/media/formats/mp2t/ts_section_pes.h +++ b/media/formats/mp2t/ts_section_pes.h @@ -6,6 +6,7 @@ #define MEDIA_FORMATS_MP2T_TS_SECTION_PES_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "media/base/byte_queue.h" #include "media/formats/mp2t/ts_section.h" diff --git a/media/formats/mp2t/ts_section_pmt.h b/media/formats/mp2t/ts_section_pmt.h index 6c82d78..b5a1dfd 100644 --- a/media/formats/mp2t/ts_section_pmt.h +++ b/media/formats/mp2t/ts_section_pmt.h @@ -7,6 +7,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "media/formats/mp2t/ts_section_psi.h" namespace media { diff --git a/media/formats/mp2t/ts_section_psi.h b/media/formats/mp2t/ts_section_psi.h index 1495dbd..0af4e4d 100644 --- a/media/formats/mp2t/ts_section_psi.h +++ b/media/formats/mp2t/ts_section_psi.h @@ -6,6 +6,7 @@ #define MEDIA_FORMATS_MP2T_TS_SECTION_PSI_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "media/base/byte_queue.h" #include "media/formats/mp2t/ts_section.h" diff --git a/media/formats/mp4/sample_to_group_iterator.h b/media/formats/mp4/sample_to_group_iterator.h index 9ed6945..50823af 100644 --- a/media/formats/mp4/sample_to_group_iterator.h +++ b/media/formats/mp4/sample_to_group_iterator.h @@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "media/formats/mp4/box_definitions.h" namespace media { diff --git a/media/formats/mp4/track_run_iterator.h b/media/formats/mp4/track_run_iterator.h index 3039393..4ecbbb9 100644 --- a/media/formats/mp4/track_run_iterator.h +++ b/media/formats/mp4/track_run_iterator.h @@ -9,6 +9,7 @@ #include <vector> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "media/base/media_export.h" diff --git a/media/formats/mpeg/adts_stream_parser.h b/media/formats/mpeg/adts_stream_parser.h index a8ecdbb..17e18eb 100644 --- a/media/formats/mpeg/adts_stream_parser.h +++ b/media/formats/mpeg/adts_stream_parser.h @@ -5,6 +5,7 @@ #ifndef MEDIA_FORMATS_MPEG_ADTS_STREAM_PARSER_H_ #define MEDIA_FORMATS_MPEG_ADTS_STREAM_PARSER_H_ +#include "base/macros.h" #include "media/base/media_export.h" #include "media/formats/mpeg/mpeg_audio_stream_parser_base.h" diff --git a/media/formats/mpeg/mpeg1_audio_stream_parser.h b/media/formats/mpeg/mpeg1_audio_stream_parser.h index de9b138..c970498 100644 --- a/media/formats/mpeg/mpeg1_audio_stream_parser.h +++ b/media/formats/mpeg/mpeg1_audio_stream_parser.h @@ -5,6 +5,7 @@ #ifndef MEDIA_FORMATS_MPEG_MPEG1_AUDIO_STREAM_PARSER_H_ #define MEDIA_FORMATS_MPEG_MPEG1_AUDIO_STREAM_PARSER_H_ +#include "base/macros.h" #include "media/base/media_export.h" #include "media/formats/mpeg/mpeg_audio_stream_parser_base.h" diff --git a/media/formats/mpeg/mpeg_audio_stream_parser_base.h b/media/formats/mpeg/mpeg_audio_stream_parser_base.h index 4c81c8f..6dacee3 100644 --- a/media/formats/mpeg/mpeg_audio_stream_parser_base.h +++ b/media/formats/mpeg/mpeg_audio_stream_parser_base.h @@ -9,6 +9,7 @@ #include <vector> #include "base/callback.h" +#include "base/macros.h" #include "media/base/audio_decoder_config.h" #include "media/base/audio_timestamp_helper.h" #include "media/base/bit_reader.h" diff --git a/media/formats/webm/cluster_builder.h b/media/formats/webm/cluster_builder.h index 6e32ccc..d123c85 100644 --- a/media/formats/webm/cluster_builder.h +++ b/media/formats/webm/cluster_builder.h @@ -5,6 +5,7 @@ #ifndef MEDIA_FORMATS_WEBM_CLUSTER_BUILDER_H_ #define MEDIA_FORMATS_WEBM_CLUSTER_BUILDER_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" namespace media { diff --git a/media/formats/webm/opus_packet_builder.h b/media/formats/webm/opus_packet_builder.h index af76b49..b7bec7f 100644 --- a/media/formats/webm/opus_packet_builder.h +++ b/media/formats/webm/opus_packet_builder.h @@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" diff --git a/media/formats/webm/webm_audio_client.h b/media/formats/webm/webm_audio_client.h index 98f0eee..aed8ce2 100644 --- a/media/formats/webm/webm_audio_client.h +++ b/media/formats/webm/webm_audio_client.h @@ -8,6 +8,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "media/base/media_log.h" #include "media/formats/webm/webm_parser.h" diff --git a/media/formats/webm/webm_cluster_parser.h b/media/formats/webm/webm_cluster_parser.h index bd02810..9d674ca 100644 --- a/media/formats/webm/webm_cluster_parser.h +++ b/media/formats/webm/webm_cluster_parser.h @@ -10,6 +10,7 @@ #include <set> #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "media/base/audio_decoder_config.h" #include "media/base/media_export.h" diff --git a/media/formats/webm/webm_content_encodings.h b/media/formats/webm/webm_content_encodings.h index 1cc68a4..6057bba 100644 --- a/media/formats/webm/webm_content_encodings.h +++ b/media/formats/webm/webm_content_encodings.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "media/base/media_export.h" diff --git a/media/formats/webm/webm_content_encodings_client.h b/media/formats/webm/webm_content_encodings_client.h index 1144567..0e768e8 100644 --- a/media/formats/webm/webm_content_encodings_client.h +++ b/media/formats/webm/webm_content_encodings_client.h @@ -9,6 +9,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "media/base/media_export.h" #include "media/base/media_log.h" diff --git a/media/formats/webm/webm_info_parser.h b/media/formats/webm/webm_info_parser.h index bec5cd2..147bf30 100644 --- a/media/formats/webm/webm_info_parser.h +++ b/media/formats/webm/webm_info_parser.h @@ -6,6 +6,7 @@ #define MEDIA_FORMATS_WEBM_WEBM_INFO_PARSER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/time/time.h" #include "media/base/media_export.h" #include "media/formats/webm/webm_parser.h" diff --git a/media/formats/webm/webm_stream_parser.h b/media/formats/webm/webm_stream_parser.h index 7bcf0d9..59ddab0 100644 --- a/media/formats/webm/webm_stream_parser.h +++ b/media/formats/webm/webm_stream_parser.h @@ -6,6 +6,7 @@ #define MEDIA_FORMATS_WEBM_WEBM_STREAM_PARSER_H_ #include "base/callback_forward.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "media/base/audio_decoder_config.h" #include "media/base/byte_queue.h" diff --git a/media/formats/webm/webm_tracks_parser.h b/media/formats/webm/webm_tracks_parser.h index 2f94cfb..774ad7d 100644 --- a/media/formats/webm/webm_tracks_parser.h +++ b/media/formats/webm/webm_tracks_parser.h @@ -11,6 +11,7 @@ #include <vector> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "media/base/audio_decoder_config.h" diff --git a/media/formats/webm/webm_video_client.h b/media/formats/webm/webm_video_client.h index 12a6cbb..3ef7357 100644 --- a/media/formats/webm/webm_video_client.h +++ b/media/formats/webm/webm_video_client.h @@ -8,6 +8,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "media/base/media_log.h" #include "media/formats/webm/webm_parser.h" diff --git a/media/midi/midi_manager.h b/media/midi/midi_manager.h index e5d17be..1426057 100644 --- a/media/midi/midi_manager.h +++ b/media/midi/midi_manager.h @@ -8,6 +8,7 @@ #include <set> #include <vector> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/synchronization/lock.h" #include "base/time/time.h" diff --git a/media/midi/midi_manager_alsa.h b/media/midi/midi_manager_alsa.h index a3ab5e9..d8c22c9 100644 --- a/media/midi/midi_manager_alsa.h +++ b/media/midi/midi_manager_alsa.h @@ -10,6 +10,7 @@ #include <vector> #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/synchronization/lock.h" #include "base/threading/thread.h" diff --git a/media/midi/midi_manager_mac.h b/media/midi/midi_manager_mac.h index a3440c0..c7bdb30 100644 --- a/media/midi/midi_manager_mac.h +++ b/media/midi/midi_manager_mac.h @@ -12,6 +12,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/threading/thread.h" #include "media/midi/midi_export.h" #include "media/midi/midi_manager.h" diff --git a/media/midi/midi_manager_usb.h b/media/midi/midi_manager_usb.h index c3b886f..2ec97b8 100644 --- a/media/midi/midi_manager_usb.h +++ b/media/midi/midi_manager_usb.h @@ -12,6 +12,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" #include "base/containers/hash_tables.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "media/midi/midi_manager.h" diff --git a/media/midi/midi_manager_win.h b/media/midi/midi_manager_win.h index 9d1aee2..b52f96c 100644 --- a/media/midi/midi_manager_win.h +++ b/media/midi/midi_manager_win.h @@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/threading/thread.h" #include "base/time/time.h" diff --git a/media/midi/midi_scheduler.h b/media/midi/midi_scheduler.h index 58de5d2..5f9386a 100644 --- a/media/midi/midi_scheduler.h +++ b/media/midi/midi_scheduler.h @@ -6,6 +6,7 @@ #define MEDIA_MIDI_MIDI_SCHEDULER_H_ #include "base/callback.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "media/midi/midi_export.h" diff --git a/media/midi/usb_midi_device_android.h b/media/midi/usb_midi_device_android.h index 27d2389..ce857af 100644 --- a/media/midi/usb_midi_device_android.h +++ b/media/midi/usb_midi_device_android.h @@ -11,6 +11,7 @@ #include "base/android/scoped_java_ref.h" #include "base/callback.h" +#include "base/macros.h" #include "media/midi/usb_midi_device.h" #include "media/midi/usb_midi_export.h" diff --git a/media/midi/usb_midi_device_factory_android.h b/media/midi/usb_midi_device_factory_android.h index e4f7d45..1f8e435 100644 --- a/media/midi/usb_midi_device_factory_android.h +++ b/media/midi/usb_midi_device_factory_android.h @@ -10,6 +10,7 @@ #include "base/android/scoped_java_ref.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "media/midi/usb_midi_device.h" #include "media/midi/usb_midi_export.h" diff --git a/media/midi/usb_midi_input_stream.h b/media/midi/usb_midi_input_stream.h index 201ee17..0d6fd49 100644 --- a/media/midi/usb_midi_input_stream.h +++ b/media/midi/usb_midi_input_stream.h @@ -9,6 +9,7 @@ #include <vector> #include "base/containers/hash_tables.h" +#include "base/macros.h" #include "base/time/time.h" #include "media/midi/usb_midi_export.h" #include "media/midi/usb_midi_jack.h" diff --git a/media/mojo/services/demuxer_stream_provider_shim.h b/media/mojo/services/demuxer_stream_provider_shim.h index 9fdab66..0628f99 100644 --- a/media/mojo/services/demuxer_stream_provider_shim.h +++ b/media/mojo/services/demuxer_stream_provider_shim.h @@ -6,6 +6,7 @@ #define MEDIA_MOJO_SERVICES_DEMUXER_STREAM_PROVIDER_SHIM_H_ #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" #include "media/base/demuxer_stream_provider.h" diff --git a/media/mojo/services/mojo_demuxer_stream_adapter.h b/media/mojo/services/mojo_demuxer_stream_adapter.h index b6b4d93..1484900 100644 --- a/media/mojo/services/mojo_demuxer_stream_adapter.h +++ b/media/mojo/services/mojo_demuxer_stream_adapter.h @@ -7,6 +7,7 @@ #include <queue> +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "media/base/audio_decoder_config.h" #include "media/base/demuxer_stream.h" diff --git a/media/mojo/services/mojo_renderer_factory.h b/media/mojo/services/mojo_renderer_factory.h index 8074ab3..06d6447 100644 --- a/media/mojo/services/mojo_renderer_factory.h +++ b/media/mojo/services/mojo_renderer_factory.h @@ -5,6 +5,7 @@ #ifndef MEDIA_MOJO_SERVICES_MOJO_RENDERER_FACTORY_H_ #define MEDIA_MOJO_SERVICES_MOJO_RENDERER_FACTORY_H_ +#include "base/macros.h" #include "media/base/media_export.h" #include "media/base/renderer_factory.h" #include "media/mojo/interfaces/renderer.mojom.h" diff --git a/media/ozone/media_ozone_platform.h b/media/ozone/media_ozone_platform.h index c59775d..683681a 100644 --- a/media/ozone/media_ozone_platform.h +++ b/media/ozone/media_ozone_platform.h @@ -6,6 +6,7 @@ #define MEDIA_OZONE_MEDIA_OZONE_PLATFORM_H_ #include "base/callback.h" +#include "base/macros.h" #include "media/base/media_export.h" namespace media { diff --git a/media/renderers/audio_renderer_impl.h b/media/renderers/audio_renderer_impl.h index 7674851..3db9b6b 100644 --- a/media/renderers/audio_renderer_impl.h +++ b/media/renderers/audio_renderer_impl.h @@ -21,6 +21,7 @@ #include <deque> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/synchronization/lock.h" diff --git a/media/renderers/default_renderer_factory.h b/media/renderers/default_renderer_factory.h index d8dbde9..1acf6fb 100644 --- a/media/renderers/default_renderer_factory.h +++ b/media/renderers/default_renderer_factory.h @@ -6,6 +6,7 @@ #define MEDIA_RENDERERS_DEFAULT_RENDERER_FACTORY_H_ #include "base/callback.h" +#include "base/macros.h" #include "media/base/media_export.h" #include "media/base/renderer_factory.h" diff --git a/media/renderers/mock_gpu_video_accelerator_factories.h b/media/renderers/mock_gpu_video_accelerator_factories.h index 7980939..edf3303 100644 --- a/media/renderers/mock_gpu_video_accelerator_factories.h +++ b/media/renderers/mock_gpu_video_accelerator_factories.h @@ -5,6 +5,7 @@ #ifndef MEDIA_RENDERERS_MOCK_GPU_VIDEO_ACCELERATOR_FACTORIES_H_ #define MEDIA_RENDERERS_MOCK_GPU_VIDEO_ACCELERATOR_FACTORIES_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/single_thread_task_runner.h" diff --git a/media/renderers/renderer_impl.h b/media/renderers/renderer_impl.h index ccaabbe..fc13ddb 100644 --- a/media/renderers/renderer_impl.h +++ b/media/renderers/renderer_impl.h @@ -8,6 +8,7 @@ #include <vector> #include "base/cancelable_callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" diff --git a/media/renderers/video_renderer_impl.h b/media/renderers/video_renderer_impl.h index 6118a28..f1ae0e6 100644 --- a/media/renderers/video_renderer_impl.h +++ b/media/renderers/video_renderer_impl.h @@ -7,6 +7,7 @@ #include <deque> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" diff --git a/media/video/fake_video_encode_accelerator.h b/media/video/fake_video_encode_accelerator.h index d1f08e7..b471ded 100644 --- a/media/video/fake_video_encode_accelerator.h +++ b/media/video/fake_video_encode_accelerator.h @@ -9,6 +9,7 @@ #include <queue> #include <vector> +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "media/base/bitstream_buffer.h" #include "media/base/media_export.h" diff --git a/media/video/h264_poc.h b/media/video/h264_poc.h index 5457231..c444c13 100644 --- a/media/video/h264_poc.h +++ b/media/video/h264_poc.h @@ -5,6 +5,8 @@ #ifndef MEDIA_VIDEO_H264_POC_H_ #define MEDIA_VIDEO_H264_POC_H_ +#include "base/macros.h" + namespace media { struct H264SPS; diff --git a/media/video/mock_video_decode_accelerator.h b/media/video/mock_video_decode_accelerator.h index 9e90828..d85032a 100644 --- a/media/video/mock_video_decode_accelerator.h +++ b/media/video/mock_video_decode_accelerator.h @@ -9,6 +9,7 @@ #include <vector> +#include "base/macros.h" #include "media/base/bitstream_buffer.h" #include "media/base/video_decoder_config.h" #include "media/video/picture.h" |