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

12 files changed, 14 insertions, 14 deletions

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"