summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-11 06:32:18 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-11 06:32:18 +0000
commit4aa794a1fee9d6939225363c3713be22029c7148 (patch)
tree01bc06b06640129a2c1200d4ac2211e4b0f54796 /media
parent348fbaac3221020d0087ab1cc24dc4ba045ea219 (diff)
downloadchromium_src-4aa794a1fee9d6939225363c3713be22029c7148.zip
chromium_src-4aa794a1fee9d6939225363c3713be22029c7148.tar.gz
chromium_src-4aa794a1fee9d6939225363c3713be22029c7148.tar.bz2
Use a direct include of strings headers in ipc/, jingle/, media/.
BUG=247723 TEST=none TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/16684003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205436 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/audio/audio_manager.h2
-rw-r--r--media/audio/audio_parameters_unittest.cc2
-rw-r--r--media/audio/audio_util.cc2
-rw-r--r--media/audio/linux/alsa_output_unittest.cc2
-rw-r--r--media/audio/win/audio_manager_win.cc4
-rw-r--r--media/audio/win/core_audio_util_win.cc2
-rw-r--r--media/base/android/media_codec_bridge.cc2
-rw-r--r--media/base/audio_bus_unittest.cc2
-rw-r--r--media/base/audio_converter_unittest.cc2
-rw-r--r--media/base/audio_hash.cc2
-rw-r--r--media/base/audio_pull_fifo_unittest.cc2
-rw-r--r--media/base/channel_mixer_unittest.cc2
-rw-r--r--media/base/data_buffer_unittest.cc2
-rw-r--r--media/base/decoder_buffer_unittest.cc2
-rw-r--r--media/base/pipeline.cc6
-rw-r--r--media/base/sinc_resampler_unittest.cc2
-rw-r--r--media/base/vector_math_unittest.cc2
-rw-r--r--media/base/video_frame_unittest.cc2
-rw-r--r--media/crypto/aes_decryptor.cc2
-rw-r--r--media/ffmpeg/ffmpeg_unittest.cc2
-rw-r--r--media/filters/audio_renderer_impl_unittest.cc2
-rw-r--r--media/filters/ffmpeg_audio_decoder_unittest.cc2
-rw-r--r--media/filters/ffmpeg_demuxer.cc2
-rw-r--r--media/filters/ffmpeg_video_decoder.cc2
-rw-r--r--media/filters/ffmpeg_video_decoder_unittest.cc4
-rw-r--r--media/filters/pipeline_integration_test.cc2
-rw-r--r--media/filters/source_buffer_stream_unittest.cc4
-rw-r--r--media/filters/stream_parser_factory.cc4
-rw-r--r--media/filters/video_renderer_base_unittest.cc2
-rw-r--r--media/filters/vpx_video_decoder.cc2
-rw-r--r--media/test/ffmpeg_tests/ffmpeg_tests.cc2
-rw-r--r--media/tools/demuxer_bench/demuxer_bench.cc2
-rw-r--r--media/tools/media_bench/media_bench.cc4
-rw-r--r--media/tools/seek_tester/seek_tester.cc2
-rw-r--r--media/tools/shader_bench/shader_bench.cc2
-rw-r--r--media/video/capture/android/video_capture_device_android.cc4
-rw-r--r--media/video/capture/fake_video_capture_device.cc2
-rw-r--r--media/video/capture/linux/video_capture_device_linux.cc2
-rw-r--r--media/video/capture/win/video_capture_device_win.cc2
-rw-r--r--media/webm/webm_tracks_parser.cc2
40 files changed, 48 insertions, 48 deletions
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"