From 21aa9968fcd3ed8fce7ef121367e1e4284ba9376 Mon Sep 17 00:00:00 2001 From: "avi@chromium.org" Date: Tue, 11 Jun 2013 07:17:01 +0000 Subject: [PATCH] Use a direct include of strings headers in content/renderer and content/shell. BUG=247723 TEST=none TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/16756003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205451 0039d316-1c4b-4281-b951-d872f2087c98 --- .../renderer/accessibility/accessibility_node_serializer.cc | 4 ++-- content/renderer/android/address_detector.cc | 2 +- content/renderer/android/phone_number_detector.cc | 2 +- content/renderer/browser_plugin/browser_plugin.cc | 4 ++-- content/renderer/browser_plugin/browser_plugin_bindings.cc | 4 ++-- content/renderer/date_time_formatter.cc | 2 +- content/renderer/devtools/devtools_agent.cc | 2 +- content/renderer/dom_automation_controller.cc | 2 +- content/renderer/dom_serializer_browsertest.cc | 2 +- content/renderer/dom_storage/dom_storage_dispatcher.cc | 2 +- content/renderer/gpu/gpu_benchmarking_extension.cc | 2 +- content/renderer/gpu/render_widget_compositor.cc | 2 +- content/renderer/hyphenator/hyphenator.cc | 2 +- content/renderer/hyphenator/hyphenator.h | 2 +- content/renderer/media/media_stream_center.cc | 2 +- content/renderer/media/media_stream_impl.cc | 4 ++-- content/renderer/media/mock_media_stream_dispatcher.cc | 2 +- content/renderer/media/rtc_media_constraints.cc | 2 +- content/renderer/media/webrtc_audio_capturer.cc | 2 +- content/renderer/media/webrtc_audio_device_impl.cc | 2 +- content/renderer/media/webrtc_audio_device_unittest.cc | 2 +- content/renderer/media/webrtc_audio_renderer.cc | 2 +- content/renderer/memory_benchmarking_extension.cc | 2 +- content/renderer/notification_provider.cc | 2 +- content/renderer/p2p/port_allocator.cc | 4 ++-- .../renderer/password_form_conversion_utils_browsertest.cc | 2 +- .../renderer/pepper/content_renderer_pepper_host_factory.cc | 2 +- content/renderer/render_thread_impl.cc | 6 +++--- content/renderer/render_thread_impl.h | 2 +- content/renderer/render_view_browsertest.cc | 2 +- content/renderer/render_view_browsertest_mac.mm | 4 ++-- content/renderer/render_view_impl.cc | 4 ++-- content/renderer/render_view_impl_params.h | 2 +- content/renderer/renderer_clipboard_client.cc | 2 +- content/renderer/renderer_date_time_picker.cc | 2 +- content/renderer/renderer_main.cc | 4 ++-- content/renderer/renderer_main_platform_delegate_win.cc | 2 +- content/renderer/renderer_webkitplatformsupport_impl.cc | 2 +- content/renderer/savable_resources.cc | 2 +- content/renderer/stats_collection_controller.cc | 2 +- content/renderer/webplugin_delegate_proxy.cc | 2 +- .../browsertests_apk/content_browser_tests_android.cc | 4 ++-- content/shell/renderer/webkit_test_runner.cc | 4 ++-- content/shell/shell.cc | 6 +++--- content/shell/shell_download_manager_delegate.cc | 2 +- content/shell/shell_javascript_dialog_gtk.cc | 2 +- content/shell/shell_javascript_dialog_win.cc | 2 +- content/shell/shell_login_dialog.h | 2 +- content/shell/shell_login_dialog_gtk.cc | 2 +- content/shell/shell_url_request_context_getter.cc | 4 ++-- content/shell/webkit_test_controller.cc | 4 ++-- 51 files changed, 67 insertions(+), 67 deletions(-) diff --git a/content/renderer/accessibility/accessibility_node_serializer.cc b/content/renderer/accessibility/accessibility_node_serializer.cc index 89b3c396d56897..bd6e015f35ae8b 100644 --- a/content/renderer/accessibility/accessibility_node_serializer.cc +++ b/content/renderer/accessibility/accessibility_node_serializer.cc @@ -6,8 +6,8 @@ #include -#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 "third_party/WebKit/public/platform/WebRect.h" #include "third_party/WebKit/public/platform/WebSize.h" diff --git a/content/renderer/android/address_detector.cc b/content/renderer/android/address_detector.cc index 8eb12e83584b98..afc7ab6c3016b9 100644 --- a/content/renderer/android/address_detector.cc +++ b/content/renderer/android/address_detector.cc @@ -6,7 +6,7 @@ #include -#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/public/renderer/android_content_detection_prefixes.h" diff --git a/content/renderer/android/phone_number_detector.cc b/content/renderer/android/phone_number_detector.cc index bf8f3d8925b687..19c526f9bd0a3d 100644 --- a/content/renderer/android/phone_number_detector.cc +++ b/content/renderer/android/phone_number_detector.cc @@ -6,7 +6,7 @@ #include -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "content/public/renderer/android_content_detection_prefixes.h" #include "net/base/escape.h" diff --git a/content/renderer/browser_plugin/browser_plugin.cc b/content/renderer/browser_plugin/browser_plugin.cc index 29de7b3b16e41c..ae2c14d334055a 100644 --- a/content/renderer/browser_plugin/browser_plugin.cc +++ b/content/renderer/browser_plugin/browser_plugin.cc @@ -7,8 +7,8 @@ #include "base/command_line.h" #include "base/json/json_string_value_serializer.h" #include "base/message_loop.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 "content/common/browser_plugin/browser_plugin_constants.h" #include "content/common/browser_plugin/browser_plugin_messages.h" diff --git a/content/renderer/browser_plugin/browser_plugin_bindings.cc b/content/renderer/browser_plugin/browser_plugin_bindings.cc index 1d8995b577d2a5..2cf4c54f0fb09e 100644 --- a/content/renderer/browser_plugin/browser_plugin_bindings.cc +++ b/content/renderer/browser_plugin/browser_plugin_bindings.cc @@ -9,8 +9,8 @@ #include "base/bind.h" #include "base/message_loop.h" -#include "base/string16.h" -#include "base/string_number_conversions.h" +#include "base/strings/string16.h" +#include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/strings/utf_string_conversions.h" #include "content/common/browser_plugin/browser_plugin_constants.h" diff --git a/content/renderer/date_time_formatter.cc b/content/renderer/date_time_formatter.cc index 63ae9809827c6d..f685cf33dd2545 100644 --- a/content/renderer/date_time_formatter.cc +++ b/content/renderer/date_time_formatter.cc @@ -4,7 +4,7 @@ #include "content/renderer/date_time_formatter.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "third_party/WebKit/public/platform/WebCString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDateTimeChooserParams.h" diff --git a/content/renderer/devtools/devtools_agent.cc b/content/renderer/devtools/devtools_agent.cc index 7c5e04d9d729e7..6531bc8a9e6755 100644 --- a/content/renderer/devtools/devtools_agent.cc +++ b/content/renderer/devtools/devtools_agent.cc @@ -10,7 +10,7 @@ #include "base/lazy_instance.h" #include "base/message_loop.h" #include "base/process.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "content/common/devtools_messages.h" #include "content/common/view_messages.h" #include "content/renderer/devtools/devtools_agent_filter.h" diff --git a/content/renderer/dom_automation_controller.cc b/content/renderer/dom_automation_controller.cc index 27120c134e9714..b1f0d60b6a7d21 100644 --- a/content/renderer/dom_automation_controller.cc +++ b/content/renderer/dom_automation_controller.cc @@ -9,7 +9,7 @@ #include "base/json/json_string_value_serializer.h" #include "base/metrics/histogram.h" #include "base/metrics/statistics_recorder.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "content/common/child_process_messages.h" #include "content/common/view_messages.h" diff --git a/content/renderer/dom_serializer_browsertest.cc b/content/renderer/dom_serializer_browsertest.cc index bb7943681bc611..53a457f10f6e6e 100644 --- a/content/renderer/dom_serializer_browsertest.cc +++ b/content/renderer/dom_serializer_browsertest.cc @@ -8,7 +8,7 @@ #include "base/file_util.h" #include "base/files/file_path.h" #include "base/hash_tables.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "content/public/common/content_switches.h" #include "content/public/renderer/render_view.h" diff --git a/content/renderer/dom_storage/dom_storage_dispatcher.cc b/content/renderer/dom_storage/dom_storage_dispatcher.cc index bc3be71688fc7d..4ac31a1d8a7884 100644 --- a/content/renderer/dom_storage/dom_storage_dispatcher.cc +++ b/content/renderer/dom_storage/dom_storage_dispatcher.cc @@ -7,7 +7,7 @@ #include #include -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/synchronization/lock.h" #include "content/common/dom_storage_messages.h" #include "content/renderer/dom_storage/webstoragearea_impl.h" diff --git a/content/renderer/gpu/gpu_benchmarking_extension.cc b/content/renderer/gpu/gpu_benchmarking_extension.cc index 9ed95b13cf5346..102073cc9e57f7 100644 --- a/content/renderer/gpu/gpu_benchmarking_extension.cc +++ b/content/renderer/gpu/gpu_benchmarking_extension.cc @@ -10,7 +10,7 @@ #include "base/file_util.h" #include "base/files/file_path.h" #include "base/memory/scoped_vector.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "content/common/browser_rendering_stats.h" #include "content/common/gpu/gpu_rendering_stats.h" #include "content/public/renderer/render_thread.h" diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc index b9fb860db5a8e1..cda27aebca7244 100644 --- a/content/renderer/gpu/render_widget_compositor.cc +++ b/content/renderer/gpu/render_widget_compositor.cc @@ -9,7 +9,7 @@ #include "base/command_line.h" #include "base/logging.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/synchronization/lock.h" #include "base/time.h" #include "cc/base/switches.h" diff --git a/content/renderer/hyphenator/hyphenator.cc b/content/renderer/hyphenator/hyphenator.cc index 84ef8eff4c31ff..f638c07b053280 100644 --- a/content/renderer/hyphenator/hyphenator.cc +++ b/content/renderer/hyphenator/hyphenator.cc @@ -7,7 +7,7 @@ #include "base/files/memory_mapped_file.h" #include "base/logging.h" #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/hyphenator_messages.h" #include "content/public/renderer/render_thread.h" diff --git a/content/renderer/hyphenator/hyphenator.h b/content/renderer/hyphenator/hyphenator.h index f7cc5150db43d6..24454cd5a8e0db 100644 --- a/content/renderer/hyphenator/hyphenator.h +++ b/content/renderer/hyphenator/hyphenator.h @@ -9,7 +9,7 @@ #include "base/memory/scoped_handle.h" #include "base/platform_file.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "content/common/content_export.h" #include "content/public/renderer/render_process_observer.h" #include "ipc/ipc_platform_file.h" diff --git a/content/renderer/media/media_stream_center.cc b/content/renderer/media/media_stream_center.cc index 3c57ccd9ca1ac4..49de757088b4d1 100644 --- a/content/renderer/media/media_stream_center.cc +++ b/content/renderer/media/media_stream_center.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "content/renderer/media/media_stream_dependency_factory.h" #include "content/renderer/media/media_stream_extra_data.h" diff --git a/content/renderer/media/media_stream_impl.cc b/content/renderer/media/media_stream_impl.cc index e9562a9f316836..2e9f0a9ded8dc1 100644 --- a/content/renderer/media/media_stream_impl.cc +++ b/content/renderer/media/media_stream_impl.cc @@ -7,8 +7,8 @@ #include #include "base/logging.h" -#include "base/string_number_conversions.h" -#include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" +#include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "content/renderer/media/media_stream_dependency_factory.h" #include "content/renderer/media/media_stream_dispatcher.h" diff --git a/content/renderer/media/mock_media_stream_dispatcher.cc b/content/renderer/media/mock_media_stream_dispatcher.cc index 09858c1108c332..2c979c5c3a844b 100644 --- a/content/renderer/media/mock_media_stream_dispatcher.cc +++ b/content/renderer/media/mock_media_stream_dispatcher.cc @@ -4,7 +4,7 @@ #include "content/renderer/media/mock_media_stream_dispatcher.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "content/public/common/media_stream_request.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/content/renderer/media/rtc_media_constraints.cc b/content/renderer/media/rtc_media_constraints.cc index 9efbf8c8f8201a..3988154912e75b 100644 --- a/content/renderer/media/rtc_media_constraints.cc +++ b/content/renderer/media/rtc_media_constraints.cc @@ -4,7 +4,7 @@ #include "content/renderer/media/rtc_media_constraints.h" #include "base/logging.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "content/common/media/media_stream_options.h" #include "third_party/WebKit/public/platform/WebMediaConstraints.h" #include "third_party/WebKit/public/platform/WebCString.h" diff --git a/content/renderer/media/webrtc_audio_capturer.cc b/content/renderer/media/webrtc_audio_capturer.cc index 7ab1af8027fe31..a9f8082e9d81b5 100644 --- a/content/renderer/media/webrtc_audio_capturer.cc +++ b/content/renderer/media/webrtc_audio_capturer.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/logging.h" #include "base/metrics/histogram.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "content/child/child_process.h" #include "content/renderer/media/audio_device_factory.h" #include "content/renderer/media/webrtc_audio_capturer_sink_owner.h" diff --git a/content/renderer/media/webrtc_audio_device_impl.cc b/content/renderer/media/webrtc_audio_device_impl.cc index 5edd967430883a..d990eb05a2a333 100644 --- a/content/renderer/media/webrtc_audio_device_impl.cc +++ b/content/renderer/media/webrtc_audio_device_impl.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/metrics/histogram.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/win/windows_version.h" #include "content/renderer/media/webrtc_audio_capturer.h" #include "content/renderer/media/webrtc_audio_renderer.h" diff --git a/content/renderer/media/webrtc_audio_device_unittest.cc b/content/renderer/media/webrtc_audio_device_unittest.cc index bd7f845d864777..dac1ee54a6b3da 100644 --- a/content/renderer/media/webrtc_audio_device_unittest.cc +++ b/content/renderer/media/webrtc_audio_device_unittest.cc @@ -6,7 +6,7 @@ #include "base/file_util.h" #include "base/files/file_path.h" #include "base/path_service.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/test/test_timeouts.h" #include "content/renderer/media/webrtc_audio_capturer.h" #include "content/renderer/media/webrtc_audio_device_impl.h" diff --git a/content/renderer/media/webrtc_audio_renderer.cc b/content/renderer/media/webrtc_audio_renderer.cc index 626a5dc11d94d7..db8c49593ab3f8 100644 --- a/content/renderer/media/webrtc_audio_renderer.cc +++ b/content/renderer/media/webrtc_audio_renderer.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "base/metrics/histogram.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "content/renderer/media/audio_device_factory.h" #include "content/renderer/media/webrtc_audio_device_impl.h" #include "content/renderer/render_thread_impl.h" diff --git a/content/renderer/memory_benchmarking_extension.cc b/content/renderer/memory_benchmarking_extension.cc index 7db2c6ff18a055..d58dcc2c5273b0 100644 --- a/content/renderer/memory_benchmarking_extension.cc +++ b/content/renderer/memory_benchmarking_extension.cc @@ -4,7 +4,7 @@ #include "content/renderer/memory_benchmarking_extension.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "content/common/memory_benchmark_messages.h" #include "content/renderer/render_thread_impl.h" diff --git a/content/renderer/notification_provider.cc b/content/renderer/notification_provider.cc index 56436178ddba14..968afc8ede0793 100644 --- a/content/renderer/notification_provider.cc +++ b/content/renderer/notification_provider.cc @@ -4,7 +4,7 @@ #include "content/renderer/notification_provider.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "content/common/desktop_notification_messages.h" #include "content/common/view_messages.h" #include "content/renderer/render_view_impl.h" diff --git a/content/renderer/p2p/port_allocator.cc b/content/renderer/p2p/port_allocator.cc index a76911b33c0db9..9e21d036c06293 100644 --- a/content/renderer/p2p/port_allocator.cc +++ b/content/renderer/p2p/port_allocator.cc @@ -5,9 +5,9 @@ #include "content/renderer/p2p/port_allocator.h" #include "base/bind.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 "content/renderer/p2p/host_address_request.h" #include "jingle/glue/utils.h" #include "net/base/escape.h" diff --git a/content/renderer/password_form_conversion_utils_browsertest.cc b/content/renderer/password_form_conversion_utils_browsertest.cc index 5bedf96b8f657f..38892c75f68870 100644 --- a/content/renderer/password_form_conversion_utils_browsertest.cc +++ b/content/renderer/password_form_conversion_utils_browsertest.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/string16.h" +#include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" #include "content/public/common/password_form.h" #include "content/public/renderer/password_form_conversion_utils.h" diff --git a/content/renderer/pepper/content_renderer_pepper_host_factory.cc b/content/renderer/pepper/content_renderer_pepper_host_factory.cc index 79b7c4f2a06547..21ba784df5172a 100644 --- a/content/renderer/pepper/content_renderer_pepper_host_factory.cc +++ b/content/renderer/pepper/content_renderer_pepper_host_factory.cc @@ -5,7 +5,7 @@ #include "content/renderer/pepper/content_renderer_pepper_host_factory.h" #include "base/logging.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "content/renderer/pepper/pepper_audio_input_host.h" #include "content/renderer/pepper/pepper_file_chooser_host.h" #include "content/renderer/pepper/pepper_file_io_host.h" diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc index a141f8fddb59d1..006aba3e5954cb 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -19,8 +19,8 @@ #include "base/metrics/stats_table.h" #include "base/path_service.h" #include "base/shared_memory.h" -#include "base/string16.h" -#include "base/string_number_conversions.h" // Temporary +#include "base/strings/string16.h" +#include "base/strings/string_number_conversions.h" // Temporary #include "base/strings/utf_string_conversions.h" #include "base/threading/thread_local.h" #include "base/threading/thread_restrictions.h" @@ -56,8 +56,8 @@ #include "content/renderer/dom_storage/webstoragenamespace_impl.h" #include "content/renderer/gpu/compositor_output_surface.h" #include "content/renderer/gpu/gpu_benchmarking_extension.h" -#include "content/renderer/gpu/input_handler_manager.h" #include "content/renderer/gpu/input_event_filter.h" +#include "content/renderer/gpu/input_handler_manager.h" #include "content/renderer/media/audio_input_message_filter.h" #include "content/renderer/media/audio_message_filter.h" #include "content/renderer/media/audio_renderer_mixer_manager.h" diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h index c797a60ed3820d..e407ac7b386320 100644 --- a/content/renderer/render_thread_impl.h +++ b/content/renderer/render_thread_impl.h @@ -10,7 +10,7 @@ #include #include "base/observer_list.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/timer.h" #include "build/build_config.h" #include "content/child/child_process.h" diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc index 85bf1a76ec4281..d964fbe0c30f4d 100644 --- a/content/renderer/render_view_browsertest.cc +++ b/content/renderer/render_view_browsertest.cc @@ -5,7 +5,7 @@ #include "base/basictypes.h" #include "base/shared_memory.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "content/common/view_messages.h" #include "content/public/browser/native_web_keyboard_event.h" diff --git a/content/renderer/render_view_browsertest_mac.mm b/content/renderer/render_view_browsertest_mac.mm index 808ffbdfea38a3..1117e2ea7ce679 100644 --- a/content/renderer/render_view_browsertest_mac.mm +++ b/content/renderer/render_view_browsertest_mac.mm @@ -2,8 +2,8 @@ // 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/string16.h" +#include "base/strings/string16.h" +#include "base/strings/string_util.h" #include "content/public/browser/native_web_keyboard_event.h" #include "content/public/test/render_view_test.h" #include "content/renderer/render_view_impl.h" diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index 5400d2bdd1f3d5..d95eb44e710eb7 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -21,10 +21,10 @@ #include "base/metrics/histogram.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_piece.h" #include "base/strings/string_split.h" +#include "base/strings/string_util.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/time.h" diff --git a/content/renderer/render_view_impl_params.h b/content/renderer/render_view_impl_params.h index 27835be8a57173..4b66e04eaded8c 100644 --- a/content/renderer/render_view_impl_params.h +++ b/content/renderer/render_view_impl_params.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "content/common/content_export.h" #include "content/common/view_message_enums.h" diff --git a/content/renderer/renderer_clipboard_client.cc b/content/renderer/renderer_clipboard_client.cc index b21db026f64a60..e9714986465d59 100644 --- a/content/renderer/renderer_clipboard_client.cc +++ b/content/renderer/renderer_clipboard_client.cc @@ -7,7 +7,7 @@ #include "content/renderer/renderer_clipboard_client.h" #include "base/shared_memory.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "content/common/clipboard_messages.h" #include "content/public/renderer/content_renderer_client.h" #include "content/renderer/render_thread_impl.h" diff --git a/content/renderer/renderer_date_time_picker.cc b/content/renderer/renderer_date_time_picker.cc index 1675a3c980e4f4..61ecd5cd1fecec 100644 --- a/content/renderer/renderer_date_time_picker.cc +++ b/content/renderer/renderer_date_time_picker.cc @@ -4,7 +4,7 @@ #include "content/renderer/renderer_date_time_picker.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "content/common/view_messages.h" #include "content/renderer/date_time_formatter.h" #include "content/renderer/render_view_impl.h" diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc index 2dd9cafcbffa21..17856c536f7f35 100644 --- a/content/renderer/renderer_main.cc +++ b/content/renderer/renderer_main.cc @@ -10,8 +10,8 @@ #include "base/hi_res_timer_manager.h" #include "base/i18n/rtl.h" #include "base/memory/ref_counted.h" -#include "base/metrics/field_trial.h" #include "base/message_loop.h" +#include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" #include "base/metrics/statistics_recorder.h" #include "base/metrics/stats_counters.h" @@ -19,7 +19,7 @@ #include "base/pending_task.h" #include "base/power_monitor/power_monitor.h" #include "base/process_util.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/threading/platform_thread.h" #include "base/time.h" #include "content/child/child_process.h" diff --git a/content/renderer/renderer_main_platform_delegate_win.cc b/content/renderer/renderer_main_platform_delegate_win.cc index c07301cf7453d3..49c3589ac9e56f 100644 --- a/content/renderer/renderer_main_platform_delegate_win.cc +++ b/content/renderer/renderer_main_platform_delegate_win.cc @@ -7,7 +7,7 @@ #include "base/command_line.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/win/win_util.h" #include "content/public/common/content_switches.h" #include "content/public/common/injection_test_win.h" diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc index 30ad1d78078448..ee72f5c20c3889 100644 --- a/content/renderer/renderer_webkitplatformsupport_impl.cc +++ b/content/renderer/renderer_webkitplatformsupport_impl.cc @@ -10,7 +10,7 @@ #include "base/metrics/histogram.h" #include "base/platform_file.h" #include "base/shared_memory.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "content/child/database_util.h" #include "content/child/fileapi/webfilesystem_impl.h" diff --git a/content/renderer/savable_resources.cc b/content/renderer/savable_resources.cc index 801c37d669cebd..0637a84396a707 100644 --- a/content/renderer/savable_resources.cc +++ b/content/renderer/savable_resources.cc @@ -8,7 +8,7 @@ #include "base/compiler_specific.h" #include "base/logging.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/WebVector.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" diff --git a/content/renderer/stats_collection_controller.cc b/content/renderer/stats_collection_controller.cc index 9826eef8635970..80ff096d9f98c1 100644 --- a/content/renderer/stats_collection_controller.cc +++ b/content/renderer/stats_collection_controller.cc @@ -9,7 +9,7 @@ #include "base/json/json_writer.h" #include "base/metrics/histogram.h" #include "base/metrics/statistics_recorder.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "content/common/child_process_messages.h" #include "content/renderer/render_view_impl.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" diff --git a/content/renderer/webplugin_delegate_proxy.cc b/content/renderer/webplugin_delegate_proxy.cc index bdc025f1b8625f..88029f290cd55d 100644 --- a/content/renderer/webplugin_delegate_proxy.cc +++ b/content/renderer/webplugin_delegate_proxy.cc @@ -20,8 +20,8 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/process.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 "base/version.h" #include "content/child/child_process.h" diff --git a/content/shell/android/browsertests_apk/content_browser_tests_android.cc b/content/shell/android/browsertests_apk/content_browser_tests_android.cc index 96ce15c03fafd7..fdfde371df4c36 100644 --- a/content/shell/android/browsertests_apk/content_browser_tests_android.cc +++ b/content/shell/android/browsertests_apk/content_browser_tests_android.cc @@ -16,9 +16,9 @@ #include "base/command_line.h" #include "base/files/file_path.h" #include "base/logging.h" -#include "base/string_util.h" -#include "base/stringprintf.h" #include "base/strings/string_tokenizer.h" +#include "base/strings/string_util.h" +#include "base/strings/stringprintf.h" #include "content/public/app/android_library_loader_hooks.h" #include "content/public/app/content_main.h" #include "content/public/common/content_switches.h" diff --git a/content/shell/renderer/webkit_test_runner.cc b/content/shell/renderer/webkit_test_runner.cc index 2514911378b012..67c8c2cb780bd8 100644 --- a/content/shell/renderer/webkit_test_runner.cc +++ b/content/shell/renderer/webkit_test_runner.cc @@ -13,8 +13,8 @@ #include "base/md5.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/string_util.h" -#include "base/stringprintf.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/time.h" diff --git a/content/shell/shell.cc b/content/shell/shell.cc index a921a30f532245..8dec182f1c6f6b 100644 --- a/content/shell/shell.cc +++ b/content/shell/shell.cc @@ -8,9 +8,9 @@ #include "base/command_line.h" #include "base/message_loop.h" #include "base/path_service.h" -#include "base/string_number_conversions.h" -#include "base/string_util.h" -#include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" +#include "base/strings/string_util.h" +#include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "content/public/browser/devtools_manager.h" #include "content/public/browser/navigation_controller.h" diff --git a/content/shell/shell_download_manager_delegate.cc b/content/shell/shell_download_manager_delegate.cc index e3e041724c2357..5d16db71f1d46d 100644 --- a/content/shell/shell_download_manager_delegate.cc +++ b/content/shell/shell_download_manager_delegate.cc @@ -17,7 +17,7 @@ #include "base/command_line.h" #include "base/file_util.h" #include "base/logging.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" diff --git a/content/shell/shell_javascript_dialog_gtk.cc b/content/shell/shell_javascript_dialog_gtk.cc index 13ee8c75408b1b..9ba05fc3d7dd6d 100644 --- a/content/shell/shell_javascript_dialog_gtk.cc +++ b/content/shell/shell_javascript_dialog_gtk.cc @@ -7,7 +7,7 @@ #include #include "base/logging.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "content/shell/app/resource.h" #include "content/shell/shell.h" diff --git a/content/shell/shell_javascript_dialog_win.cc b/content/shell/shell_javascript_dialog_win.cc index b8fd981943e004..c39b2d7d27913b 100644 --- a/content/shell/shell_javascript_dialog_win.cc +++ b/content/shell/shell_javascript_dialog_win.cc @@ -4,7 +4,7 @@ #include "content/shell/shell_javascript_dialog.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "content/shell/app/resource.h" #include "content/shell/shell.h" #include "content/shell/shell_javascript_dialog_manager.h" diff --git a/content/shell/shell_login_dialog.h b/content/shell/shell_login_dialog.h index 9f4495cd40b478..22abab461db4fd 100644 --- a/content/shell/shell_login_dialog.h +++ b/content/shell/shell_login_dialog.h @@ -6,7 +6,7 @@ #define CONTENT_SHELL_SHELL_LOGIN_DIALOG_H_ #include "base/compiler_specific.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "content/public/browser/resource_dispatcher_host_login_delegate.h" #if defined(TOOLKIT_GTK) diff --git a/content/shell/shell_login_dialog_gtk.cc b/content/shell/shell_login_dialog_gtk.cc index 4eb6fafa1e6dc6..1be48d3068bf8e 100644 --- a/content/shell/shell_login_dialog_gtk.cc +++ b/content/shell/shell_login_dialog_gtk.cc @@ -7,7 +7,7 @@ #include #include "base/logging.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_view_host.h" diff --git a/content/shell/shell_url_request_context_getter.cc b/content/shell/shell_url_request_context_getter.cc index 9c66f0c46f7557..bd73546348acfb 100644 --- a/content/shell/shell_url_request_context_getter.cc +++ b/content/shell/shell_url_request_context_getter.cc @@ -6,9 +6,9 @@ #include "base/command_line.h" #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 "base/threading/worker_pool.h" #include "content/public/browser/browser_thread.h" #include "content/public/common/content_switches.h" diff --git a/content/shell/webkit_test_controller.cc b/content/shell/webkit_test_controller.cc index fa78a8b435c854..62ca29eeb0b532 100644 --- a/content/shell/webkit_test_controller.cc +++ b/content/shell/webkit_test_controller.cc @@ -10,8 +10,8 @@ #include "base/message_loop.h" #include "base/process_util.h" #include "base/run_loop.h" -#include "base/string_number_conversions.h" -#include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" +#include "base/strings/stringprintf.h" #include "content/public/browser/devtools_manager.h" #include "content/public/browser/gpu_data_manager.h" #include "content/public/browser/navigation_controller.h"