diff options
54 files changed, 69 insertions, 69 deletions
diff --git a/ipc/ipc_channel.cc b/ipc/ipc_channel.cc index 5054fb6..25899a3 100644 --- a/ipc/ipc_channel.cc +++ b/ipc/ipc_channel.cc @@ -9,7 +9,7 @@ #include "base/atomic_sequence_num.h" #include "base/process_util.h" #include "base/rand_util.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #if !defined(OS_NACL) namespace { diff --git a/ipc/ipc_channel_posix.cc b/ipc/ipc_channel_posix.cc index f42ab0e..d637232 100644 --- a/ipc/ipc_channel_posix.cc +++ b/ipc/ipc_channel_posix.cc @@ -32,7 +32,7 @@ #include "base/process_util.h" #include "base/rand_util.h" #include "base/stl_util.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/synchronization/lock.h" #include "ipc/file_descriptor_set_posix.h" #include "ipc/ipc_descriptors.h" diff --git a/ipc/ipc_channel_win.cc b/ipc/ipc_channel_win.cc index 21b1cec..dac7110 100644 --- a/ipc/ipc_channel_win.cc +++ b/ipc/ipc_channel_win.cc @@ -13,7 +13,7 @@ #include "base/pickle.h" #include "base/process_util.h" #include "base/rand_util.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/threading/thread_checker.h" #include "base/win/scoped_handle.h" diff --git a/ipc/ipc_logging.cc b/ipc/ipc_logging.cc index 7c7c961..1397cbd 100644 --- a/ipc/ipc_logging.cc +++ b/ipc/ipc_logging.cc @@ -15,14 +15,14 @@ #include "base/logging.h" #include "base/message_loop.h" #include "base/process_util.h" -#include "base/string_number_conversions.h" -#include "base/string_util.h" +#include "base/strings/string_number_conversions.h" +#include "base/strings/string_util.h" #include "base/threading/thread.h" #include "base/time.h" -#include "ipc/ipc_switches.h" -#include "ipc/ipc_sync_message.h" #include "ipc/ipc_message_utils.h" #include "ipc/ipc_sender.h" +#include "ipc/ipc_switches.h" +#include "ipc/ipc_sync_message.h" #if defined(OS_POSIX) #include <unistd.h> diff --git a/ipc/ipc_message_utils.cc b/ipc/ipc_message_utils.cc index c05d9df..0cdc2b4ef 100644 --- a/ipc/ipc_message_utils.cc +++ b/ipc/ipc_message_utils.cc @@ -8,7 +8,7 @@ #include "base/json/json_writer.h" #include "base/memory/scoped_ptr.h" #include "base/nullable_string16.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/time.h" #include "base/values.h" diff --git a/ipc/ipc_message_utils.h b/ipc/ipc_message_utils.h index c775d8d..ac324e0 100644 --- a/ipc/ipc_message_utils.h +++ b/ipc/ipc_message_utils.h @@ -14,9 +14,9 @@ #include "base/format_macros.h" #include "base/memory/scoped_vector.h" #include "base/platform_file.h" -#include "base/string16.h" -#include "base/stringprintf.h" -#include "base/string_util.h" +#include "base/strings/string16.h" +#include "base/strings/string_util.h" +#include "base/strings/stringprintf.h" #include "base/tuple.h" #include "ipc/ipc_message_start.h" #include "ipc/ipc_param_traits.h" diff --git a/ipc/ipc_perftests.cc b/ipc/ipc_perftests.cc index bd65c47..8b428818 100644 --- a/ipc/ipc_perftests.cc +++ b/ipc/ipc_perftests.cc @@ -12,12 +12,12 @@ #include "base/memory/scoped_ptr.h" #include "base/perftimer.h" #include "base/pickle.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/threading/thread.h" #include "base/time.h" -#include "ipc/ipc_descriptors.h" #include "ipc/ipc_channel.h" #include "ipc/ipc_channel_proxy.h" +#include "ipc/ipc_descriptors.h" #include "ipc/ipc_message_utils.h" #include "ipc/ipc_sender.h" #include "ipc/ipc_test_base.h" diff --git a/ipc/ipc_sync_channel_unittest.cc b/ipc/ipc_sync_channel_unittest.cc index 4fcb073..f71f874 100644 --- a/ipc/ipc_sync_channel_unittest.cc +++ b/ipc/ipc_sync_channel_unittest.cc @@ -14,10 +14,10 @@ #include "base/message_loop.h" #include "base/process_util.h" #include "base/run_loop.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" +#include "base/synchronization/waitable_event.h" #include "base/threading/platform_thread.h" #include "base/threading/thread.h" -#include "base/synchronization/waitable_event.h" #include "ipc/ipc_listener.h" #include "ipc/ipc_message.h" #include "ipc/ipc_sender.h" diff --git a/jingle/notifier/communicator/single_login_attempt.cc b/jingle/notifier/communicator/single_login_attempt.cc index 49fcdee..67268c3 100644 --- a/jingle/notifier/communicator/single_login_attempt.cc +++ b/jingle/notifier/communicator/single_login_attempt.cc @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/logging.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "jingle/notifier/base/const_communicator.h" #include "jingle/notifier/base/gaia_token_pre_xmpp_auth.h" diff --git a/jingle/notifier/listener/notification_defines.cc b/jingle/notifier/listener/notification_defines.cc index 7431ea2..f4f3e40 100644 --- a/jingle/notifier/listener/notification_defines.cc +++ b/jingle/notifier/listener/notification_defines.cc @@ -8,7 +8,7 @@ #include "base/json/string_escape.h" #include "base/logging.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/values.h" namespace notifier { diff --git a/jingle/notifier/listener/notification_defines_unittest.cc b/jingle/notifier/listener/notification_defines_unittest.cc index 85dd889..389f3cc 100644 --- a/jingle/notifier/listener/notification_defines_unittest.cc +++ b/jingle/notifier/listener/notification_defines_unittest.cc @@ -4,7 +4,7 @@ #include <string> -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "jingle/notifier/listener/notification_defines.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/jingle/notifier/listener/push_notifications_send_update_task_unittest.cc b/jingle/notifier/listener/push_notifications_send_update_task_unittest.cc index 3fa424ee..c57bd93 100644 --- a/jingle/notifier/listener/push_notifications_send_update_task_unittest.cc +++ b/jingle/notifier/listener/push_notifications_send_update_task_unittest.cc @@ -6,7 +6,7 @@ #include "base/base64.h" #include "base/memory/scoped_ptr.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "jingle/notifier/listener/xml_element_util.h" #include "talk/xmpp/jid.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/jingle/notifier/listener/push_notifications_subscribe_task_unittest.cc b/jingle/notifier/listener/push_notifications_subscribe_task_unittest.cc index 8c177c9..32522f2 100644 --- a/jingle/notifier/listener/push_notifications_subscribe_task_unittest.cc +++ b/jingle/notifier/listener/push_notifications_subscribe_task_unittest.cc @@ -5,7 +5,7 @@ #include "jingle/notifier/listener/push_notifications_subscribe_task.h" #include "base/memory/scoped_ptr.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "jingle/notifier/listener/xml_element_util.h" #include "talk/xmpp/jid.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/jingle/notifier/listener/xml_element_util.cc b/jingle/notifier/listener/xml_element_util.cc index 653b769..7419a1e 100644 --- a/jingle/notifier/listener/xml_element_util.cc +++ b/jingle/notifier/listener/xml_element_util.cc @@ -7,7 +7,7 @@ #include <sstream> #include <string> -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "talk/xmllite/qname.h" #include "talk/xmllite/xmlconstants.h" #include "talk/xmllite/xmlelement.h" diff --git a/media/audio/audio_manager.h b/media/audio/audio_manager.h index 88845fb..cc5b95c 100644 --- a/media/audio/audio_manager.h +++ b/media/audio/audio_manager.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "media/audio/audio_device_name.h" #include "media/audio/audio_parameters.h" diff --git a/media/audio/audio_parameters_unittest.cc b/media/audio/audio_parameters_unittest.cc index fd42e14..f0d3712 100644 --- a/media/audio/audio_parameters_unittest.cc +++ b/media/audio/audio_parameters_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/basictypes.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "media/audio/audio_parameters.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/media/audio/audio_util.cc b/media/audio/audio_util.cc index 8758fdc..f990e4f 100644 --- a/media/audio/audio_util.cc +++ b/media/audio/audio_util.cc @@ -15,7 +15,7 @@ #include "media/audio/audio_util.h" #include "base/command_line.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "media/base/media_switches.h" diff --git a/media/audio/linux/alsa_output_unittest.cc b/media/audio/linux/alsa_output_unittest.cc index 02cbd42..63422f3 100644 --- a/media/audio/linux/alsa_output_unittest.cc +++ b/media/audio/linux/alsa_output_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/message_loop.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "media/audio/linux/alsa_output.h" #include "media/audio/linux/alsa_wrapper.h" #include "media/audio/linux/audio_manager_linux.h" diff --git a/media/audio/win/audio_manager_win.cc b/media/audio/win/audio_manager_win.cc index b8b5d89..4462f60 100644 --- a/media/audio/win/audio_manager_win.cc +++ b/media/audio/win/audio_manager_win.cc @@ -18,8 +18,8 @@ #include "base/message_loop.h" #include "base/path_service.h" #include "base/process_util.h" -#include "base/string_number_conversions.h" -#include "base/string_util.h" +#include "base/strings/string_number_conversions.h" +#include "base/strings/string_util.h" #include "media/audio/audio_parameters.h" #include "media/audio/audio_util.h" #include "media/audio/win/audio_device_listener_win.h" diff --git a/media/audio/win/core_audio_util_win.cc b/media/audio/win/core_audio_util_win.cc index 0ad773a..38a3d2e 100644 --- a/media/audio/win/core_audio_util_win.cc +++ b/media/audio/win/core_audio_util_win.cc @@ -9,7 +9,7 @@ #include "base/command_line.h" #include "base/logging.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/win/scoped_co_mem.h" #include "base/win/scoped_handle.h" diff --git a/media/base/android/media_codec_bridge.cc b/media/base/android/media_codec_bridge.cc index d64528d..12841a6 100644 --- a/media/base/android/media_codec_bridge.cc +++ b/media/base/android/media_codec_bridge.cc @@ -14,7 +14,7 @@ #include "base/lazy_instance.h" #include "base/logging.h" #include "base/safe_numerics.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "jni/MediaCodecBridge_jni.h" #include "media/base/bit_reader.h" diff --git a/media/base/audio_bus_unittest.cc b/media/base/audio_bus_unittest.cc index a07950d..14f8c36 100644 --- a/media/base/audio_bus_unittest.cc +++ b/media/base/audio_bus_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/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/time.h" #include "build/build_config.h" #include "media/audio/audio_parameters.h" diff --git a/media/base/audio_converter_unittest.cc b/media/base/audio_converter_unittest.cc index f693a6d..ee1b916 100644 --- a/media/base/audio_converter_unittest.cc +++ b/media/base/audio_converter_unittest.cc @@ -11,7 +11,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "media/base/audio_converter.h" #include "media/base/fake_audio_render_callback.h" diff --git a/media/base/audio_hash.cc b/media/base/audio_hash.cc index 7f86a04..0ed6fe5 100644 --- a/media/base/audio_hash.cc +++ b/media/base/audio_hash.cc @@ -8,7 +8,7 @@ #include "media/base/audio_hash.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "media/base/audio_bus.h" namespace media { diff --git a/media/base/audio_pull_fifo_unittest.cc b/media/base/audio_pull_fifo_unittest.cc index b0e7afd..dc90a6d94 100644 --- a/media/base/audio_pull_fifo_unittest.cc +++ b/media/base/audio_pull_fifo_unittest.cc @@ -4,7 +4,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "media/base/audio_bus.h" #include "media/base/audio_pull_fifo.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/media/base/channel_mixer_unittest.cc b/media/base/channel_mixer_unittest.cc index 935d060..eddbc1b 100644 --- a/media/base/channel_mixer_unittest.cc +++ b/media/base/channel_mixer_unittest.cc @@ -7,7 +7,7 @@ #include <cmath> -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "media/audio/audio_parameters.h" #include "media/base/audio_bus.h" #include "media/base/channel_mixer.h" diff --git a/media/base/data_buffer_unittest.cc b/media/base/data_buffer_unittest.cc index ce89136..58cc002 100644 --- a/media/base/data_buffer_unittest.cc +++ b/media/base/data_buffer_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/string_util.h" +#include "base/strings/string_util.h" #include "media/base/data_buffer.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/media/base/decoder_buffer_unittest.cc b/media/base/decoder_buffer_unittest.cc index 3dda67f..42551a4 100644 --- a/media/base/decoder_buffer_unittest.cc +++ b/media/base/decoder_buffer_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/string_util.h" +#include "base/strings/string_util.h" #include "media/base/decoder_buffer.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/media/base/pipeline.cc b/media/base/pipeline.cc index a81adc6..68483fc 100644 --- a/media/base/pipeline.cc +++ b/media/base/pipeline.cc @@ -10,11 +10,11 @@ #include "base/callback.h" #include "base/callback_helpers.h" #include "base/compiler_specific.h" -#include "base/metrics/histogram.h" #include "base/message_loop.h" +#include "base/metrics/histogram.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" -#include "base/string_util.h" +#include "base/strings/string_number_conversions.h" +#include "base/strings/string_util.h" #include "base/synchronization/condition_variable.h" #include "media/base/audio_decoder.h" #include "media/base/audio_renderer.h" diff --git a/media/base/sinc_resampler_unittest.cc b/media/base/sinc_resampler_unittest.cc index 74a73cc..7ffc0c0 100644 --- a/media/base/sinc_resampler_unittest.cc +++ b/media/base/sinc_resampler_unittest.cc @@ -12,7 +12,7 @@ #include "base/command_line.h" #include "base/cpu.h" #include "base/logging.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/strings/stringize_macros.h" #include "base/time.h" #include "build/build_config.h" diff --git a/media/base/vector_math_unittest.cc b/media/base/vector_math_unittest.cc index 9d238f44..563cb6b 100644 --- a/media/base/vector_math_unittest.cc +++ b/media/base/vector_math_unittest.cc @@ -10,7 +10,7 @@ #include "base/cpu.h" #include "base/memory/aligned_memory.h" #include "base/memory/scoped_ptr.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/strings/stringize_macros.h" #include "base/time.h" #include "media/base/vector_math.h" diff --git a/media/base/video_frame_unittest.cc b/media/base/video_frame_unittest.cc index b249fc8..ce4869c 100644 --- a/media/base/video_frame_unittest.cc +++ b/media/base/video_frame_unittest.cc @@ -6,7 +6,7 @@ #include "base/format_macros.h" #include "base/memory/scoped_ptr.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "media/base/buffers.h" #include "media/base/yuv_convert.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/media/crypto/aes_decryptor.cc b/media/crypto/aes_decryptor.cc index 65b736a..360102e 100644 --- a/media/crypto/aes_decryptor.cc +++ b/media/crypto/aes_decryptor.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "crypto/encryptor.h" #include "crypto/symmetric_key.h" #include "media/base/audio_decoder_config.h" diff --git a/media/ffmpeg/ffmpeg_unittest.cc b/media/ffmpeg/ffmpeg_unittest.cc index 15c46eb..6999741 100644 --- a/media/ffmpeg/ffmpeg_unittest.cc +++ b/media/ffmpeg/ffmpeg_unittest.cc @@ -18,7 +18,7 @@ #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/perftimer.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/test/perf_test_suite.h" #include "media/base/media.h" #include "media/ffmpeg/ffmpeg_common.h" diff --git a/media/filters/audio_renderer_impl_unittest.cc b/media/filters/audio_renderer_impl_unittest.cc index cec3441..19a7d14 100644 --- a/media/filters/audio_renderer_impl_unittest.cc +++ b/media/filters/audio_renderer_impl_unittest.cc @@ -8,7 +8,7 @@ #include "base/memory/scoped_vector.h" #include "base/message_loop.h" #include "base/stl_util.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "media/base/audio_timestamp_helper.h" #include "media/base/data_buffer.h" #include "media/base/gmock_callback_support.h" diff --git a/media/filters/ffmpeg_audio_decoder_unittest.cc b/media/filters/ffmpeg_audio_decoder_unittest.cc index f10fa1c..3d5efdf 100644 --- a/media/filters/ffmpeg_audio_decoder_unittest.cc +++ b/media/filters/ffmpeg_audio_decoder_unittest.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/message_loop.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "media/base/data_buffer.h" #include "media/base/decoder_buffer.h" #include "media/base/mock_filters.h" diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc index 207336c..2bae64e 100644 --- a/media/filters/ffmpeg_demuxer.cc +++ b/media/filters/ffmpeg_demuxer.cc @@ -16,7 +16,7 @@ #include "base/message_loop.h" #include "base/metrics/sparse_histogram.h" #include "base/stl_util.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/task_runner_util.h" #include "base/time.h" #include "media/base/audio_decoder_config.h" diff --git a/media/filters/ffmpeg_video_decoder.cc b/media/filters/ffmpeg_video_decoder.cc index 5b83786..14852ff 100644 --- a/media/filters/ffmpeg_video_decoder.cc +++ b/media/filters/ffmpeg_video_decoder.cc @@ -12,7 +12,7 @@ #include "base/command_line.h" #include "base/location.h" #include "base/message_loop/message_loop_proxy.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "media/base/bind_to_loop.h" #include "media/base/decoder_buffer.h" #include "media/base/demuxer_stream.h" diff --git a/media/filters/ffmpeg_video_decoder_unittest.cc b/media/filters/ffmpeg_video_decoder_unittest.cc index b339bd0..98eac3b 100644 --- a/media/filters/ffmpeg_video_decoder_unittest.cc +++ b/media/filters/ffmpeg_video_decoder_unittest.cc @@ -6,9 +6,9 @@ #include "base/bind.h" #include "base/callback_helpers.h" -#include "base/message_loop.h" #include "base/memory/singleton.h" -#include "base/string_util.h" +#include "base/message_loop.h" +#include "base/strings/string_util.h" #include "media/base/decoder_buffer.h" #include "media/base/gmock_callback_support.h" #include "media/base/limits.h" diff --git a/media/filters/pipeline_integration_test.cc b/media/filters/pipeline_integration_test.cc index 2ae0aec..8fea9c5 100644 --- a/media/filters/pipeline_integration_test.cc +++ b/media/filters/pipeline_integration_test.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/memory/scoped_ptr.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "build/build_config.h" #include "media/base/decoder_buffer.h" #include "media/base/media_keys.h" diff --git a/media/filters/source_buffer_stream_unittest.cc b/media/filters/source_buffer_stream_unittest.cc index bce22c8..954538c 100644 --- a/media/filters/source_buffer_stream_unittest.cc +++ b/media/filters/source_buffer_stream_unittest.cc @@ -7,9 +7,9 @@ #include <string> #include "base/logging.h" -#include "base/string_number_conversions.h" -#include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" +#include "base/strings/string_util.h" #include "media/base/data_buffer.h" #include "media/base/media_log.h" #include "media/base/test_helpers.h" diff --git a/media/filters/stream_parser_factory.cc b/media/filters/stream_parser_factory.cc index c01de45..2436ef6 100644 --- a/media/filters/stream_parser_factory.cc +++ b/media/filters/stream_parser_factory.cc @@ -6,8 +6,8 @@ #include "base/command_line.h" #include "base/metrics/histogram.h" -#include "base/string_number_conversions.h" -#include "base/string_util.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/webm/webm_stream_parser.h" diff --git a/media/filters/video_renderer_base_unittest.cc b/media/filters/video_renderer_base_unittest.cc index a1f1da7..c108fc2 100644 --- a/media/filters/video_renderer_base_unittest.cc +++ b/media/filters/video_renderer_base_unittest.cc @@ -8,7 +8,7 @@ #include "base/debug/stack_trace.h" #include "base/message_loop.h" #include "base/stl_util.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/synchronization/lock.h" #include "base/timer.h" #include "media/base/data_buffer.h" diff --git a/media/filters/vpx_video_decoder.cc b/media/filters/vpx_video_decoder.cc index acdcb14..8f88d84 100644 --- a/media/filters/vpx_video_decoder.cc +++ b/media/filters/vpx_video_decoder.cc @@ -10,7 +10,7 @@ #include "base/location.h" #include "base/logging.h" #include "base/message_loop/message_loop_proxy.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/sys_byteorder.h" #include "media/base/bind_to_loop.h" #include "media/base/decoder_buffer.h" diff --git a/media/test/ffmpeg_tests/ffmpeg_tests.cc b/media/test/ffmpeg_tests/ffmpeg_tests.cc index fe3b628..cb51dce 100644 --- a/media/test/ffmpeg_tests/ffmpeg_tests.cc +++ b/media/test/ffmpeg_tests/ffmpeg_tests.cc @@ -19,7 +19,7 @@ #include "base/logging.h" #include "base/md5.h" #include "base/path_service.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/time.h" #include "media/base/djb2.h" diff --git a/media/tools/demuxer_bench/demuxer_bench.cc b/media/tools/demuxer_bench/demuxer_bench.cc index d997eaa..d22f851 100644 --- a/media/tools/demuxer_bench/demuxer_bench.cc +++ b/media/tools/demuxer_bench/demuxer_bench.cc @@ -13,7 +13,7 @@ #include "base/command_line.h" #include "base/logging.h" #include "base/message_loop.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "media/base/media.h" #include "media/filters/ffmpeg_demuxer.h" #include "media/filters/file_data_source.h" diff --git a/media/tools/media_bench/media_bench.cc b/media/tools/media_bench/media_bench.cc index 6ea1ff6..6c790c8 100644 --- a/media/tools/media_bench/media_bench.cc +++ b/media/tools/media_bench/media_bench.cc @@ -20,8 +20,8 @@ #include "base/logging.h" #include "base/md5.h" #include "base/path_service.h" -#include "base/string_number_conversions.h" -#include "base/string_util.h" +#include "base/strings/string_number_conversions.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/time.h" #include "build/build_config.h" diff --git a/media/tools/seek_tester/seek_tester.cc b/media/tools/seek_tester/seek_tester.cc index 505226c..57b2150 100644 --- a/media/tools/seek_tester/seek_tester.cc +++ b/media/tools/seek_tester/seek_tester.cc @@ -18,7 +18,7 @@ #include "base/files/file_path.h" #include "base/logging.h" #include "base/message_loop.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "media/base/media.h" #include "media/filters/ffmpeg_demuxer.h" #include "media/filters/file_data_source.h" diff --git a/media/tools/shader_bench/shader_bench.cc b/media/tools/shader_bench/shader_bench.cc index 897e588..813f6eb 100644 --- a/media/tools/shader_bench/shader_bench.cc +++ b/media/tools/shader_bench/shader_bench.cc @@ -11,7 +11,7 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/memory/scoped_ptr.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "media/base/video_frame.h" #include "media/tools/shader_bench/cpu_color_painter.h" diff --git a/media/video/capture/android/video_capture_device_android.cc b/media/video/capture/android/video_capture_device_android.cc index d1f6c06..1dbcb1e 100644 --- a/media/video/capture/android/video_capture_device_android.cc +++ b/media/video/capture/android/video_capture_device_android.cc @@ -9,8 +9,8 @@ #include "base/android/jni_android.h" #include "base/android/jni_string.h" #include "base/android/scoped_java_ref.h" -#include "base/string_number_conversions.h" -#include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" +#include "base/strings/stringprintf.h" #include "jni/VideoCapture_jni.h" #include "media/base/video_util.h" diff --git a/media/video/capture/fake_video_capture_device.cc b/media/video/capture/fake_video_capture_device.cc index addd172..34f8f20 100644 --- a/media/video/capture/fake_video_capture_device.cc +++ b/media/video/capture/fake_video_capture_device.cc @@ -8,7 +8,7 @@ #include "base/bind.h" #include "base/memory/scoped_ptr.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "media/audio/fake_audio_input_stream.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkCanvas.h" diff --git a/media/video/capture/linux/video_capture_device_linux.cc b/media/video/capture/linux/video_capture_device_linux.cc index 6b7564b..66f0ed7 100644 --- a/media/video/capture/linux/video_capture_device_linux.cc +++ b/media/video/capture/linux/video_capture_device_linux.cc @@ -20,7 +20,7 @@ #include "base/bind.h" #include "base/file_util.h" #include "base/files/file_enumerator.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" namespace media { diff --git a/media/video/capture/win/video_capture_device_win.cc b/media/video/capture/win/video_capture_device_win.cc index 30c9917..bd0446c 100644 --- a/media/video/capture/win/video_capture_device_win.cc +++ b/media/video/capture/win/video_capture_device_win.cc @@ -7,7 +7,7 @@ #include <algorithm> #include <list> -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/strings/sys_string_conversions.h" #include "base/win/scoped_variant.h" #include "media/video/capture/win/video_capture_device_mf_win.h" diff --git a/media/webm/webm_tracks_parser.cc b/media/webm/webm_tracks_parser.cc index 4cf6f4a..93d0036 100644 --- a/media/webm/webm_tracks_parser.cc +++ b/media/webm/webm_tracks_parser.cc @@ -5,7 +5,7 @@ #include "media/webm/webm_tracks_parser.h" #include "base/logging.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "media/base/buffers.h" #include "media/webm/webm_constants.h" #include "media/webm/webm_content_encodings.h" |