diff options
Diffstat (limited to 'media/base')
32 files changed, 34 insertions, 34 deletions
diff --git a/media/base/android/media_codec_bridge.h b/media/base/android/media_codec_bridge.h index be8d809..c13634d 100644 --- a/media/base/android/media_codec_bridge.h +++ b/media/base/android/media_codec_bridge.h @@ -9,7 +9,7 @@ #include <string> #include "base/android/scoped_java_ref.h" -#include "base/time.h" +#include "base/time/time.h" #include "media/base/audio_decoder_config.h" #include "media/base/video_decoder_config.h" #include "ui/gfx/size.h" diff --git a/media/base/android/media_player_android.h b/media/base/android/media_player_android.h index 0b31ea2..6c108973 100644 --- a/media/base/android/media_player_android.h +++ b/media/base/android/media_player_android.h @@ -9,7 +9,7 @@ #include <string> #include "base/callback.h" -#include "base/time.h" +#include "base/time/time.h" #include "googleurl/src/gurl.h" #include "media/base/android/demuxer_stream_player_params.h" #include "media/base/media_export.h" diff --git a/media/base/android/media_player_bridge.h b/media/base/android/media_player_bridge.h index e21e075..8df0b03 100644 --- a/media/base/android/media_player_bridge.h +++ b/media/base/android/media_player_bridge.h @@ -13,8 +13,8 @@ #include "base/callback.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/time.h" -#include "base/timer.h" +#include "base/time/time.h" +#include "base/timer/timer.h" #include "googleurl/src/gurl.h" #include "media/base/android/media_player_android.h" #include "media/base/android/media_player_listener.h" diff --git a/media/base/android/media_player_manager.h b/media/base/android/media_player_manager.h index 9baa514..145225b 100644 --- a/media/base/android/media_player_manager.h +++ b/media/base/android/media_player_manager.h @@ -5,7 +5,7 @@ #ifndef MEDIA_BASE_ANDROID_MEDIA_PLAYER_MANAGER_H_ #define MEDIA_BASE_ANDROID_MEDIA_PLAYER_MANAGER_H_ -#include "base/time.h" +#include "base/time/time.h" #include "media/base/android/demuxer_stream_player_params.h" #include "media/base/media_export.h" #include "media/base/media_keys.h" diff --git a/media/base/android/media_resource_getter.h b/media/base/android/media_resource_getter.h index abeee36..5389e6b 100644 --- a/media/base/android/media_resource_getter.h +++ b/media/base/android/media_resource_getter.h @@ -9,7 +9,7 @@ #include "base/callback.h" #include "base/files/file_path.h" -#include "base/time.h" +#include "base/time/time.h" #include "googleurl/src/gurl.h" #include "media/base/media_export.h" diff --git a/media/base/android/media_source_player.h b/media/base/android/media_source_player.h index 177bdc1f..5448e109 100644 --- a/media/base/android/media_source_player.h +++ b/media/base/android/media_source_player.h @@ -15,7 +15,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread.h" -#include "base/time.h" +#include "base/time/time.h" #include "media/base/android/demuxer_stream_player_params.h" #include "media/base/android/media_codec_bridge.h" #include "media/base/android/media_player_android.h" diff --git a/media/base/audio_buffer.h b/media/base/audio_buffer.h index f0ca772..b0a2ce7 100644 --- a/media/base/audio_buffer.h +++ b/media/base/audio_buffer.h @@ -10,7 +10,7 @@ #include "base/memory/aligned_memory.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/time.h" +#include "base/time/time.h" #include "media/base/media_export.h" #include "media/base/sample_format.h" diff --git a/media/base/audio_buffer_queue_unittest.cc b/media/base/audio_buffer_queue_unittest.cc index c898c28..005c5ce 100644 --- a/media/base/audio_buffer_queue_unittest.cc +++ b/media/base/audio_buffer_queue_unittest.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/strings/stringprintf.h" -#include "base/time.h" +#include "base/time/time.h" #include "media/base/audio_buffer.h" #include "media/base/audio_buffer_queue.h" #include "media/base/audio_bus.h" diff --git a/media/base/audio_bus_unittest.cc b/media/base/audio_bus_unittest.cc index 14f8c36..a82090b 100644 --- a/media/base/audio_bus_unittest.cc +++ b/media/base/audio_bus_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/strings/stringprintf.h" -#include "base/time.h" +#include "base/time/time.h" #include "build/build_config.h" #include "media/audio/audio_parameters.h" #include "media/base/audio_bus.h" diff --git a/media/base/audio_converter.h b/media/base/audio_converter.h index a1f9016..2e43ec8 100644 --- a/media/base/audio_converter.h +++ b/media/base/audio_converter.h @@ -22,7 +22,7 @@ #include "base/callback.h" #include "base/memory/scoped_ptr.h" -#include "base/time.h" +#include "base/time/time.h" #include "media/audio/audio_parameters.h" #include "media/base/media_export.h" diff --git a/media/base/audio_converter_unittest.cc b/media/base/audio_converter_unittest.cc index ee1b916..d218ac8 100644 --- a/media/base/audio_converter_unittest.cc +++ b/media/base/audio_converter_unittest.cc @@ -12,7 +12,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/strings/string_number_conversions.h" -#include "base/time.h" +#include "base/time/time.h" #include "media/base/audio_converter.h" #include "media/base/fake_audio_render_callback.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/media/base/audio_renderer.h b/media/base/audio_renderer.h index 14bf7c5..bcc06b1 100644 --- a/media/base/audio_renderer.h +++ b/media/base/audio_renderer.h @@ -7,7 +7,7 @@ #include "base/callback.h" #include "base/memory/ref_counted.h" -#include "base/time.h" +#include "base/time/time.h" #include "media/base/media_export.h" #include "media/base/pipeline_status.h" diff --git a/media/base/audio_renderer_mixer.h b/media/base/audio_renderer_mixer.h index 943d779..942c61f 100644 --- a/media/base/audio_renderer_mixer.h +++ b/media/base/audio_renderer_mixer.h @@ -8,7 +8,7 @@ #include <map> #include "base/synchronization/lock.h" -#include "base/time.h" +#include "base/time/time.h" #include "media/base/audio_converter.h" #include "media/base/audio_renderer_sink.h" diff --git a/media/base/audio_timestamp_helper.h b/media/base/audio_timestamp_helper.h index 4b38be7..db56523 100644 --- a/media/base/audio_timestamp_helper.h +++ b/media/base/audio_timestamp_helper.h @@ -5,7 +5,7 @@ #ifndef MEDIA_BASE_AUDIO_TIMESTAMP_HELPER_H_ #define MEDIA_BASE_AUDIO_TIMESTAMP_HELPER_H_ -#include "base/time.h" +#include "base/time/time.h" #include "media/base/media_export.h" namespace media { diff --git a/media/base/buffers.h b/media/base/buffers.h index 7eecd5b..6a6c730 100644 --- a/media/base/buffers.h +++ b/media/base/buffers.h @@ -23,7 +23,7 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" -#include "base/time.h" +#include "base/time/time.h" #include "media/base/media_export.h" namespace media { diff --git a/media/base/clock.h b/media/base/clock.h index 6a86106..01449be 100644 --- a/media/base/clock.h +++ b/media/base/clock.h @@ -6,7 +6,7 @@ #define MEDIA_BASE_CLOCK_H_ #include "base/basictypes.h" -#include "base/time.h" +#include "base/time/time.h" #include "media/base/media_export.h" namespace base { diff --git a/media/base/data_buffer.h b/media/base/data_buffer.h index fe296c3..2e88faf 100644 --- a/media/base/data_buffer.h +++ b/media/base/data_buffer.h @@ -8,7 +8,7 @@ #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/time.h" +#include "base/time/time.h" #include "media/base/media_export.h" namespace media { diff --git a/media/base/data_source.h b/media/base/data_source.h index 7691b9c..def1d01 100644 --- a/media/base/data_source.h +++ b/media/base/data_source.h @@ -6,7 +6,7 @@ #define MEDIA_BASE_DATA_SOURCE_H_ #include "base/callback.h" -#include "base/time.h" +#include "base/time/time.h" #include "media/base/media_export.h" namespace media { diff --git a/media/base/decoder_buffer.h b/media/base/decoder_buffer.h index d1c20dd..22c0544 100644 --- a/media/base/decoder_buffer.h +++ b/media/base/decoder_buffer.h @@ -10,7 +10,7 @@ #include "base/memory/aligned_memory.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/time.h" +#include "base/time/time.h" #include "build/build_config.h" #include "media/base/media_export.h" diff --git a/media/base/decoder_buffer_queue.h b/media/base/decoder_buffer_queue.h index f75046c..938db63 100644 --- a/media/base/decoder_buffer_queue.h +++ b/media/base/decoder_buffer_queue.h @@ -8,7 +8,7 @@ #include <deque> #include "base/memory/ref_counted.h" -#include "base/time.h" +#include "base/time/time.h" #include "media/base/media_export.h" namespace media { diff --git a/media/base/demuxer.h b/media/base/demuxer.h index 02c5f31..6a91aab 100644 --- a/media/base/demuxer.h +++ b/media/base/demuxer.h @@ -5,7 +5,7 @@ #ifndef MEDIA_BASE_DEMUXER_H_ #define MEDIA_BASE_DEMUXER_H_ -#include "base/time.h" +#include "base/time/time.h" #include "media/base/data_source.h" #include "media/base/demuxer_stream.h" #include "media/base/media_export.h" diff --git a/media/base/media_log_event.h b/media/base/media_log_event.h index a6109e5..142626b 100644 --- a/media/base/media_log_event.h +++ b/media/base/media_log_event.h @@ -5,7 +5,7 @@ #ifndef MEDIA_BASE_MEDIA_LOG_EVENT_H_ #define MEDIA_BASE_MEDIA_LOG_EVENT_H_ -#include "base/time.h" +#include "base/time/time.h" #include "base/values.h" namespace media { diff --git a/media/base/ranges.h b/media/base/ranges.h index 9b738a9..917f30e 100644 --- a/media/base/ranges.h +++ b/media/base/ranges.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/logging.h" -#include "base/time.h" +#include "base/time/time.h" #include "media/base/media_export.h" namespace media { diff --git a/media/base/scoped_histogram_timer.h b/media/base/scoped_histogram_timer.h index 39daa56..a7f69b0 100644 --- a/media/base/scoped_histogram_timer.h +++ b/media/base/scoped_histogram_timer.h @@ -6,7 +6,7 @@ #define MEDIA_BASE_SCOPED_HISTOGRAM_TIMER_H_ #include "base/metrics/histogram.h" -#include "base/time.h" +#include "base/time/time.h" // Scoped class which logs its time on this earth as a UMA statistic. Must be // a #define macro since UMA macros prevent variables as names. The nested diff --git a/media/base/scoped_histogram_timer_unittest.cc b/media/base/scoped_histogram_timer_unittest.cc index 191a577..b8893f9 100644 --- a/media/base/scoped_histogram_timer_unittest.cc +++ b/media/base/scoped_histogram_timer_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/time.h" +#include "base/time/time.h" #include "media/base/scoped_histogram_timer.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/media/base/seekable_buffer_unittest.cc b/media/base/seekable_buffer_unittest.cc index 375ca6d..c5e3fb6 100644 --- a/media/base/seekable_buffer_unittest.cc +++ b/media/base/seekable_buffer_unittest.cc @@ -4,7 +4,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/time.h" +#include "base/time/time.h" #include "media/base/data_buffer.h" #include "media/base/seekable_buffer.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/media/base/sinc_resampler_unittest.cc b/media/base/sinc_resampler_unittest.cc index 7ffc0c0..8b89a5d 100644 --- a/media/base/sinc_resampler_unittest.cc +++ b/media/base/sinc_resampler_unittest.cc @@ -14,7 +14,7 @@ #include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringize_macros.h" -#include "base/time.h" +#include "base/time/time.h" #include "build/build_config.h" #include "media/base/sinc_resampler.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/media/base/stream_parser.h b/media/base/stream_parser.h index c006471a..a423f20 100644 --- a/media/base/stream_parser.h +++ b/media/base/stream_parser.h @@ -11,7 +11,7 @@ #include "base/callback_forward.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/time.h" +#include "base/time/time.h" #include "media/base/media_export.h" #include "media/base/media_log.h" #include "media/base/text_track.h" diff --git a/media/base/test_helpers.cc b/media/base/test_helpers.cc index 368774b..54850f9 100644 --- a/media/base/test_helpers.cc +++ b/media/base/test_helpers.cc @@ -8,8 +8,8 @@ #include "base/logging.h" #include "base/message_loop.h" #include "base/test/test_timeouts.h" -#include "base/time.h" -#include "base/timer.h" +#include "base/time/time.h" +#include "base/timer/timer.h" #include "media/base/audio_buffer.h" #include "media/base/bind_to_loop.h" #include "ui/gfx/rect.h" diff --git a/media/base/text_track.h b/media/base/text_track.h index b249e54..01a2ed7 100644 --- a/media/base/text_track.h +++ b/media/base/text_track.h @@ -9,7 +9,7 @@ #include "base/callback.h" #include "base/memory/scoped_ptr.h" -#include "base/time.h" +#include "base/time/time.h" namespace media { diff --git a/media/base/vector_math_unittest.cc b/media/base/vector_math_unittest.cc index 563cb6b..2c77401 100644 --- a/media/base/vector_math_unittest.cc +++ b/media/base/vector_math_unittest.cc @@ -12,7 +12,7 @@ #include "base/memory/scoped_ptr.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringize_macros.h" -#include "base/time.h" +#include "base/time/time.h" #include "media/base/vector_math.h" #include "media/base/vector_math_testing.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/media/base/video_renderer.h b/media/base/video_renderer.h index 7caa612..84ce6cfa 100644 --- a/media/base/video_renderer.h +++ b/media/base/video_renderer.h @@ -7,7 +7,7 @@ #include "base/callback.h" #include "base/memory/ref_counted.h" -#include "base/time.h" +#include "base/time/time.h" #include "media/base/media_export.h" #include "media/base/pipeline_status.h" |