Use a direct include of strings headers in content/common/.

BUG=247723
TEST=none
TBR=ben@chromium.org

Review URL: https://chromiumcodereview.appspot.com/16389004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205818 0039d316-1c4b-4281-b951-d872f2087c98

33 files changed, 39 insertions, 39 deletions

diff --git a/content/common/accessibility_node_data.cc b/content/common/accessibility_node_data.cc
index ae66f3c..6848dea 100644
--- a/content/common/accessibility_node_data.cc
+++ b/content/common/accessibility_node_data.cc
@@ -7,8 +7,8 @@
 #include <set>
 
 #include "base/containers/hash_tables.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"
 
 using base::DoubleToString;
diff --git a/content/common/accessibility_node_data.h b/content/common/accessibility_node_data.h
index 6b9f8cd..e4a206f 100644
--- a/content/common/accessibility_node_data.h
+++ b/content/common/accessibility_node_data.h
@@ -9,7 +9,7 @@
 #include <string>
 #include <vector>
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "content/common/content_export.h"
 #include "ui/gfx/rect.h"
 
diff --git a/content/common/android/address_parser.cc b/content/common/android/address_parser.cc
index 48c9400..ea1aa47 100644
--- a/content/common/android/address_parser.cc
+++ b/content/common/android/address_parser.cc
@@ -5,7 +5,7 @@
 #include "content/common/android/address_parser.h"
 
 #include "base/logging.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "content/common/android/address_parser_internal.h"
 
 namespace {
diff --git a/content/common/android/address_parser.h b/content/common/android/address_parser.h
index bacb871..71a3aba 100644
--- a/content/common/android/address_parser.h
+++ b/content/common/android/address_parser.h
@@ -5,7 +5,7 @@
 #ifndef CONTENT_COMMON_ADDRESS_PARSER_H_
 #define CONTENT_COMMON_ADDRESS_PARSER_H_
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "content/common/content_export.h"
 
 namespace content {
diff --git a/content/common/android/address_parser_internal.cc b/content/common/android/address_parser_internal.cc
index ff67ae2..0970b17 100644
--- a/content/common/android/address_parser_internal.cc
+++ b/content/common/android/address_parser_internal.cc
@@ -7,7 +7,7 @@
 #include <bitset>
 
 #include "base/logging.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 
 namespace {
 
diff --git a/content/common/android/address_parser_unittest.cc b/content/common/android/address_parser_unittest.cc
index eb9205f..c1f61f0 100644
--- a/content/common/android/address_parser_unittest.cc
+++ b/content/common/android/address_parser_unittest.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/memory/scoped_ptr.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/common/android/address_parser.h"
 #include "content/common/android/address_parser_internal.h"
diff --git a/content/common/child_process_host_impl.cc b/content/common/child_process_host_impl.cc
index bb0fdfd..2dfab2f 100644
--- a/content/common/child_process_host_impl.cc
+++ b/content/common/child_process_host_impl.cc
@@ -14,7 +14,7 @@
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/rand_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
 #include "content/common/child_process_messages.h"
 #include "content/public/common/child_process_host_delegate.h"
diff --git a/content/common/child_process_host_impl.h b/content/common/child_process_host_impl.h
index be2ea1e..c29b6ad 100644
--- a/content/common/child_process_host_impl.h
+++ b/content/common/child_process_host_impl.h
@@ -14,9 +14,9 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/shared_memory.h"
-#include "base/string16.h"
-#include "ipc/ipc_listener.h"
+#include "base/strings/string16.h"
 #include "content/public/common/child_process_host.h"
+#include "ipc/ipc_listener.h"
 
 namespace base {
 class FilePath;
diff --git a/content/common/content_param_traits.cc b/content/common/content_param_traits.cc
index ad921d0..140f388 100644
--- a/content/common/content_param_traits.cc
+++ b/content/common/content_param_traits.cc
@@ -4,7 +4,7 @@
 
 #include "content/common/content_param_traits.h"
 
-#include "base/string_number_conversions.h"
+#include "base/strings/string_number_conversions.h"
 #include "net/base/ip_endpoint.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
 #include "ui/base/range/range.h"
diff --git a/content/common/font_cache_dispatcher_win.cc b/content/common/font_cache_dispatcher_win.cc
index f2c9ebe..d6d59de 100644
--- a/content/common/font_cache_dispatcher_win.cc
+++ b/content/common/font_cache_dispatcher_win.cc
@@ -4,11 +4,11 @@
 
 #include "content/common/font_cache_dispatcher_win.h"
 
-#include <vector>
 #include <map>
+#include <vector>
 
 #include "base/logging.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "content/common/child_process_messages.h"
 
 namespace content {
diff --git a/content/common/font_list_win.cc b/content/common/font_list_win.cc
index 775c6f6..0eb84ed 100644
--- a/content/common/font_list_win.cc
+++ b/content/common/font_list_win.cc
@@ -8,7 +8,7 @@
 
 #include <set>
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/values.h"
 
 namespace content {
diff --git a/content/common/gpu/client/gl_helper_benchmark.cc b/content/common/gpu/client/gl_helper_benchmark.cc
index a6efaed..4e9fa49 100644
--- a/content/common/gpu/client/gl_helper_benchmark.cc
+++ b/content/common/gpu/client/gl_helper_benchmark.cc
@@ -20,7 +20,7 @@
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "base/time.h"
 #include "content/common/gpu/client/gl_helper.h"
 #include "content/common/gpu/client/gl_helper_scaling.h"
diff --git a/content/common/gpu/client/gl_helper_unittests.cc b/content/common/gpu/client/gl_helper_unittests.cc
index 8f8a0c6..f427b0d 100644
--- a/content/common/gpu/client/gl_helper_unittests.cc
+++ b/content/common/gpu/client/gl_helper_unittests.cc
@@ -17,7 +17,7 @@
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/run_loop.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "base/time.h"
 #include "content/common/gpu/client/gl_helper.h"
 #include "content/common/gpu/client/gl_helper_scaling.h"
diff --git a/content/common/gpu/gpu_channel.cc b/content/common/gpu/gpu_channel.cc
index b32bf4a..0c5172c 100644
--- a/content/common/gpu/gpu_channel.cc
+++ b/content/common/gpu/gpu_channel.cc
@@ -17,7 +17,7 @@
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/process_util.h"
 #include "base/rand_util.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/timer.h"
 #include "content/common/gpu/gpu_channel_manager.h"
 #include "content/common/gpu/gpu_messages.h"
diff --git a/content/common/gpu/gpu_memory_manager.cc b/content/common/gpu/gpu_memory_manager.cc
index 4794b9f..f093868 100644
--- a/content/common/gpu/gpu_memory_manager.cc
+++ b/content/common/gpu/gpu_memory_manager.cc
@@ -11,7 +11,7 @@
 #include "base/debug/trace_event.h"
 #include "base/message_loop.h"
 #include "base/process_util.h"
-#include "base/string_number_conversions.h"
+#include "base/strings/string_number_conversions.h"
 #include "content/common/gpu/gpu_channel_manager.h"
 #include "content/common/gpu/gpu_memory_allocation.h"
 #include "content/common/gpu/gpu_memory_manager_client.h"
diff --git a/content/common/gpu/media/h264_parser_unittest.cc b/content/common/gpu/media/h264_parser_unittest.cc
index 2aa9f43..d52bb51 100644
--- a/content/common/gpu/media/h264_parser_unittest.cc
+++ b/content/common/gpu/media/h264_parser_unittest.cc
@@ -7,7 +7,7 @@
 #include "base/command_line.h"
 #include "base/files/memory_mapped_file.h"
 #include "base/logging.h"
-#include "base/string_number_conversions.h"
+#include "base/strings/string_number_conversions.h"
 #include "content/common/gpu/media/h264_parser.h"
 
 using content::H264Parser;
diff --git a/content/common/gpu/media/omx_video_decode_accelerator.cc b/content/common/gpu/media/omx_video_decode_accelerator.cc
index 929b711..b110b7f 100644
--- a/content/common/gpu/media/omx_video_decode_accelerator.cc
+++ b/content/common/gpu/media/omx_video_decode_accelerator.cc
@@ -8,7 +8,7 @@
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "content/common/gpu/gpu_channel.h"
 #include "content/common/gpu/media/gles2_texture_to_egl_image_translator.h"
 #include "media/base/bitstream_buffer.h"
diff --git a/content/common/gpu/media/vaapi_video_decode_accelerator.cc b/content/common/gpu/media/vaapi_video_decode_accelerator.cc
index 3bcd1dc..70d1653 100644
--- a/content/common/gpu/media/vaapi_video_decode_accelerator.cc
+++ b/content/common/gpu/media/vaapi_video_decode_accelerator.cc
@@ -7,7 +7,7 @@
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/stl_util.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "content/child/child_thread.h"
 #include "content/common/gpu/gpu_channel.h"
diff --git a/content/common/gpu/media/video_decode_accelerator_unittest.cc b/content/common/gpu/media/video_decode_accelerator_unittest.cc
index 8520e76..43227d6 100644
--- a/content/common/gpu/media/video_decode_accelerator_unittest.cc
+++ b/content/common/gpu/media/video_decode_accelerator_unittest.cc
@@ -31,7 +31,7 @@
 #include "base/file_util.h"
 #include "base/process_util.h"
 #include "base/stl_util.h"
-#include "base/string_number_conversions.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/stringize_macros.h"
 #include "base/strings/utf_string_conversions.h"
diff --git a/content/common/handle_enumerator_win.h b/content/common/handle_enumerator_win.h
index ada972f..4a749e1 100644
--- a/content/common/handle_enumerator_win.h
+++ b/content/common/handle_enumerator_win.h
@@ -7,7 +7,7 @@
 
 #include "base/memory/ref_counted.h"
 #include "base/process.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 namespace content {
 
diff --git a/content/common/indexed_db/indexed_db_key.h b/content/common/indexed_db/indexed_db_key.h
index fe06ad2..e688939 100644
--- a/content/common/indexed_db/indexed_db_key.h
+++ b/content/common/indexed_db/indexed_db_key.h
@@ -9,7 +9,7 @@
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_vector.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "content/common/content_export.h"
 #include "third_party/WebKit/public/platform/WebIDBKey.h"
 
diff --git a/content/common/indexed_db/indexed_db_key_path.h b/content/common/indexed_db/indexed_db_key_path.h
index 5f188fd..acbdcb4 100644
--- a/content/common/indexed_db/indexed_db_key_path.h
+++ b/content/common/indexed_db/indexed_db_key_path.h
@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "base/logging.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "content/common/content_export.h"
 #include "third_party/WebKit/public/platform/WebIDBKeyPath.h"
 
diff --git a/content/common/input_messages.h b/content/common/input_messages.h
index fd4ca81..ef31299 100644
--- a/content/common/input_messages.h
+++ b/content/common/input_messages.h
@@ -6,7 +6,7 @@
 // order relative to input events.
 // Multiply-included message file, hence no include guard.
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "content/common/content_export.h"
 #include "content/common/content_param_traits.h"
 #include "content/common/edit_command.h"
diff --git a/content/common/mac/attributed_string_coder.h b/content/common/mac/attributed_string_coder.h
index 0ae866c..c3b3e9d 100644
--- a/content/common/mac/attributed_string_coder.h
+++ b/content/common/mac/attributed_string_coder.h
@@ -7,7 +7,7 @@
 
 #include <set>
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "content/common/content_export.h"
 #include "content/common/mac/font_descriptor.h"
 #include "ipc/ipc_message_utils.h"
diff --git a/content/common/mac/font_descriptor.h b/content/common/mac/font_descriptor.h
index 7ec9789..f47eb22 100644
--- a/content/common/mac/font_descriptor.h
+++ b/content/common/mac/font_descriptor.h
@@ -5,7 +5,7 @@
 #ifndef CONTENT_COMMON_MAC_FONT_DESCRIPTOR_H_
 #define CONTENT_COMMON_MAC_FONT_DESCRIPTOR_H_
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "content/common/content_export.h"
 
 #ifdef __OBJC__
diff --git a/content/common/media/media_param_traits.cc b/content/common/media/media_param_traits.cc
index f833ea0..00789e8 100644
--- a/content/common/media/media_param_traits.cc
+++ b/content/common/media/media_param_traits.cc
@@ -4,7 +4,7 @@
 
 #include "content/common/media/media_param_traits.h"
 
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "media/audio/audio_parameters.h"
 #include "media/base/limits.h"
 #include "media/video/capture/video_capture_types.h"
diff --git a/content/common/pepper_plugin_registry.cc b/content/common/pepper_plugin_registry.cc
index 09f7f19..7e22d9c 100644
--- a/content/common/pepper_plugin_registry.cc
+++ b/content/common/pepper_plugin_registry.cc
@@ -6,8 +6,8 @@
 
 #include "base/command_line.h"
 #include "base/native_library.h"
-#include "base/string_util.h"
 #include "base/strings/string_split.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
diff --git a/content/common/sandbox_mac.mm b/content/common/sandbox_mac.mm
index 8655252..d44953d6 100644
--- a/content/common/sandbox_mac.mm
+++ b/content/common/sandbox_mac.mm
@@ -22,10 +22,10 @@ extern "C" {
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/memory/scoped_nsobject.h"
 #include "base/rand_util.h"
-#include "base/string16.h"
-#include "base/string_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/string16.h"
 #include "base/strings/string_piece.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/sys_info.h"
diff --git a/content/common/sandbox_win.cc b/content/common/sandbox_win.cc
index 0a6e282..0496030 100644
--- a/content/common/sandbox_win.cc
+++ b/content/common/sandbox_win.cc
@@ -14,8 +14,8 @@
 #include "base/hash.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
-#include "base/string_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "base/win/iat_patch_function.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/scoped_process_information.h"
diff --git a/content/common/set_process_title.cc b/content/common/set_process_title.cc
index 30b3b70..7d7b057 100644
--- a/content/common/set_process_title.cc
+++ b/content/common/set_process_title.cc
@@ -22,7 +22,7 @@
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/process_util.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 // Linux/glibc doesn't natively have setproctitle().
 #include "content/common/set_process_title_linux.h"
 #endif  // defined(OS_LINUX)
diff --git a/content/common/url_schemes.cc b/content/common/url_schemes.cc
index 3c64243c..e784923 100644
--- a/content/common/url_schemes.cc
+++ b/content/common/url_schemes.cc
@@ -11,7 +11,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "content/common/savable_url_schemes.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/url_constants.h"
diff --git a/content/common/view_messages.h b/content/common/view_messages.h
index a5f3cae..c6a64ec 100644
--- a/content/common/view_messages.h
+++ b/content/common/view_messages.h
@@ -7,7 +7,7 @@
 
 #include "base/process.h"
 #include "base/shared_memory.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_ack.h"
 #include "content/common/browser_rendering_stats.h"
diff --git a/content/common/worker_messages.h b/content/common/worker_messages.h
index 631965f..4a41930 100644
--- a/content/common/worker_messages.h
+++ b/content/common/worker_messages.h
@@ -12,7 +12,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "content/common/content_export.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_message_macros.h"