From 19bf2cea5af3e4e4c499a41a90a6603d911616e5 Mon Sep 17 00:00:00 2001 From: "anujk.sharma" Date: Thu, 14 May 2015 13:41:05 -0700 Subject: Getting rid of duplicate includes from media/ As any includes present in the related header do not need to be included again in the related cc (i.e., foo.cc can rely on foo.h's includes). This removes all includes from $X.cc files where the $X.h has the same include to confirm to the style guide. BUG=460988 Review URL: https://codereview.chromium.org/1133363002 Cr-Commit-Position: refs/heads/master@{#329923} --- media/audio/alsa/alsa_input.cc | 1 - media/audio/alsa/alsa_output.cc | 1 - media/audio/alsa/alsa_util.cc | 1 - media/audio/alsa/alsa_wrapper.cc | 1 - media/audio/audio_input_controller.cc | 1 - media/audio/audio_input_device.cc | 1 - media/audio/audio_output_controller.cc | 1 - media/audio/audio_output_device.cc | 1 - media/audio/audio_output_dispatcher_impl.cc | 1 - media/audio/audio_output_resampler.cc | 3 --- media/audio/clockless_audio_sink.cc | 2 -- media/audio/mac/audio_manager_mac.cc | 2 -- media/audio/pulse/pulse_output.cc | 1 - media/audio/win/audio_low_latency_output_win.cc | 1 - media/audio/win/core_audio_util_win.cc | 1 - media/audio/win/waveout_output_win.cc | 2 -- media/base/android/media_codec_bridge.cc | 2 -- media/base/android/media_decoder_job.cc | 1 - media/base/android/media_source_player.cc | 1 - media/base/audio_decoder_config.cc | 2 -- media/base/audio_discard_helper.cc | 1 - media/base/container_names.cc | 1 - media/base/data_buffer.cc | 1 - media/base/decoder_buffer.cc | 3 --- media/base/key_systems.cc | 2 -- media/base/key_systems_support_uma.cc | 1 - media/base/media_log.cc | 2 -- media/base/text_renderer.cc | 1 - media/base/video_frame.cc | 1 - media/blink/cdm_session_adapter.cc | 2 -- media/blink/encrypted_media_player_support.cc | 1 - media/blink/test_response_generator.cc | 1 - media/blink/webmediaplayer_impl.cc | 5 ----- media/cast/logging/log_deserializer.cc | 1 - media/cast/logging/simple_event_subscriber.cc | 1 - media/cast/net/cast_transport_sender_impl.cc | 1 - media/cast/net/rtcp/rtcp_builder.cc | 2 -- media/cast/net/rtp/rtp_sender.cc | 2 -- media/cast/net/udp_transport.cc | 2 -- media/cast/receiver/audio_decoder.cc | 1 - media/cast/sender/audio_encoder.cc | 2 -- media/cast/sender/external_video_encoder.cc | 1 - media/cast/test/fake_media_source.cc | 4 ---- media/cast/test/utility/udp_proxy.cc | 1 - media/cdm/key_system_names.cc | 1 - media/cdm/ppapi/cdm_adapter.cc | 1 - media/cdm/ppapi/cdm_file_io_impl.cc | 1 - media/cdm/ppapi/cdm_helpers.cc | 12 +----------- media/cdm/ppapi/cdm_logging.cc | 1 - media/cdm/ppapi/external_clear_key/clear_key_cdm.cc | 2 -- .../cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.cc | 1 - media/ffmpeg/ffmpeg_common.cc | 1 - media/filters/audio_file_reader.cc | 1 - media/filters/audio_renderer_algorithm.cc | 2 -- media/filters/decoder_stream.cc | 2 -- media/filters/decrypting_audio_decoder.cc | 2 -- media/filters/decrypting_demuxer_stream.cc | 4 ---- media/filters/decrypting_video_decoder.cc | 2 -- media/filters/fake_video_decoder.cc | 2 -- media/filters/ffmpeg_audio_decoder.cc | 1 - media/filters/ffmpeg_demuxer.cc | 5 ----- media/filters/ffmpeg_video_decoder.cc | 1 - media/filters/gpu_video_decoder.cc | 1 - media/filters/stream_parser_factory.cc | 1 - media/filters/vpx_video_decoder.cc | 3 --- media/formats/common/offset_byte_queue.cc | 1 - media/formats/mp2t/es_adapter_video.cc | 1 - media/formats/mp2t/es_parser_adts.cc | 1 - media/formats/mp2t/es_parser_h264.cc | 2 -- media/formats/mp2t/es_parser_mpeg1audio.cc | 1 - media/formats/mp2t/mp2t_stream_parser.cc | 3 --- media/formats/mp4/aac.cc | 1 - media/formats/mp4/avc.cc | 1 - media/formats/mp4/box_reader.cc | 3 --- media/formats/mp4/mp4_stream_parser.cc | 1 - media/midi/midi_manager_alsa.cc | 5 ----- media/midi/midi_manager_mac.cc | 1 - media/midi/midi_manager_usb.cc | 6 ------ media/midi/midi_manager_win.cc | 4 ---- media/midi/usb_midi_device_android.cc | 2 -- media/midi/usb_midi_device_factory_android.cc | 4 ---- media/midi/usb_midi_input_stream.cc | 3 --- media/mojo/services/media_type_converters.cc | 1 - media/mojo/services/mojo_demuxer_stream_impl.cc | 3 --- media/mojo/services/mojo_renderer_factory.cc | 1 - media/renderers/video_renderer_impl.cc | 2 -- media/video/capture/android/video_capture_device_android.cc | 2 -- .../capture/android/video_capture_device_factory_android.cc | 1 - media/video/capture/fake_video_capture_device.cc | 2 -- media/video/capture/file_video_capture_device.cc | 2 -- media/video/capture/linux/video_capture_device_linux.cc | 1 - 91 files changed, 1 insertion(+), 168 deletions(-) (limited to 'media') diff --git a/media/audio/alsa/alsa_input.cc b/media/audio/alsa/alsa_input.cc index 3c555a0..67f23593 100644 --- a/media/audio/alsa/alsa_input.cc +++ b/media/audio/alsa/alsa_input.cc @@ -8,7 +8,6 @@ #include "base/bind.h" #include "base/logging.h" #include "base/message_loop/message_loop.h" -#include "base/time/time.h" #include "media/audio/alsa/alsa_output.h" #include "media/audio/alsa/alsa_util.h" #include "media/audio/alsa/alsa_wrapper.h" diff --git a/media/audio/alsa/alsa_output.cc b/media/audio/alsa/alsa_output.cc index fac6888..554aa5f 100644 --- a/media/audio/alsa/alsa_output.cc +++ b/media/audio/alsa/alsa_output.cc @@ -39,7 +39,6 @@ #include "base/bind.h" #include "base/logging.h" #include "base/stl_util.h" -#include "base/time/time.h" #include "base/trace_event/trace_event.h" #include "media/audio/alsa/alsa_util.h" #include "media/audio/alsa/alsa_wrapper.h" diff --git a/media/audio/alsa/alsa_util.cc b/media/audio/alsa/alsa_util.cc index f26cbd3..ffc3a39 100644 --- a/media/audio/alsa/alsa_util.cc +++ b/media/audio/alsa/alsa_util.cc @@ -4,7 +4,6 @@ #include "media/audio/alsa/alsa_util.h" -#include #include "base/logging.h" #include "media/audio/alsa/alsa_wrapper.h" diff --git a/media/audio/alsa/alsa_wrapper.cc b/media/audio/alsa/alsa_wrapper.cc index 969f3c4..d77e27e 100644 --- a/media/audio/alsa/alsa_wrapper.cc +++ b/media/audio/alsa/alsa_wrapper.cc @@ -4,7 +4,6 @@ #include "media/audio/alsa/alsa_wrapper.h" -#include namespace media { diff --git a/media/audio/audio_input_controller.cc b/media/audio/audio_input_controller.cc index 85da58a..323de96 100644 --- a/media/audio/audio_input_controller.cc +++ b/media/audio/audio_input_controller.cc @@ -12,7 +12,6 @@ #include "base/thread_task_runner_handle.h" #include "base/threading/thread_restrictions.h" #include "base/time/time.h" -#include "media/audio/audio_parameters.h" #include "media/base/user_input_monitor.h" using base::TimeDelta; diff --git a/media/audio/audio_input_device.cc b/media/audio/audio_input_device.cc index 6cf0fec..c352f70 100644 --- a/media/audio/audio_input_device.cc +++ b/media/audio/audio_input_device.cc @@ -4,7 +4,6 @@ #include "media/audio/audio_input_device.h" -#include "base/basictypes.h" #include "base/bind.h" #include "base/memory/scoped_vector.h" #include "base/threading/thread_restrictions.h" diff --git a/media/audio/audio_output_controller.cc b/media/audio/audio_output_controller.cc index f95dab0..8af0aab 100644 --- a/media/audio/audio_output_controller.cc +++ b/media/audio/audio_output_controller.cc @@ -11,7 +11,6 @@ #include "base/threading/platform_thread.h" #include "base/time/time.h" #include "base/trace_event/trace_event.h" -#include "build/build_config.h" using base::TimeDelta; diff --git a/media/audio/audio_output_device.cc b/media/audio/audio_output_device.cc index 960c84b..dc83328 100644 --- a/media/audio/audio_output_device.cc +++ b/media/audio/audio_output_device.cc @@ -4,7 +4,6 @@ #include "media/audio/audio_output_device.h" -#include "base/basictypes.h" #include "base/threading/thread_restrictions.h" #include "base/time/time.h" #include "base/trace_event/trace_event.h" diff --git a/media/audio/audio_output_dispatcher_impl.cc b/media/audio/audio_output_dispatcher_impl.cc index 521f91d..a2d9fc2 100644 --- a/media/audio/audio_output_dispatcher_impl.cc +++ b/media/audio/audio_output_dispatcher_impl.cc @@ -10,7 +10,6 @@ #include "base/compiler_specific.h" #include "base/single_thread_task_runner.h" #include "base/time/time.h" -#include "media/audio/audio_io.h" #include "media/audio/audio_output_proxy.h" namespace media { diff --git a/media/audio/audio_output_resampler.cc b/media/audio/audio_output_resampler.cc index f053444..6fb970b 100644 --- a/media/audio/audio_output_resampler.cc +++ b/media/audio/audio_output_resampler.cc @@ -10,11 +10,8 @@ #include "base/metrics/histogram.h" #include "base/numerics/safe_conversions.h" #include "base/single_thread_task_runner.h" -#include "base/time/time.h" #include "base/trace_event/trace_event.h" #include "build/build_config.h" -#include "media/audio/audio_io.h" -#include "media/audio/audio_output_dispatcher_impl.h" #include "media/audio/audio_output_proxy.h" #include "media/audio/sample_rates.h" #include "media/base/audio_converter.h" diff --git a/media/audio/clockless_audio_sink.cc b/media/audio/clockless_audio_sink.cc index 77f7057..44e9adb 100644 --- a/media/audio/clockless_audio_sink.cc +++ b/media/audio/clockless_audio_sink.cc @@ -5,8 +5,6 @@ #include "media/audio/clockless_audio_sink.h" #include "base/threading/simple_thread.h" -#include "base/time/time.h" -#include "media/base/audio_renderer_sink.h" namespace media { diff --git a/media/audio/mac/audio_manager_mac.cc b/media/audio/mac/audio_manager_mac.cc index b3d5978..42651ff 100644 --- a/media/audio/mac/audio_manager_mac.cc +++ b/media/audio/mac/audio_manager_mac.cc @@ -4,8 +4,6 @@ #include "media/audio/mac/audio_manager_mac.h" -#include -#include #include "base/bind.h" #include "base/command_line.h" diff --git a/media/audio/pulse/pulse_output.cc b/media/audio/pulse/pulse_output.cc index 1048113..5168f35 100644 --- a/media/audio/pulse/pulse_output.cc +++ b/media/audio/pulse/pulse_output.cc @@ -8,7 +8,6 @@ #include "base/single_thread_task_runner.h" #include "media/audio/audio_manager_base.h" -#include "media/audio/audio_parameters.h" #include "media/audio/pulse/pulse_util.h" namespace media { diff --git a/media/audio/win/audio_low_latency_output_win.cc b/media/audio/win/audio_low_latency_output_win.cc index f7b31a3..222f0cf 100644 --- a/media/audio/win/audio_low_latency_output_win.cc +++ b/media/audio/win/audio_low_latency_output_win.cc @@ -8,7 +8,6 @@ #include "base/command_line.h" #include "base/logging.h" -#include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" #include "base/strings/utf_string_conversions.h" #include "base/trace_event/trace_event.h" diff --git a/media/audio/win/core_audio_util_win.cc b/media/audio/win/core_audio_util_win.cc index bf1c56b..8e1a82b 100644 --- a/media/audio/win/core_audio_util_win.cc +++ b/media/audio/win/core_audio_util_win.cc @@ -4,7 +4,6 @@ #include "media/audio/win/core_audio_util_win.h" -#include #include #include diff --git a/media/audio/win/waveout_output_win.cc b/media/audio/win/waveout_output_win.cc index bb08002..7f35065 100644 --- a/media/audio/win/waveout_output_win.cc +++ b/media/audio/win/waveout_output_win.cc @@ -4,8 +4,6 @@ #include "media/audio/win/waveout_output_win.h" -#include -#include #pragma comment(lib, "winmm.lib") #include "base/atomicops.h" diff --git a/media/base/android/media_codec_bridge.cc b/media/base/android/media_codec_bridge.cc index 9128df3..14f3300 100644 --- a/media/base/android/media_codec_bridge.cc +++ b/media/base/android/media_codec_bridge.cc @@ -4,8 +4,6 @@ #include "media/base/android/media_codec_bridge.h" -#include -#include #include "base/android/build_info.h" #include "base/android/jni_android.h" diff --git a/media/base/android/media_decoder_job.cc b/media/base/android/media_decoder_job.cc index 5aa8a4d..0056349 100644 --- a/media/base/android/media_decoder_job.cc +++ b/media/base/android/media_decoder_job.cc @@ -9,7 +9,6 @@ #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" #include "base/trace_event/trace_event.h" -#include "media/base/android/media_codec_bridge.h" #include "media/base/android/media_drm_bridge.h" #include "media/base/bind_to_current_loop.h" #include "media/base/buffers.h" diff --git a/media/base/android/media_source_player.cc b/media/base/android/media_source_player.cc index ca13089..7e8f49a 100644 --- a/media/base/android/media_source_player.cc +++ b/media/base/android/media_source_player.cc @@ -16,7 +16,6 @@ #include "base/strings/string_number_conversions.h" #include "base/trace_event/trace_event.h" #include "media/base/android/audio_decoder_job.h" -#include "media/base/android/media_drm_bridge.h" #include "media/base/android/media_player_manager.h" #include "media/base/android/video_decoder_job.h" diff --git a/media/base/audio_decoder_config.cc b/media/base/audio_decoder_config.cc index 4526859..780bada 100644 --- a/media/base/audio_decoder_config.cc +++ b/media/base/audio_decoder_config.cc @@ -6,10 +6,8 @@ #include "base/logging.h" #include "base/metrics/histogram.h" -#include "base/time/time.h" #include "media/audio/sample_rates.h" #include "media/base/limits.h" -#include "media/base/sample_format.h" namespace media { diff --git a/media/base/audio_discard_helper.cc b/media/base/audio_discard_helper.cc index 8405d0b..f7c645c 100644 --- a/media/base/audio_discard_helper.cc +++ b/media/base/audio_discard_helper.cc @@ -8,7 +8,6 @@ #include "base/logging.h" #include "media/base/audio_buffer.h" -#include "media/base/buffers.h" namespace media { diff --git a/media/base/container_names.cc b/media/base/container_names.cc index f3b0d5f..48523d1 100644 --- a/media/base/container_names.cc +++ b/media/base/container_names.cc @@ -7,7 +7,6 @@ #include #include -#include "base/basictypes.h" #include "base/logging.h" #include "media/base/bit_reader.h" diff --git a/media/base/data_buffer.cc b/media/base/data_buffer.cc index d0b40ee..9d6afaf 100644 --- a/media/base/data_buffer.cc +++ b/media/base/data_buffer.cc @@ -4,7 +4,6 @@ #include "media/base/data_buffer.h" -#include "base/logging.h" namespace media { diff --git a/media/base/decoder_buffer.cc b/media/base/decoder_buffer.cc index a9c1779..a8624b1 100644 --- a/media/base/decoder_buffer.cc +++ b/media/base/decoder_buffer.cc @@ -4,9 +4,6 @@ #include "media/base/decoder_buffer.h" -#include "base/logging.h" -#include "media/base/buffers.h" -#include "media/base/decrypt_config.h" namespace media { diff --git a/media/base/key_systems.cc b/media/base/key_systems.cc index 684e60a..f38fe7c 100644 --- a/media/base/key_systems.cc +++ b/media/base/key_systems.cc @@ -4,7 +4,6 @@ #include "media/base/key_systems.h" -#include #include "base/containers/hash_tables.h" #include "base/lazy_instance.h" @@ -12,7 +11,6 @@ #include "base/strings/string_util.h" #include "base/threading/thread_checker.h" #include "base/time/time.h" -#include "media/base/eme_constants.h" #include "media/base/key_system_info.h" #include "media/base/key_systems_support_uma.h" #include "media/base/media_client.h" diff --git a/media/base/key_systems_support_uma.cc b/media/base/key_systems_support_uma.cc index f0cdf84..6007026 100644 --- a/media/base/key_systems_support_uma.cc +++ b/media/base/key_systems_support_uma.cc @@ -4,7 +4,6 @@ #include "media/base/key_systems_support_uma.h" -#include #include "base/metrics/histogram.h" #include "media/base/key_systems.h" diff --git a/media/base/media_log.cc b/media/base/media_log.cc index b32942d..c89c415 100644 --- a/media/base/media_log.cc +++ b/media/base/media_log.cc @@ -4,11 +4,9 @@ #include "media/base/media_log.h" -#include #include "base/atomic_sequence_num.h" #include "base/json/json_writer.h" -#include "base/logging.h" #include "base/values.h" namespace media { diff --git a/media/base/text_renderer.cc b/media/base/text_renderer.cc index 570907e..3648f8a 100644 --- a/media/base/text_renderer.cc +++ b/media/base/text_renderer.cc @@ -12,7 +12,6 @@ #include "media/base/bind_to_current_loop.h" #include "media/base/decoder_buffer.h" #include "media/base/demuxer.h" -#include "media/base/demuxer_stream.h" #include "media/base/text_cue.h" namespace media { diff --git a/media/base/video_frame.cc b/media/base/video_frame.cc index 848ebeb..cae9870 100644 --- a/media/base/video_frame.cc +++ b/media/base/video_frame.cc @@ -11,7 +11,6 @@ #include "base/logging.h" #include "base/memory/aligned_memory.h" #include "base/strings/string_piece.h" -#include "gpu/command_buffer/common/mailbox_holder.h" #include "media/base/limits.h" #include "media/base/video_util.h" #include "ui/gfx/geometry/point.h" diff --git a/media/blink/cdm_session_adapter.cc b/media/blink/cdm_session_adapter.cc index f4f3906..2ffc4b5 100644 --- a/media/blink/cdm_session_adapter.cc +++ b/media/blink/cdm_session_adapter.cc @@ -6,13 +6,11 @@ #include "base/bind.h" #include "base/logging.h" -#include "base/memory/weak_ptr.h" #include "base/stl_util.h" #include "media/base/cdm_factory.h" #include "media/base/cdm_key_information.h" #include "media/base/cdm_promise.h" #include "media/base/key_systems.h" -#include "media/base/media_keys.h" #include "media/blink/webcontentdecryptionmodule_impl.h" #include "media/blink/webcontentdecryptionmodulesession_impl.h" #include "url/gurl.h" diff --git a/media/blink/encrypted_media_player_support.cc b/media/blink/encrypted_media_player_support.cc index cc11a2e..3a0ddd8 100644 --- a/media/blink/encrypted_media_player_support.cc +++ b/media/blink/encrypted_media_player_support.cc @@ -4,7 +4,6 @@ #include "media/blink/encrypted_media_player_support.h" -#include #include "base/bind.h" #include "base/callback_helpers.h" diff --git a/media/blink/test_response_generator.cc b/media/blink/test_response_generator.cc index aa3b748..de7b5d5 100644 --- a/media/blink/test_response_generator.cc +++ b/media/blink/test_response_generator.cc @@ -9,7 +9,6 @@ #include "base/strings/stringprintf.h" #include "net/base/net_errors.h" #include "third_party/WebKit/public/platform/WebString.h" -#include "third_party/WebKit/public/platform/WebURLResponse.h" using blink::WebString; using blink::WebURLError; diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc index 814a932..5835e63 100644 --- a/media/blink/webmediaplayer_impl.cc +++ b/media/blink/webmediaplayer_impl.cc @@ -7,8 +7,6 @@ #include #include #include -#include -#include #include "base/bind.h" #include "base/callback.h" @@ -28,11 +26,8 @@ #include "media/base/cdm_context.h" #include "media/base/limits.h" #include "media/base/media_log.h" -#include "media/base/pipeline.h" #include "media/base/text_renderer.h" #include "media/base/video_frame.h" -#include "media/blink/buffered_data_source.h" -#include "media/blink/encrypted_media_player_support.h" #include "media/blink/texttrack_impl.h" #include "media/blink/webaudiosourceprovider_impl.h" #include "media/blink/webcontentdecryptionmodule_impl.h" diff --git a/media/cast/logging/log_deserializer.cc b/media/cast/logging/log_deserializer.cc index 1c6dd57..5e5b189 100644 --- a/media/cast/logging/log_deserializer.cc +++ b/media/cast/logging/log_deserializer.cc @@ -4,7 +4,6 @@ #include "media/cast/logging/log_deserializer.h" -#include #include #include "base/big_endian.h" diff --git a/media/cast/logging/simple_event_subscriber.cc b/media/cast/logging/simple_event_subscriber.cc index 984d8f7..cad9956 100644 --- a/media/cast/logging/simple_event_subscriber.cc +++ b/media/cast/logging/simple_event_subscriber.cc @@ -4,7 +4,6 @@ #include "media/cast/logging/simple_event_subscriber.h" -#include #include "base/logging.h" diff --git a/media/cast/net/cast_transport_sender_impl.cc b/media/cast/net/cast_transport_sender_impl.cc index 34336fa..4def327 100644 --- a/media/cast/net/cast_transport_sender_impl.cc +++ b/media/cast/net/cast_transport_sender_impl.cc @@ -6,7 +6,6 @@ #include "base/single_thread_task_runner.h" #include "base/values.h" -#include "media/cast/net/cast_transport_config.h" #include "media/cast/net/cast_transport_defines.h" #include "media/cast/net/udp_transport.h" #include "net/base/net_errors.h" diff --git a/media/cast/net/rtcp/rtcp_builder.cc b/media/cast/net/rtcp/rtcp_builder.cc index 6f25a99..07006fc 100644 --- a/media/cast/net/rtcp/rtcp_builder.cc +++ b/media/cast/net/rtcp/rtcp_builder.cc @@ -10,8 +10,6 @@ #include #include "base/logging.h" -#include "media/cast/net/cast_transport_defines.h" -#include "media/cast/net/rtcp/rtcp_defines.h" #include "media/cast/net/rtcp/rtcp_utility.h" namespace media { diff --git a/media/cast/net/rtp/rtp_sender.cc b/media/cast/net/rtp/rtp_sender.cc index ef1cff7..2ecabcb 100644 --- a/media/cast/net/rtp/rtp_sender.cc +++ b/media/cast/net/rtp/rtp_sender.cc @@ -7,8 +7,6 @@ #include "base/big_endian.h" #include "base/logging.h" #include "base/rand_util.h" -#include "media/cast/net/cast_transport_defines.h" -#include "media/cast/net/pacing/paced_sender.h" namespace media { namespace cast { diff --git a/media/cast/net/udp_transport.cc b/media/cast/net/udp_transport.cc index f36b034..064a9d9 100644 --- a/media/cast/net/udp_transport.cc +++ b/media/cast/net/udp_transport.cc @@ -9,8 +9,6 @@ #include "base/bind.h" #include "base/logging.h" -#include "base/memory/ref_counted.h" -#include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/rand_util.h" #include "net/base/io_buffer.h" diff --git a/media/cast/receiver/audio_decoder.cc b/media/cast/receiver/audio_decoder.cc index 147abcf..f8a40be 100644 --- a/media/cast/receiver/audio_decoder.cc +++ b/media/cast/receiver/audio_decoder.cc @@ -8,7 +8,6 @@ #include "base/bind_helpers.h" #include "base/location.h" #include "base/logging.h" -#include "base/memory/ref_counted.h" #include "base/sys_byteorder.h" #include "media/cast/cast_defines.h" #include "third_party/opus/src/include/opus.h" diff --git a/media/cast/sender/audio_encoder.cc b/media/cast/sender/audio_encoder.cc index 942619a..3ded497 100644 --- a/media/cast/sender/audio_encoder.cc +++ b/media/cast/sender/audio_encoder.cc @@ -14,9 +14,7 @@ #include "base/stl_util.h" #include "base/sys_byteorder.h" #include "base/time/time.h" -#include "media/base/audio_bus.h" #include "media/cast/cast_defines.h" -#include "media/cast/cast_environment.h" #if !defined(OS_IOS) #include "third_party/opus/src/include/opus.h" diff --git a/media/cast/sender/external_video_encoder.cc b/media/cast/sender/external_video_encoder.cc index 95f2fb0..75ea4b4 100644 --- a/media/cast/sender/external_video_encoder.cc +++ b/media/cast/sender/external_video_encoder.cc @@ -15,7 +15,6 @@ #include "media/cast/cast_defines.h" #include "media/cast/logging/logging_defines.h" #include "media/cast/net/cast_transport_config.h" -#include "media/video/video_encode_accelerator.h" namespace { diff --git a/media/cast/test/fake_media_source.cc b/media/cast/test/fake_media_source.cc index a30a55b..6269e8d 100644 --- a/media/cast/test/fake_media_source.cc +++ b/media/cast/test/fake_media_source.cc @@ -4,12 +4,10 @@ #include "media/cast/test/fake_media_source.h" -#include "base/files/memory_mapped_file.h" #include "base/files/scoped_file.h" #include "base/logging.h" #include "base/rand_util.h" #include "base/strings/string_number_conversions.h" -#include "media/audio/audio_parameters.h" #include "media/base/audio_buffer.h" #include "media/base/audio_bus.h" #include "media/base/audio_fifo.h" @@ -22,8 +20,6 @@ #include "media/cast/test/utility/video_utility.h" #include "media/ffmpeg/ffmpeg_common.h" #include "media/ffmpeg/ffmpeg_deleters.h" -#include "media/filters/audio_renderer_algorithm.h" -#include "media/filters/ffmpeg_demuxer.h" #include "media/filters/ffmpeg_glue.h" #include "media/filters/in_memory_url_protocol.h" #include "ui/gfx/geometry/size.h" diff --git a/media/cast/test/utility/udp_proxy.cc b/media/cast/test/utility/udp_proxy.cc index bdabe27..9539dad 100644 --- a/media/cast/test/utility/udp_proxy.cc +++ b/media/cast/test/utility/udp_proxy.cc @@ -10,7 +10,6 @@ #include "base/logging.h" #include "base/rand_util.h" -#include "base/single_thread_task_runner.h" #include "base/synchronization/waitable_event.h" #include "base/thread_task_runner_handle.h" #include "base/threading/thread.h" diff --git a/media/cdm/key_system_names.cc b/media/cdm/key_system_names.cc index eed8453..1782203 100644 --- a/media/cdm/key_system_names.cc +++ b/media/cdm/key_system_names.cc @@ -4,7 +4,6 @@ #include "media/cdm/key_system_names.h" -#include namespace media { diff --git a/media/cdm/ppapi/cdm_adapter.cc b/media/cdm/ppapi/cdm_adapter.cc index 7ecdb57..29ca3ea 100644 --- a/media/cdm/ppapi/cdm_adapter.cc +++ b/media/cdm/ppapi/cdm_adapter.cc @@ -6,7 +6,6 @@ #include "media/base/limits.h" #include "media/cdm/ppapi/cdm_file_io_impl.h" -#include "media/cdm/ppapi/cdm_helpers.h" #include "media/cdm/ppapi/cdm_logging.h" #include "media/cdm/ppapi/supported_cdm_versions.h" #include "ppapi/c/ppb_console.h" diff --git a/media/cdm/ppapi/cdm_file_io_impl.cc b/media/cdm/ppapi/cdm_file_io_impl.cc index 3dbff43..d173788 100644 --- a/media/cdm/ppapi/cdm_file_io_impl.cc +++ b/media/cdm/ppapi/cdm_file_io_impl.cc @@ -4,7 +4,6 @@ #include "media/cdm/ppapi/cdm_file_io_impl.h" -#include #include #include "media/cdm/ppapi/cdm_logging.h" diff --git a/media/cdm/ppapi/cdm_helpers.cc b/media/cdm/ppapi/cdm_helpers.cc index 62f93a0..00e7595 100644 --- a/media/cdm/ppapi/cdm_helpers.cc +++ b/media/cdm/ppapi/cdm_helpers.cc @@ -5,18 +5,8 @@ #include "media/cdm/ppapi/cdm_helpers.h" #include -#include - -#include "base/basictypes.h" -#include "base/compiler_specific.h" -#include "build/build_config.h" -#include "media/cdm/ppapi/api/content_decryption_module.h" -#include "ppapi/c/pp_errors.h" -#include "ppapi/c/pp_stdint.h" + #include "ppapi/cpp/core.h" -#include "ppapi/cpp/dev/buffer_dev.h" -#include "ppapi/cpp/instance.h" -#include "ppapi/cpp/logging.h" #include "ppapi/cpp/module.h" namespace media { diff --git a/media/cdm/ppapi/cdm_logging.cc b/media/cdm/ppapi/cdm_logging.cc index 117db5e..4d47cec 100644 --- a/media/cdm/ppapi/cdm_logging.cc +++ b/media/cdm/ppapi/cdm_logging.cc @@ -34,7 +34,6 @@ #include #include -#include namespace media { diff --git a/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc b/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc index 39199de..6a6ff62 100644 --- a/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc +++ b/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc @@ -7,8 +7,6 @@ #include #include #include -#include -#include #include "base/bind.h" #include "base/logging.h" diff --git a/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.cc b/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.cc index 942dce1..0bf0a30 100644 --- a/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.cc +++ b/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.cc @@ -5,7 +5,6 @@ #include "media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.h" #include "base/logging.h" -#include "base/memory/scoped_ptr.h" #include "media/base/buffers.h" #include "media/base/limits.h" #include "media/ffmpeg/ffmpeg_common.h" diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc index 36d0e79..3b212ed 100644 --- a/media/ffmpeg/ffmpeg_common.cc +++ b/media/ffmpeg/ffmpeg_common.cc @@ -10,7 +10,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "media/base/decoder_buffer.h" -#include "media/base/video_frame.h" #include "media/base/video_util.h" namespace media { diff --git a/media/filters/audio_file_reader.cc b/media/filters/audio_file_reader.cc index 967fcb2..70b60d7 100644 --- a/media/filters/audio_file_reader.cc +++ b/media/filters/audio_file_reader.cc @@ -10,7 +10,6 @@ #include "base/time/time.h" #include "media/base/audio_bus.h" #include "media/ffmpeg/ffmpeg_common.h" -#include "media/filters/ffmpeg_glue.h" namespace media { diff --git a/media/filters/audio_renderer_algorithm.cc b/media/filters/audio_renderer_algorithm.cc index 0d59d39..2d2bfbf 100644 --- a/media/filters/audio_renderer_algorithm.cc +++ b/media/filters/audio_renderer_algorithm.cc @@ -8,8 +8,6 @@ #include #include "base/logging.h" -#include "base/memory/scoped_ptr.h" -#include "media/base/audio_buffer.h" #include "media/base/audio_bus.h" #include "media/base/limits.h" #include "media/filters/wsola_internals.h" diff --git a/media/filters/decoder_stream.cc b/media/filters/decoder_stream.cc index 3a366d8..9e387cb 100644 --- a/media/filters/decoder_stream.cc +++ b/media/filters/decoder_stream.cc @@ -10,10 +10,8 @@ #include "base/logging.h" #include "base/single_thread_task_runner.h" #include "base/trace_event/trace_event.h" -#include "media/base/audio_decoder.h" #include "media/base/bind_to_current_loop.h" #include "media/base/decoder_buffer.h" -#include "media/base/demuxer_stream.h" #include "media/base/video_decoder.h" #include "media/filters/decrypting_demuxer_stream.h" diff --git a/media/filters/decrypting_audio_decoder.cc b/media/filters/decrypting_audio_decoder.cc index 3425d0c2..7c8f4b2 100644 --- a/media/filters/decrypting_audio_decoder.cc +++ b/media/filters/decrypting_audio_decoder.cc @@ -17,8 +17,6 @@ #include "media/base/bind_to_current_loop.h" #include "media/base/buffers.h" #include "media/base/decoder_buffer.h" -#include "media/base/decryptor.h" -#include "media/base/demuxer_stream.h" #include "media/base/pipeline.h" namespace media { diff --git a/media/filters/decrypting_demuxer_stream.cc b/media/filters/decrypting_demuxer_stream.cc index 7a6f43c..260190c 100644 --- a/media/filters/decrypting_demuxer_stream.cc +++ b/media/filters/decrypting_demuxer_stream.cc @@ -9,13 +9,9 @@ #include "base/location.h" #include "base/logging.h" #include "base/single_thread_task_runner.h" -#include "media/base/audio_decoder_config.h" #include "media/base/bind_to_current_loop.h" #include "media/base/decoder_buffer.h" -#include "media/base/decryptor.h" -#include "media/base/demuxer_stream.h" #include "media/base/pipeline.h" -#include "media/base/video_decoder_config.h" namespace media { diff --git a/media/filters/decrypting_video_decoder.cc b/media/filters/decrypting_video_decoder.cc index d9bba50..8f30331 100644 --- a/media/filters/decrypting_video_decoder.cc +++ b/media/filters/decrypting_video_decoder.cc @@ -12,9 +12,7 @@ #include "base/trace_event/trace_event.h" #include "media/base/bind_to_current_loop.h" #include "media/base/decoder_buffer.h" -#include "media/base/decryptor.h" #include "media/base/pipeline.h" -#include "media/base/video_decoder_config.h" #include "media/base/video_frame.h" namespace media { diff --git a/media/filters/fake_video_decoder.cc b/media/filters/fake_video_decoder.cc index 9b96633..4c6fa9a 100644 --- a/media/filters/fake_video_decoder.cc +++ b/media/filters/fake_video_decoder.cc @@ -4,8 +4,6 @@ #include "media/filters/fake_video_decoder.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/location.h" #include "base/message_loop/message_loop_proxy.h" #include "media/base/bind_to_current_loop.h" diff --git a/media/filters/ffmpeg_audio_decoder.cc b/media/filters/ffmpeg_audio_decoder.cc index a302e41..2f8bf1b 100644 --- a/media/filters/ffmpeg_audio_decoder.cc +++ b/media/filters/ffmpeg_audio_decoder.cc @@ -13,7 +13,6 @@ #include "media/base/bind_to_current_loop.h" #include "media/base/decoder_buffer.h" #include "media/base/limits.h" -#include "media/base/sample_format.h" #include "media/ffmpeg/ffmpeg_common.h" #include "media/filters/ffmpeg_glue.h" diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc index 453027d..48eaf44 100644 --- a/media/filters/ffmpeg_demuxer.cc +++ b/media/filters/ffmpeg_demuxer.cc @@ -5,11 +5,9 @@ #include "media/filters/ffmpeg_demuxer.h" #include -#include #include "base/base64.h" #include "base/bind.h" -#include "base/callback.h" #include "base/callback_helpers.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/sparse_histogram.h" @@ -21,13 +19,10 @@ #include "base/task_runner_util.h" #include "base/thread_task_runner_handle.h" #include "base/time/time.h" -#include "media/base/audio_decoder_config.h" #include "media/base/bind_to_current_loop.h" -#include "media/base/decoder_buffer.h" #include "media/base/decrypt_config.h" #include "media/base/limits.h" #include "media/base/media_log.h" -#include "media/base/video_decoder_config.h" #include "media/ffmpeg/ffmpeg_common.h" #include "media/filters/ffmpeg_aac_bitstream_converter.h" #include "media/filters/ffmpeg_bitstream_converter.h" diff --git a/media/filters/ffmpeg_video_decoder.cc b/media/filters/ffmpeg_video_decoder.cc index a269afb..95daf52 100644 --- a/media/filters/ffmpeg_video_decoder.cc +++ b/media/filters/ffmpeg_video_decoder.cc @@ -18,7 +18,6 @@ #include "media/base/limits.h" #include "media/base/media_switches.h" #include "media/base/pipeline.h" -#include "media/base/video_decoder_config.h" #include "media/base/video_frame.h" #include "media/base/video_util.h" #include "media/ffmpeg/ffmpeg_common.h" diff --git a/media/filters/gpu_video_decoder.cc b/media/filters/gpu_video_decoder.cc index ff6c699..7211655 100644 --- a/media/filters/gpu_video_decoder.cc +++ b/media/filters/gpu_video_decoder.cc @@ -19,7 +19,6 @@ #include "media/base/decoder_buffer.h" #include "media/base/media_switches.h" #include "media/base/pipeline.h" -#include "media/base/pipeline_status.h" #include "media/base/video_decoder_config.h" #include "media/renderers/gpu_video_accelerator_factories.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/media/filters/stream_parser_factory.cc b/media/filters/stream_parser_factory.cc index 003cd8f..1315bd2 100644 --- a/media/filters/stream_parser_factory.cc +++ b/media/filters/stream_parser_factory.cc @@ -8,7 +8,6 @@ #include "base/metrics/histogram.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" -#include "media/base/media_log.h" #include "media/base/media_switches.h" #include "media/formats/mpeg/adts_stream_parser.h" #include "media/formats/mpeg/mpeg1_audio_stream_parser.h" diff --git a/media/filters/vpx_video_decoder.cc b/media/filters/vpx_video_decoder.cc index 4056323..64380b4 100644 --- a/media/filters/vpx_video_decoder.cc +++ b/media/filters/vpx_video_decoder.cc @@ -21,12 +21,9 @@ #include "base/trace_event/trace_event.h" #include "media/base/bind_to_current_loop.h" #include "media/base/decoder_buffer.h" -#include "media/base/demuxer_stream.h" #include "media/base/limits.h" #include "media/base/media_switches.h" #include "media/base/pipeline.h" -#include "media/base/video_decoder_config.h" -#include "media/base/video_frame.h" #include "media/base/video_util.h" // Include libvpx header files. diff --git a/media/formats/common/offset_byte_queue.cc b/media/formats/common/offset_byte_queue.cc index a2b6994..0bbff80 100644 --- a/media/formats/common/offset_byte_queue.cc +++ b/media/formats/common/offset_byte_queue.cc @@ -4,7 +4,6 @@ #include "media/formats/common/offset_byte_queue.h" -#include "base/basictypes.h" #include "base/logging.h" namespace media { diff --git a/media/formats/mp2t/es_adapter_video.cc b/media/formats/mp2t/es_adapter_video.cc index a42b47b6..0208d44 100644 --- a/media/formats/mp2t/es_adapter_video.cc +++ b/media/formats/mp2t/es_adapter_video.cc @@ -5,7 +5,6 @@ #include "media/formats/mp2t/es_adapter_video.h" #include "media/base/buffers.h" -#include "media/base/stream_parser_buffer.h" #include "media/base/video_decoder_config.h" #include "media/formats/mp2t/mp2t_common.h" diff --git a/media/formats/mp2t/es_parser_adts.cc b/media/formats/mp2t/es_parser_adts.cc index 6bae0c7..d646d0e 100644 --- a/media/formats/mp2t/es_parser_adts.cc +++ b/media/formats/mp2t/es_parser_adts.cc @@ -4,7 +4,6 @@ #include "media/formats/mp2t/es_parser_adts.h" -#include #include "base/basictypes.h" #include "base/logging.h" diff --git a/media/formats/mp2t/es_parser_h264.cc b/media/formats/mp2t/es_parser_h264.cc index 8a50950..830da34 100644 --- a/media/formats/mp2t/es_parser_h264.cc +++ b/media/formats/mp2t/es_parser_h264.cc @@ -4,7 +4,6 @@ #include "media/formats/mp2t/es_parser_h264.h" -#include "base/basictypes.h" #include "base/logging.h" #include "base/numerics/safe_conversions.h" #include "media/base/buffers.h" @@ -12,7 +11,6 @@ #include "media/base/video_frame.h" #include "media/filters/h264_parser.h" #include "media/formats/common/offset_byte_queue.h" -#include "media/formats/mp2t/es_adapter_video.h" #include "media/formats/mp2t/mp2t_common.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/size.h" diff --git a/media/formats/mp2t/es_parser_mpeg1audio.cc b/media/formats/mp2t/es_parser_mpeg1audio.cc index c092ccb..5117614 100644 --- a/media/formats/mp2t/es_parser_mpeg1audio.cc +++ b/media/formats/mp2t/es_parser_mpeg1audio.cc @@ -4,7 +4,6 @@ #include "media/formats/mp2t/es_parser_mpeg1audio.h" -#include #include "base/basictypes.h" #include "base/bind.h" diff --git a/media/formats/mp2t/mp2t_stream_parser.cc b/media/formats/mp2t/mp2t_stream_parser.cc index 562fbbe..4d2e2d4 100644 --- a/media/formats/mp2t/mp2t_stream_parser.cc +++ b/media/formats/mp2t/mp2t_stream_parser.cc @@ -6,13 +6,10 @@ #include "base/bind.h" #include "base/callback_helpers.h" -#include "base/memory/scoped_ptr.h" #include "base/stl_util.h" -#include "media/base/audio_decoder_config.h" #include "media/base/buffers.h" #include "media/base/stream_parser_buffer.h" #include "media/base/text_track_config.h" -#include "media/base/video_decoder_config.h" #include "media/formats/mp2t/es_parser.h" #include "media/formats/mp2t/es_parser_adts.h" #include "media/formats/mp2t/es_parser_h264.h" diff --git a/media/formats/mp4/aac.cc b/media/formats/mp4/aac.cc index fa5938b..163f24b 100644 --- a/media/formats/mp4/aac.cc +++ b/media/formats/mp4/aac.cc @@ -8,7 +8,6 @@ #include "base/logging.h" #include "media/base/bit_reader.h" -#include "media/base/media_log.h" #include "media/formats/mp4/rcheck.h" #include "media/formats/mpeg/adts_constants.h" diff --git a/media/formats/mp4/avc.cc b/media/formats/mp4/avc.cc index 33fce1d..0368d1b 100644 --- a/media/formats/mp4/avc.cc +++ b/media/formats/mp4/avc.cc @@ -5,7 +5,6 @@ #include "media/formats/mp4/avc.h" #include -#include #include "base/logging.h" #include "media/base/decrypt_config.h" diff --git a/media/formats/mp4/box_reader.cc b/media/formats/mp4/box_reader.cc index 925859d..edebddd 100644 --- a/media/formats/mp4/box_reader.cc +++ b/media/formats/mp4/box_reader.cc @@ -6,13 +6,10 @@ #include #include -#include #include -#include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "media/formats/mp4/box_definitions.h" -#include "media/formats/mp4/rcheck.h" namespace media { namespace mp4 { diff --git a/media/formats/mp4/mp4_stream_parser.cc b/media/formats/mp4/mp4_stream_parser.cc index e48b582..5c2fcb9 100644 --- a/media/formats/mp4/mp4_stream_parser.cc +++ b/media/formats/mp4/mp4_stream_parser.cc @@ -4,7 +4,6 @@ #include "media/formats/mp4/mp4_stream_parser.h" -#include "base/callback.h" #include "base/callback_helpers.h" #include "base/logging.h" #include "base/time/time.h" diff --git a/media/midi/midi_manager_alsa.cc b/media/midi/midi_manager_alsa.cc index de633e6..3023b25 100644 --- a/media/midi/midi_manager_alsa.cc +++ b/media/midi/midi_manager_alsa.cc @@ -4,7 +4,6 @@ #include "media/midi/midi_manager_alsa.h" -#include #include #include #include @@ -13,16 +12,12 @@ #include "base/bind.h" #include "base/json/json_string_value_serializer.h" #include "base/logging.h" -#include "base/memory/scoped_ptr.h" -#include "base/memory/scoped_vector.h" #include "base/message_loop/message_loop.h" #include "base/posix/eintr_wrapper.h" #include "base/safe_strerror_posix.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" -#include "base/threading/thread.h" #include "base/time/time.h" -#include "base/values.h" #include "crypto/sha2.h" #include "media/midi/midi_port_info.h" diff --git a/media/midi/midi_manager_mac.cc b/media/midi/midi_manager_mac.cc index 1a5f426..1b4c696 100644 --- a/media/midi/midi_manager_mac.cc +++ b/media/midi/midi_manager_mac.cc @@ -5,7 +5,6 @@ #include "media/midi/midi_manager_mac.h" #include -#include #include "base/bind.h" #include "base/message_loop/message_loop.h" diff --git a/media/midi/midi_manager_usb.cc b/media/midi/midi_manager_usb.cc index 19d389e..3e096d2 100644 --- a/media/midi/midi_manager_usb.cc +++ b/media/midi/midi_manager_usb.cc @@ -4,17 +4,11 @@ #include "media/midi/midi_manager_usb.h" -#include "base/callback.h" #include "base/logging.h" -#include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/strings/stringprintf.h" #include "media/midi/midi_scheduler.h" #include "media/midi/usb_midi_descriptor_parser.h" -#include "media/midi/usb_midi_device.h" -#include "media/midi/usb_midi_input_stream.h" -#include "media/midi/usb_midi_jack.h" -#include "media/midi/usb_midi_output_stream.h" namespace media { namespace midi { diff --git a/media/midi/midi_manager_win.cc b/media/midi/midi_manager_win.cc index 6bb0ae6..5c81386 100644 --- a/media/midi/midi_manager_win.cc +++ b/media/midi/midi_manager_win.cc @@ -25,10 +25,8 @@ #include #include -#include "base/basictypes.h" #include "base/bind.h" #include "base/containers/hash_tables.h" -#include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/strings/string16.h" #include "base/strings/string_number_conversions.h" @@ -36,12 +34,10 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/system_monitor/system_monitor.h" -#include "base/threading/thread.h" #include "base/threading/thread_checker.h" #include "base/timer/timer.h" #include "base/win/message_window.h" #include "device/usb/usb_ids.h" -#include "media/midi/midi_manager.h" #include "media/midi/midi_message_queue.h" #include "media/midi/midi_message_util.h" #include "media/midi/midi_port_info.h" diff --git a/media/midi/usb_midi_device_android.cc b/media/midi/usb_midi_device_android.cc index aa47cbe..7778519 100644 --- a/media/midi/usb_midi_device_android.cc +++ b/media/midi/usb_midi_device_android.cc @@ -4,8 +4,6 @@ #include "media/midi/usb_midi_device_android.h" -#include -#include #include "base/android/jni_array.h" #include "base/i18n/icu_string_conversions.h" diff --git a/media/midi/usb_midi_device_factory_android.cc b/media/midi/usb_midi_device_factory_android.cc index 5f46181..636316c 100644 --- a/media/midi/usb_midi_device_factory_android.cc +++ b/media/midi/usb_midi_device_factory_android.cc @@ -4,14 +4,10 @@ #include "media/midi/usb_midi_device_factory_android.h" -#include -#include -#include "base/android/scoped_java_ref.h" #include "base/bind.h" #include "base/containers/hash_tables.h" #include "base/lazy_instance.h" -#include "base/memory/scoped_vector.h" #include "base/message_loop/message_loop.h" #include "base/synchronization/lock.h" #include "jni/UsbMidiDeviceFactoryAndroid_jni.h" diff --git a/media/midi/usb_midi_input_stream.cc b/media/midi/usb_midi_input_stream.cc index c21374b..10f7146 100644 --- a/media/midi/usb_midi_input_stream.cc +++ b/media/midi/usb_midi_input_stream.cc @@ -5,12 +5,9 @@ #include "media/midi/usb_midi_input_stream.h" #include -#include -#include #include "base/logging.h" #include "media/midi/usb_midi_device.h" -#include "media/midi/usb_midi_jack.h" namespace media { namespace midi { diff --git a/media/mojo/services/media_type_converters.cc b/media/mojo/services/media_type_converters.cc index ea37714..c0f00ad 100644 --- a/media/mojo/services/media_type_converters.cc +++ b/media/mojo/services/media_type_converters.cc @@ -12,7 +12,6 @@ #include "media/base/demuxer_stream.h" #include "media/base/media_keys.h" #include "media/base/video_decoder_config.h" -#include "media/mojo/interfaces/content_decryption_module.mojom.h" #include "media/mojo/interfaces/demuxer_stream.mojom.h" #include "mojo/converters/geometry/geometry_type_converters.h" diff --git a/media/mojo/services/mojo_demuxer_stream_impl.cc b/media/mojo/services/mojo_demuxer_stream_impl.cc index 3f5d992..0f91c93 100644 --- a/media/mojo/services/mojo_demuxer_stream_impl.cc +++ b/media/mojo/services/mojo_demuxer_stream_impl.cc @@ -5,13 +5,10 @@ #include "media/mojo/services/mojo_demuxer_stream_impl.h" #include "base/bind.h" -#include "base/macros.h" #include "media/base/audio_decoder_config.h" #include "media/base/decoder_buffer.h" #include "media/base/video_decoder_config.h" -#include "media/mojo/interfaces/demuxer_stream.mojom.h" #include "media/mojo/services/media_type_converters.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h" #include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h" namespace media { diff --git a/media/mojo/services/mojo_renderer_factory.cc b/media/mojo/services/mojo_renderer_factory.cc index 2833222..b526907 100644 --- a/media/mojo/services/mojo_renderer_factory.cc +++ b/media/mojo/services/mojo_renderer_factory.cc @@ -5,7 +5,6 @@ #include "media/mojo/services/mojo_renderer_factory.h" #include "base/single_thread_task_runner.h" -#include "media/mojo/interfaces/media_renderer.mojom.h" #include "media/mojo/services/mojo_renderer_impl.h" namespace media { diff --git a/media/renderers/video_renderer_impl.cc b/media/renderers/video_renderer_impl.cc index 0e3e28e..59bbe13 100644 --- a/media/renderers/video_renderer_impl.cc +++ b/media/renderers/video_renderer_impl.cc @@ -12,7 +12,6 @@ #include "base/metrics/field_trial.h" #include "base/single_thread_task_runner.h" #include "base/strings/string_util.h" -#include "base/threading/platform_thread.h" #include "base/time/default_tick_clock.h" #include "base/trace_event/trace_event.h" #include "media/base/bind_to_current_loop.h" @@ -20,7 +19,6 @@ #include "media/base/limits.h" #include "media/base/media_switches.h" #include "media/base/pipeline.h" -#include "media/base/video_frame.h" namespace media { diff --git a/media/video/capture/android/video_capture_device_android.cc b/media/video/capture/android/video_capture_device_android.cc index fa54ec5..26d7fb3 100644 --- a/media/video/capture/android/video_capture_device_android.cc +++ b/media/video/capture/android/video_capture_device_android.cc @@ -4,10 +4,8 @@ #include "media/video/capture/android/video_capture_device_android.h" -#include #include "base/android/jni_android.h" -#include "base/android/scoped_java_ref.h" #include "base/strings/string_number_conversions.h" #include "jni/VideoCapture_jni.h" #include "media/video/capture/android/video_capture_device_factory_android.h" diff --git a/media/video/capture/android/video_capture_device_factory_android.cc b/media/video/capture/android/video_capture_device_factory_android.cc index 9516865..1203070 100644 --- a/media/video/capture/android/video_capture_device_factory_android.cc +++ b/media/video/capture/android/video_capture_device_factory_android.cc @@ -5,7 +5,6 @@ #include "media/video/capture/android/video_capture_device_factory_android.h" #include "base/android/jni_string.h" -#include "base/android/scoped_java_ref.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "jni/VideoCaptureFactory_jni.h" diff --git a/media/video/capture/fake_video_capture_device.cc b/media/video/capture/fake_video_capture_device.cc index 3279e54..12a8a30 100644 --- a/media/video/capture/fake_video_capture_device.cc +++ b/media/video/capture/fake_video_capture_device.cc @@ -4,10 +4,8 @@ #include "media/video/capture/fake_video_capture_device.h" -#include #include "base/bind.h" -#include "base/memory/scoped_ptr.h" #include "base/strings/stringprintf.h" #include "media/audio/fake_audio_input_stream.h" #include "media/base/video_frame.h" diff --git a/media/video/capture/file_video_capture_device.cc b/media/video/capture/file_video_capture_device.cc index bdcc66f..5584c0b 100644 --- a/media/video/capture/file_video_capture_device.cc +++ b/media/video/capture/file_video_capture_device.cc @@ -4,10 +4,8 @@ #include "media/video/capture/file_video_capture_device.h" -#include #include "base/bind.h" -#include "base/memory/scoped_ptr.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" #include "media/base/video_capture_types.h" diff --git a/media/video/capture/linux/video_capture_device_linux.cc b/media/video/capture/linux/video_capture_device_linux.cc index 500be2c..5bf6dc6 100644 --- a/media/video/capture/linux/video_capture_device_linux.cc +++ b/media/video/capture/linux/video_capture_device_linux.cc @@ -11,7 +11,6 @@ #endif #include -#include #include "base/bind.h" #include "base/strings/stringprintf.h" -- cgit v1.1