diff options
author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-11 07:16:18 +0000 |
---|---|---|
committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-11 07:16:18 +0000 |
commit | 10994d13b799f7f5a6222c24a9de6ac994c6b84e (patch) | |
tree | 2a07173ce914572914880e1c5286c4070c3fa4bd | |
parent | 4dc3ad4fb5b48e374be6edde69994614251f70f5 (diff) | |
download | chromium_src-10994d13b799f7f5a6222c24a9de6ac994c6b84e.zip chromium_src-10994d13b799f7f5a6222c24a9de6ac994c6b84e.tar.gz chromium_src-10994d13b799f7f5a6222c24a9de6ac994c6b84e.tar.bz2 |
Use a direct include of strings headers in content/browser/, part 1.
BUG=247723
TEST=none
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/16755004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205449 0039d316-1c4b-4281-b951-d872f2087c98
81 files changed, 99 insertions, 99 deletions
diff --git a/content/browser/accessibility/accessibility_tree_formatter.cc b/content/browser/accessibility/accessibility_tree_formatter.cc index a6c389a..99a5aa5 100644 --- a/content/browser/accessibility/accessibility_tree_formatter.cc +++ b/content/browser/accessibility/accessibility_tree_formatter.cc @@ -6,9 +6,9 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.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/browser/accessibility/browser_accessibility_manager.h" #include "content/port/browser/render_widget_host_view_port.h" diff --git a/content/browser/accessibility/accessibility_tree_formatter.h b/content/browser/accessibility/accessibility_tree_formatter.h index 3f2dd09..7b334fe 100644 --- a/content/browser/accessibility/accessibility_tree_formatter.h +++ b/content/browser/accessibility/accessibility_tree_formatter.h @@ -8,7 +8,7 @@ #include <vector> #include "base/files/file_path.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "content/browser/accessibility/browser_accessibility.h" diff --git a/content/browser/accessibility/accessibility_tree_formatter_mac.mm b/content/browser/accessibility/accessibility_tree_formatter_mac.mm index b48c4f7..84dbb8d 100644 --- a/content/browser/accessibility/accessibility_tree_formatter_mac.mm +++ b/content/browser/accessibility/accessibility_tree_formatter_mac.mm @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/files/file_path.h" #include "base/json/json_writer.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" #include "content/browser/accessibility/browser_accessibility_cocoa.h" diff --git a/content/browser/accessibility/accessibility_tree_formatter_utils_win.cc b/content/browser/accessibility/accessibility_tree_formatter_utils_win.cc index 334c8cf..053e39b 100644 --- a/content/browser/accessibility/accessibility_tree_formatter_utils_win.cc +++ b/content/browser/accessibility/accessibility_tree_formatter_utils_win.cc @@ -10,7 +10,7 @@ #include <string> #include "base/memory/singleton.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "third_party/iaccessible2/ia2_api_all.h" namespace content { diff --git a/content/browser/accessibility/accessibility_tree_formatter_utils_win.h b/content/browser/accessibility/accessibility_tree_formatter_utils_win.h index 0a54edd..1baf20d 100644 --- a/content/browser/accessibility/accessibility_tree_formatter_utils_win.h +++ b/content/browser/accessibility/accessibility_tree_formatter_utils_win.h @@ -8,7 +8,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "content/common/content_export.h" namespace content { diff --git a/content/browser/accessibility/accessibility_tree_formatter_win.cc b/content/browser/accessibility/accessibility_tree_formatter_win.cc index ab76312..464d130 100644 --- a/content/browser/accessibility/accessibility_tree_formatter_win.cc +++ b/content/browser/accessibility/accessibility_tree_formatter_win.cc @@ -9,8 +9,8 @@ #include <string> #include "base/files/file_path.h" -#include "base/string_util.h" -#include "base/stringprintf.h" +#include "base/strings/string_util.h" +#include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "content/browser/accessibility/accessibility_tree_formatter_utils_win.h" #include "content/browser/accessibility/browser_accessibility_manager.h" diff --git a/content/browser/accessibility/browser_accessibility.cc b/content/browser/accessibility/browser_accessibility.cc index fcfd365..f2f040b 100644 --- a/content/browser/accessibility/browser_accessibility.cc +++ b/content/browser/accessibility/browser_accessibility.cc @@ -5,8 +5,8 @@ #include "content/browser/accessibility/browser_accessibility.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_util.h" #include "content/browser/accessibility/browser_accessibility_manager.h" #include "content/common/accessibility_messages.h" diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/content/browser/accessibility/browser_accessibility_cocoa.mm index 6f3551f..a09e8dd 100644 --- a/content/browser/accessibility/browser_accessibility_cocoa.mm +++ b/content/browser/accessibility/browser_accessibility_cocoa.mm @@ -9,7 +9,7 @@ #include <map> #include "base/basictypes.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" #include "content/browser/accessibility/browser_accessibility_manager.h" diff --git a/content/browser/accessibility/browser_accessibility_mac_unittest.mm b/content/browser/accessibility/browser_accessibility_mac_unittest.mm index 685ebdf..30a6de9 100644 --- a/content/browser/accessibility/browser_accessibility_mac_unittest.mm +++ b/content/browser/accessibility/browser_accessibility_mac_unittest.mm @@ -5,7 +5,7 @@ #import <Cocoa/Cocoa.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/browser/accessibility/browser_accessibility_cocoa.h" #include "content/browser/accessibility/browser_accessibility_manager.h" diff --git a/content/browser/accessibility/browser_accessibility_manager_unittest.cc b/content/browser/accessibility/browser_accessibility_manager_unittest.cc index b7ed1fa..5cb03cd 100644 --- a/content/browser/accessibility/browser_accessibility_manager_unittest.cc +++ b/content/browser/accessibility/browser_accessibility_manager_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/string16.h" +#include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" #include "content/browser/accessibility/browser_accessibility.h" #include "content/browser/accessibility/browser_accessibility_manager.h" diff --git a/content/browser/accessibility/browser_accessibility_state_impl_win.cc b/content/browser/accessibility/browser_accessibility_state_impl_win.cc index e968d996..824055f 100644 --- a/content/browser/accessibility/browser_accessibility_state_impl_win.cc +++ b/content/browser/accessibility/browser_accessibility_state_impl_win.cc @@ -9,7 +9,7 @@ #include "base/files/file_path.h" #include "base/metrics/histogram.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" namespace content { diff --git a/content/browser/accessibility/browser_accessibility_win.cc b/content/browser/accessibility/browser_accessibility_win.cc index 5614006..a079db5 100644 --- a/content/browser/accessibility/browser_accessibility_win.cc +++ b/content/browser/accessibility/browser_accessibility_win.cc @@ -7,8 +7,8 @@ #include <UIAutomationClient.h> #include <UIAutomationCoreApi.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/win/enum_variant.h" #include "base/win/scoped_comptr.h" diff --git a/content/browser/accessibility/dump_accessibility_tree_browsertest.cc b/content/browser/accessibility/dump_accessibility_tree_browsertest.cc index bfbad81..4c90fc1 100644 --- a/content/browser/accessibility/dump_accessibility_tree_browsertest.cc +++ b/content/browser/accessibility/dump_accessibility_tree_browsertest.cc @@ -9,9 +9,9 @@ #include "base/file_util.h" #include "base/logging.h" #include "base/path_service.h" -#include "base/string_util.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/strings/string_split.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "content/browser/accessibility/accessibility_tree_formatter.h" #include "content/browser/accessibility/browser_accessibility.h" diff --git a/content/browser/android/content_startup_flags.cc b/content/browser/android/content_startup_flags.cc index 4af0854..ecf69e8 100644 --- a/content/browser/android/content_startup_flags.cc +++ b/content/browser/android/content_startup_flags.cc @@ -6,7 +6,7 @@ #include "base/command_line.h" #include "base/logging.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "cc/base/switches.h" #include "content/public/browser/render_process_host.h" #include "content/public/common/content_constants.h" diff --git a/content/browser/bookmarklet_browsertest.cc b/content/browser/bookmarklet_browsertest.cc index 71b6b50..02f4193 100644 --- a/content/browser/bookmarklet_browsertest.cc +++ b/content/browser/bookmarklet_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/string_util.h" +#include "base/strings/string_util.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_utils.h" diff --git a/content/browser/browser_child_process_host_impl.cc b/content/browser/browser_child_process_host_impl.cc index 44cee2e..3748f6f 100644 --- a/content/browser/browser_child_process_host_impl.cc +++ b/content/browser/browser_child_process_host_impl.cc @@ -14,7 +14,7 @@ #include "base/path_service.h" #include "base/process_util.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/browser/histogram_message_filter.h" #include "content/browser/loader/resource_message_filter.h" diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc index 56d8549..b225da4 100644 --- a/content/browser/browser_main_loop.cc +++ b/content/browser/browser_main_loop.cc @@ -14,9 +14,9 @@ #include "base/metrics/histogram.h" #include "base/pending_task.h" #include "base/power_monitor/power_monitor.h" -#include "base/system_monitor/system_monitor.h" #include "base/run_loop.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" +#include "base/system_monitor/system_monitor.h" #include "base/threading/thread_restrictions.h" #include "content/browser/browser_thread_impl.h" #include "content/browser/download/save_file_manager.h" diff --git a/content/browser/browser_plugin/browser_plugin_guest.cc b/content/browser/browser_plugin/browser_plugin_guest.cc index cff73e5..fff7e59 100644 --- a/content/browser/browser_plugin/browser_plugin_guest.cc +++ b/content/browser/browser_plugin/browser_plugin_guest.cc @@ -8,7 +8,7 @@ #include "base/command_line.h" #include "base/message_loop.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "content/browser/browser_plugin/browser_plugin_embedder.h" #include "content/browser/browser_plugin/browser_plugin_guest_helper.h" diff --git a/content/browser/browser_plugin/browser_plugin_host_browsertest.cc b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc index a31a38d..852719f 100644 --- a/content/browser/browser_plugin/browser_plugin_host_browsertest.cc +++ b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc @@ -5,8 +5,8 @@ #include "base/command_line.h" #include "base/memory/singleton.h" #include "base/run_loop.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/test/test_timeouts.h" #include "content/browser/browser_plugin/browser_plugin_guest.h" diff --git a/content/browser/browser_plugin/browser_plugin_host_factory.h b/content/browser/browser_plugin/browser_plugin_host_factory.h index a1d2eb4..9bfc1e2 100644 --- a/content/browser/browser_plugin/browser_plugin_host_factory.h +++ b/content/browser/browser_plugin/browser_plugin_host_factory.h @@ -8,7 +8,7 @@ #include "base/base_export.h" #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "content/common/content_export.h" struct BrowserPluginHostMsg_CreateGuest_Params; diff --git a/content/browser/browser_url_handler_impl.cc b/content/browser/browser_url_handler_impl.cc index ba31124..32c1b5e58 100644 --- a/content/browser/browser_url_handler_impl.cc +++ b/content/browser/browser_url_handler_impl.cc @@ -4,7 +4,7 @@ #include "content/browser/browser_url_handler_impl.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "content/browser/webui/web_ui_impl.h" #include "content/public/browser/content_browser_client.h" #include "content/public/common/url_constants.h" diff --git a/content/browser/child_process_security_policy_impl.cc b/content/browser/child_process_security_policy_impl.cc index 8702b93..6a102d9 100644 --- a/content/browser/child_process_security_policy_impl.cc +++ b/content/browser/child_process_security_policy_impl.cc @@ -10,7 +10,7 @@ #include "base/metrics/histogram.h" #include "base/platform_file.h" #include "base/stl_util.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "content/browser/site_instance_impl.h" #include "content/public/browser/content_browser_client.h" #include "content/public/browser/render_process_host.h" diff --git a/content/browser/database_browsertest.cc b/content/browser/database_browsertest.cc index 9dc0af3..305d8ff 100644 --- a/content/browser/database_browsertest.cc +++ b/content/browser/database_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/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/download_manager.h" diff --git a/content/browser/devtools/devtools_http_handler_impl.cc b/content/browser/devtools/devtools_http_handler_impl.cc index f021768..bf64d52 100644 --- a/content/browser/devtools/devtools_http_handler_impl.cc +++ b/content/browser/devtools/devtools_http_handler_impl.cc @@ -15,7 +15,7 @@ #include "base/logging.h" #include "base/message_loop/message_loop_proxy.h" #include "base/stl_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.h" #include "base/values.h" diff --git a/content/browser/devtools/devtools_netlog_observer.cc b/content/browser/devtools/devtools_netlog_observer.cc index cddceef..37ca208 100644 --- a/content/browser/devtools/devtools_netlog_observer.cc +++ b/content/browser/devtools/devtools_netlog_observer.cc @@ -4,7 +4,7 @@ #include "content/browser/devtools/devtools_netlog_observer.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/values.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/content_browser_client.h" diff --git a/content/browser/devtools/devtools_protocol.cc b/content/browser/devtools/devtools_protocol.cc index 1ef3085..27f1fbe 100644 --- a/content/browser/devtools/devtools_protocol.cc +++ b/content/browser/devtools/devtools_protocol.cc @@ -6,7 +6,7 @@ #include "base/json/json_reader.h" #include "base/json/json_writer.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" namespace content { diff --git a/content/browser/devtools/renderer_overrides_handler.cc b/content/browser/devtools/renderer_overrides_handler.cc index 7b736e3..fa10624 100644 --- a/content/browser/devtools/renderer_overrides_handler.cc +++ b/content/browser/devtools/renderer_overrides_handler.cc @@ -10,7 +10,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/files/file_path.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/values.h" #include "content/browser/child_process_security_policy_impl.h" #include "content/browser/devtools/devtools_protocol_constants.h" diff --git a/content/browser/download/base_file.cc b/content/browser/download/base_file.cc index e649eed..2f479cd 100644 --- a/content/browser/download/base_file.cc +++ b/content/browser/download/base_file.cc @@ -9,7 +9,7 @@ #include "base/format_macros.h" #include "base/logging.h" #include "base/pickle.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/threading/thread_restrictions.h" #include "content/browser/download/download_interrupt_reasons_impl.h" #include "content/browser/download/download_net_log_parameters.h" diff --git a/content/browser/download/base_file_unittest.cc b/content/browser/download/base_file_unittest.cc index 1d5a25d..dab5cc2 100644 --- a/content/browser/download/base_file_unittest.cc +++ b/content/browser/download/base_file_unittest.cc @@ -8,7 +8,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/logging.h" #include "base/message_loop.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/test/test_file_util.h" #include "content/browser/browser_thread_impl.h" #include "content/public/browser/download_interrupt_reasons.h" diff --git a/content/browser/download/download_create_info.cc b/content/browser/download/download_create_info.cc index 3726125..630dab6 100644 --- a/content/browser/download/download_create_info.cc +++ b/content/browser/download/download_create_info.cc @@ -7,7 +7,7 @@ #include <string> #include "base/format_macros.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" namespace content { diff --git a/content/browser/download/download_file_unittest.cc b/content/browser/download/download_file_unittest.cc index caa0dbc..f92bb02 100644 --- a/content/browser/download/download_file_unittest.cc +++ b/content/browser/download/download_file_unittest.cc @@ -4,7 +4,7 @@ #include "base/file_util.h" #include "base/message_loop.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/test/test_file_util.h" #include "content/browser/browser_thread_impl.h" #include "content/browser/byte_stream.h" diff --git a/content/browser/download/download_item_impl.cc b/content/browser/download/download_item_impl.cc index 4a74089..e1866b7 100644 --- a/content/browser/download/download_item_impl.cc +++ b/content/browser/download/download_item_impl.cc @@ -33,7 +33,7 @@ #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/stl_util.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "content/browser/download/download_create_info.h" #include "content/browser/download/download_file.h" diff --git a/content/browser/download/download_manager_impl.cc b/content/browser/download/download_manager_impl.cc index f8c10bd..d57c239 100644 --- a/content/browser/download/download_manager_impl.cc +++ b/content/browser/download/download_manager_impl.cc @@ -13,7 +13,7 @@ #include "base/logging.h" #include "base/message_loop.h" #include "base/stl_util.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/strings/sys_string_conversions.h" #include "base/supports_user_data.h" #include "base/synchronization/lock.h" diff --git a/content/browser/download/download_manager_impl_unittest.cc b/content/browser/download/download_manager_impl_unittest.cc index 7a80284..9c50a98 100644 --- a/content/browser/download/download_manager_impl_unittest.cc +++ b/content/browser/download/download_manager_impl_unittest.cc @@ -11,8 +11,8 @@ #include "base/memory/weak_ptr.h" #include "base/message_loop.h" #include "base/stl_util.h" -#include "base/string16.h" -#include "base/string_util.h" +#include "base/strings/string16.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "content/browser/byte_stream.h" diff --git a/content/browser/download/download_net_log_parameters.cc b/content/browser/download/download_net_log_parameters.cc index 2bbf55f..87c378d 100644 --- a/content/browser/download/download_net_log_parameters.cc +++ b/content/browser/download/download_net_log_parameters.cc @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/files/file_path.h" #include "base/logging.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "content/public/browser/download_interrupt_reasons.h" #include "googleurl/src/gurl.h" diff --git a/content/browser/download/download_request_handle.cc b/content/browser/download/download_request_handle.cc index 01d2659..32c5b98 100644 --- a/content/browser/download/download_request_handle.cc +++ b/content/browser/download/download_request_handle.cc @@ -5,7 +5,7 @@ #include "content/browser/download/download_request_handle.h" #include "base/bind.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "content/browser/renderer_host/render_view_host_impl.h" #include "content/browser/web_contents/web_contents_impl.h" #include "content/public/browser/browser_context.h" diff --git a/content/browser/download/download_resource_handler.cc b/content/browser/download/download_resource_handler.cc index fbf060d..a2c3487 100644 --- a/content/browser/download/download_resource_handler.cc +++ b/content/browser/download/download_resource_handler.cc @@ -11,7 +11,7 @@ #include "base/message_loop/message_loop_proxy.h" #include "base/metrics/histogram.h" #include "base/metrics/stats_counters.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "content/browser/byte_stream.h" #include "content/browser/download/download_create_info.h" #include "content/browser/download/download_interrupt_reasons_impl.h" diff --git a/content/browser/download/download_stats.cc b/content/browser/download/download_stats.cc index 347f592..c1b251d 100644 --- a/content/browser/download/download_stats.cc +++ b/content/browser/download/download_stats.cc @@ -5,7 +5,7 @@ #include "content/browser/download/download_stats.h" #include "base/metrics/histogram.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "content/browser/download/download_resource_handler.h" #include "content/public/browser/download_interrupt_reasons.h" #include "net/http/http_content_disposition.h" diff --git a/content/browser/download/drag_download_util.cc b/content/browser/download/drag_download_util.cc index 39199e2..962023a 100644 --- a/content/browser/download/drag_download_util.cc +++ b/content/browser/download/drag_download_util.cc @@ -10,8 +10,8 @@ #include "base/file_util.h" #include "base/files/file_path.h" #include "base/memory/scoped_ptr.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/threading/thread_restrictions.h" #include "content/public/browser/browser_thread.h" diff --git a/content/browser/download/drag_download_util.h b/content/browser/download/drag_download_util.h index c6568c9..8b58f48 100644 --- a/content/browser/download/drag_download_util.h +++ b/content/browser/download/drag_download_util.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/browser/download/drag_download_file.h" #include "ui/base/dragdrop/download_file_interface.h" diff --git a/content/browser/download/save_file_manager.cc b/content/browser/download/save_file_manager.cc index 94fc4c3..06802e3 100644 --- a/content/browser/download/save_file_manager.cc +++ b/content/browser/download/save_file_manager.cc @@ -10,7 +10,7 @@ #include "base/file_util.h" #include "base/logging.h" #include "base/stl_util.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/threading/thread.h" #include "content/browser/download/save_file.h" #include "content/browser/download/save_package.h" diff --git a/content/browser/download/save_file_resource_handler.cc b/content/browser/download/save_file_resource_handler.cc index a12c6c5..91bd55c 100644 --- a/content/browser/download/save_file_resource_handler.cc +++ b/content/browser/download/save_file_resource_handler.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/logging.h" #include "base/message_loop.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "content/browser/download/save_file_manager.h" #include "content/public/browser/browser_thread.h" #include "net/base/io_buffer.h" diff --git a/content/browser/download/save_item.cc b/content/browser/download/save_item.cc index bf4d3de..9e51620 100644 --- a/content/browser/download/save_item.cc +++ b/content/browser/download/save_item.cc @@ -5,7 +5,7 @@ #include "content/browser/download/save_item.h" #include "base/logging.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "content/browser/download/save_file.h" #include "content/browser/download/save_file_manager.h" #include "content/browser/download/save_package.h" diff --git a/content/browser/download/save_package_unittest.cc b/content/browser/download/save_package_unittest.cc index 37280d3..5cda635 100644 --- a/content/browser/download/save_package_unittest.cc +++ b/content/browser/download/save_package_unittest.cc @@ -7,7 +7,7 @@ #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.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 "content/browser/download/save_package.h" #include "content/browser/renderer_host/test_render_view_host.h" diff --git a/content/browser/gamepad/gamepad_platform_data_fetcher_linux.cc b/content/browser/gamepad/gamepad_platform_data_fetcher_linux.cc index 9d98fd6..4e6b600 100644 --- a/content/browser/gamepad/gamepad_platform_data_fetcher_linux.cc +++ b/content/browser/gamepad/gamepad_platform_data_fetcher_linux.cc @@ -15,9 +15,9 @@ #include "base/debug/trace_event.h" #include "base/message_loop.h" #include "base/posix/eintr_wrapper.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/browser/udev_linux.h" diff --git a/content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm b/content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm index fd634c0..33ef74c 100644 --- a/content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm +++ b/content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm @@ -6,8 +6,8 @@ #include "base/mac/foundation_util.h" #include "base/memory/scoped_nsobject.h" -#include "base/string16.h" -#include "base/string_util.h" +#include "base/strings/string16.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/time.h" diff --git a/content/browser/gamepad/gamepad_platform_data_fetcher_win.cc b/content/browser/gamepad/gamepad_platform_data_fetcher_win.cc index 90a1b0d..7528113 100644 --- a/content/browser/gamepad/gamepad_platform_data_fetcher_win.cc +++ b/content/browser/gamepad/gamepad_platform_data_fetcher_win.cc @@ -8,9 +8,9 @@ #include <dinputd.h> #include "base/debug/trace_event.h" -#include "base/stringprintf.h" -#include "content/common/gamepad_messages.h" +#include "base/strings/stringprintf.h" #include "content/common/gamepad_hardware_buffer.h" +#include "content/common/gamepad_messages.h" // This was removed from the Windows 8 SDK for some reason. // We need it so we can get state for axes without worrying if they diff --git a/content/browser/geolocation/device_data_provider.h b/content/browser/geolocation/device_data_provider.h index c35e256..dfec6f2 100644 --- a/content/browser/geolocation/device_data_provider.h +++ b/content/browser/geolocation/device_data_provider.h @@ -28,8 +28,8 @@ #include "base/bind.h" #include "base/memory/ref_counted.h" #include "base/message_loop.h" -#include "base/string16.h" -#include "base/string_util.h" +#include "base/strings/string16.h" +#include "base/strings/string_util.h" #include "base/threading/non_thread_safe.h" #include "content/common/content_export.h" diff --git a/content/browser/geolocation/geolocation_provider_unittest.cc b/content/browser/geolocation/geolocation_provider_unittest.cc index 0ae4c1c..73a6958 100644 --- a/content/browser/geolocation/geolocation_provider_unittest.cc +++ b/content/browser/geolocation/geolocation_provider_unittest.cc @@ -7,7 +7,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/time.h" #include "content/browser/geolocation/geolocation_provider_impl.h" #include "content/browser/geolocation/location_provider.h" diff --git a/content/browser/geolocation/gps_location_provider_linux.cc b/content/browser/geolocation/gps_location_provider_linux.cc index e511e52..48e63d7 100644 --- a/content/browser/geolocation/gps_location_provider_linux.cc +++ b/content/browser/geolocation/gps_location_provider_linux.cc @@ -14,7 +14,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "content/public/common/geoposition.h" namespace content { diff --git a/content/browser/geolocation/location_arbitrator_impl.h b/content/browser/geolocation/location_arbitrator_impl.h index f4eb4e9..8d365cf 100644 --- a/content/browser/geolocation/location_arbitrator_impl.h +++ b/content/browser/geolocation/location_arbitrator_impl.h @@ -7,7 +7,7 @@ #include "base/callback_forward.h" #include "base/memory/scoped_vector.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/time.h" #include "content/browser/geolocation/location_arbitrator.h" #include "content/browser/geolocation/location_provider.h" diff --git a/content/browser/geolocation/location_provider.h b/content/browser/geolocation/location_provider.h index 67b124a..944fa16 100644 --- a/content/browser/geolocation/location_provider.h +++ b/content/browser/geolocation/location_provider.h @@ -14,7 +14,7 @@ #include <map> -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/threading/non_thread_safe.h" #include "content/common/content_export.h" diff --git a/content/browser/geolocation/network_location_provider.h b/content/browser/geolocation/network_location_provider.h index 21023ae..3385abb 100644 --- a/content/browser/geolocation/network_location_provider.h +++ b/content/browser/geolocation/network_location_provider.h @@ -11,7 +11,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/threading/thread.h" #include "content/browser/geolocation/device_data_provider.h" #include "content/browser/geolocation/location_provider.h" diff --git a/content/browser/geolocation/network_location_provider_unittest.cc b/content/browser/geolocation/network_location_provider_unittest.cc index b8b49da..e905fd2 100644 --- a/content/browser/geolocation/network_location_provider_unittest.cc +++ b/content/browser/geolocation/network_location_provider_unittest.cc @@ -5,9 +5,9 @@ #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/memory/scoped_ptr.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 "base/values.h" #include "content/browser/geolocation/fake_access_token_store.h" diff --git a/content/browser/geolocation/network_location_request.cc b/content/browser/geolocation/network_location_request.cc index 8fef967..519728a 100644 --- a/content/browser/geolocation/network_location_request.cc +++ b/content/browser/geolocation/network_location_request.cc @@ -10,7 +10,7 @@ #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/metrics/histogram.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "content/browser/geolocation/location_arbitrator_impl.h" diff --git a/content/browser/geolocation/wifi_data_provider_chromeos_unittest.cc b/content/browser/geolocation/wifi_data_provider_chromeos_unittest.cc index 1cf6e5d..492cefd 100644 --- a/content/browser/geolocation/wifi_data_provider_chromeos_unittest.cc +++ b/content/browser/geolocation/wifi_data_provider_chromeos_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 "base/strings/utf_string_conversions.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/shill_manager_client.h" diff --git a/content/browser/geolocation/wifi_data_provider_common.cc b/content/browser/geolocation/wifi_data_provider_common.cc index 2b7f555..2642176 100644 --- a/content/browser/geolocation/wifi_data_provider_common.cc +++ b/content/browser/geolocation/wifi_data_provider_common.cc @@ -5,7 +5,7 @@ #include "content/browser/geolocation/wifi_data_provider_common.h" #include "base/bind.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" namespace content { diff --git a/content/browser/geolocation/wifi_data_provider_common.h b/content/browser/geolocation/wifi_data_provider_common.h index 7b46ce8..e4bed57 100644 --- a/content/browser/geolocation/wifi_data_provider_common.h +++ b/content/browser/geolocation/wifi_data_provider_common.h @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/threading/thread.h" #include "content/browser/geolocation/device_data_provider.h" #include "content/common/content_export.h" diff --git a/content/browser/geolocation/wifi_data_provider_common_unittest.cc b/content/browser/geolocation/wifi_data_provider_common_unittest.cc index 25b47bf..9d1b9fbc 100644 --- a/content/browser/geolocation/wifi_data_provider_common_unittest.cc +++ b/content/browser/geolocation/wifi_data_provider_common_unittest.cc @@ -5,7 +5,7 @@ #include <vector> #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 "base/third_party/dynamic_annotations/dynamic_annotations.h" #include "content/browser/geolocation/wifi_data_provider_common.h" diff --git a/content/browser/geolocation/wifi_data_provider_linux.cc b/content/browser/geolocation/wifi_data_provider_linux.cc index 096258e..edece1d 100644 --- a/content/browser/geolocation/wifi_data_provider_linux.cc +++ b/content/browser/geolocation/wifi_data_provider_linux.cc @@ -9,7 +9,7 @@ #include "content/browser/geolocation/wifi_data_provider_linux.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 "dbus/bus.h" #include "dbus/message.h" diff --git a/content/browser/gpu/gpu_data_manager_impl_private.cc b/content/browser/gpu/gpu_data_manager_impl_private.cc index 3621a7fe..4c40d2c 100644 --- a/content/browser/gpu/gpu_data_manager_impl_private.cc +++ b/content/browser/gpu/gpu_data_manager_impl_private.cc @@ -10,8 +10,8 @@ #include "base/debug/trace_event.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" -#include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/stringprintf.h" #include "base/sys_info.h" #include "base/version.h" #include "cc/base/switches.h" diff --git a/content/browser/gpu/gpu_internals_ui.cc b/content/browser/gpu/gpu_internals_ui.cc index d628863..4c1d355 100644 --- a/content/browser/gpu/gpu_internals_ui.cc +++ b/content/browser/gpu/gpu_internals_ui.cc @@ -10,8 +10,8 @@ #include "base/bind_helpers.h" #include "base/command_line.h" #include "base/i18n/time_formatting.h" -#include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/stringprintf.h" #include "base/sys_info.h" #include "base/values.h" #include "cc/base/switches.h" diff --git a/content/browser/gpu/gpu_pixel_browsertest.cc b/content/browser/gpu/gpu_pixel_browsertest.cc index f7f2254..7bbc56a 100644 --- a/content/browser/gpu/gpu_pixel_browsertest.cc +++ b/content/browser/gpu/gpu_pixel_browsertest.cc @@ -7,9 +7,9 @@ #include "base/files/file_enumerator.h" #include "base/files/file_path.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 "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" diff --git a/content/browser/gpu/gpu_process_host_ui_shim.cc b/content/browser/gpu/gpu_process_host_ui_shim.cc index 488a979..6d822b4 100644 --- a/content/browser/gpu/gpu_process_host_ui_shim.cc +++ b/content/browser/gpu/gpu_process_host_ui_shim.cc @@ -8,11 +8,11 @@ #include "base/bind.h" #include "base/command_line.h" +#include "base/debug/trace_event.h" #include "base/id_map.h" #include "base/lazy_instance.h" #include "base/process_util.h" -#include "base/string_number_conversions.h" -#include "base/debug/trace_event.h" +#include "base/strings/string_number_conversions.h" #include "content/browser/gpu/gpu_data_manager_impl.h" #include "content/browser/gpu/gpu_process_host.h" #include "content/browser/gpu/gpu_surface_tracker.h" diff --git a/content/browser/hyphenator/hyphenator_message_filter.cc b/content/browser/hyphenator/hyphenator_message_filter.cc index e14233a..5e580d8 100644 --- a/content/browser/hyphenator/hyphenator_message_filter.cc +++ b/content/browser/hyphenator/hyphenator_message_filter.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/logging.h" #include "base/path_service.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "content/browser/hyphenator/hyphenator_message_filter.h" #include "content/common/hyphenator_messages.h" #include "content/public/browser/browser_thread.h" diff --git a/content/browser/hyphenator/hyphenator_message_filter_unittest.cc b/content/browser/hyphenator/hyphenator_message_filter_unittest.cc index 6a3dc4f..e62210d 100644 --- a/content/browser/hyphenator/hyphenator_message_filter_unittest.cc +++ b/content/browser/hyphenator/hyphenator_message_filter_unittest.cc @@ -7,7 +7,7 @@ #include "base/base_paths.h" #include "base/files/file_path.h" #include "base/path_service.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" #include "content/common/hyphenator_messages.h" #include "content/public/test/mock_render_process_host.h" diff --git a/content/browser/indexed_db/indexed_db_backing_store_unittest.cc b/content/browser/indexed_db/indexed_db_backing_store_unittest.cc index 114b842..8058b2f 100644 --- a/content/browser/indexed_db/indexed_db_backing_store_unittest.cc +++ b/content/browser/indexed_db/indexed_db_backing_store_unittest.cc @@ -7,7 +7,7 @@ #include "base/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/logging.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" #include "content/browser/indexed_db/indexed_db_factory.h" #include "content/browser/indexed_db/indexed_db_leveldb_coding.h" diff --git a/content/browser/indexed_db/indexed_db_cleanup_on_io_error_unittest.cc b/content/browser/indexed_db/indexed_db_cleanup_on_io_error_unittest.cc index 25ebfc7..244ed5e 100644 --- a/content/browser/indexed_db/indexed_db_cleanup_on_io_error_unittest.cc +++ b/content/browser/indexed_db/indexed_db_cleanup_on_io_error_unittest.cc @@ -4,7 +4,7 @@ #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" #include "content/browser/indexed_db/indexed_db_backing_store.h" #include "content/browser/indexed_db/leveldb/leveldb_database.h" diff --git a/content/browser/indexed_db/indexed_db_context_impl.cc b/content/browser/indexed_db/indexed_db_context_impl.cc index 19408d2..b9ee4f8 100644 --- a/content/browser/indexed_db/indexed_db_context_impl.cc +++ b/content/browser/indexed_db/indexed_db_context_impl.cc @@ -12,7 +12,7 @@ #include "base/files/file_enumerator.h" #include "base/logging.h" #include "base/message_loop/message_loop_proxy.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "content/browser/indexed_db/indexed_db_quota_client.h" #include "content/browser/indexed_db/webidbdatabase_impl.h" diff --git a/content/browser/indexed_db/indexed_db_database_callbacks_wrapper.h b/content/browser/indexed_db/indexed_db_database_callbacks_wrapper.h index 7683123..e9b85c6 100644 --- a/content/browser/indexed_db/indexed_db_database_callbacks_wrapper.h +++ b/content/browser/indexed_db/indexed_db_database_callbacks_wrapper.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "content/browser/indexed_db/indexed_db_database_error.h" #include "content/common/content_export.h" diff --git a/content/browser/indexed_db/indexed_db_database_error.h b/content/browser/indexed_db/indexed_db_database_error.h index 2a56d76..3f5eef5 100644 --- a/content/browser/indexed_db/indexed_db_database_error.h +++ b/content/browser/indexed_db/indexed_db_database_error.h @@ -6,7 +6,7 @@ #define CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_DATABASE_ERROR_H_ #include "base/basictypes.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" #include "third_party/WebKit/public/platform/WebIDBDatabaseError.h" diff --git a/content/browser/indexed_db/indexed_db_database_unittest.cc b/content/browser/indexed_db/indexed_db_database_unittest.cc index e78aafe..175131a 100644 --- a/content/browser/indexed_db/indexed_db_database_unittest.cc +++ b/content/browser/indexed_db/indexed_db_database_unittest.cc @@ -8,7 +8,7 @@ #include "base/auto_reset.h" #include "base/logging.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" #include "content/browser/in_process_webkit/indexed_db_database_callbacks.h" #include "content/browser/indexed_db/indexed_db.h" diff --git a/content/browser/indexed_db/indexed_db_factory.h b/content/browser/indexed_db/indexed_db_factory.h index 6844571..64eeb22 100644 --- a/content/browser/indexed_db/indexed_db_factory.h +++ b/content/browser/indexed_db/indexed_db_factory.h @@ -12,7 +12,7 @@ #include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "content/browser/indexed_db/indexed_db_callbacks_wrapper.h" #include "content/browser/indexed_db/indexed_db_database_callbacks_wrapper.h" #include "content/browser/indexed_db/indexed_db_factory.h" diff --git a/content/browser/indexed_db/indexed_db_leveldb_coding.cc b/content/browser/indexed_db/indexed_db_leveldb_coding.cc index 84258b8..1683ea5 100644 --- a/content/browser/indexed_db/indexed_db_leveldb_coding.cc +++ b/content/browser/indexed_db/indexed_db_leveldb_coding.cc @@ -9,7 +9,7 @@ #include <string> #include "base/logging.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/sys_byteorder.h" #include "content/browser/indexed_db/leveldb/leveldb_slice.h" #include "content/common/indexed_db/indexed_db_key.h" diff --git a/content/browser/indexed_db/indexed_db_leveldb_coding.h b/content/browser/indexed_db/indexed_db_leveldb_coding.h index 80f35d1..f40531c 100644 --- a/content/browser/indexed_db/indexed_db_leveldb_coding.h +++ b/content/browser/indexed_db/indexed_db_leveldb_coding.h @@ -11,7 +11,7 @@ #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/strings/string_piece.h" #include "content/common/indexed_db/indexed_db_key.h" #include "content/common/indexed_db/indexed_db_key_path.h" diff --git a/content/browser/indexed_db/indexed_db_leveldb_coding_unittest.cc b/content/browser/indexed_db/indexed_db_leveldb_coding_unittest.cc index 13c3300..f54b198 100644 --- a/content/browser/indexed_db/indexed_db_leveldb_coding_unittest.cc +++ b/content/browser/indexed_db/indexed_db_leveldb_coding_unittest.cc @@ -9,7 +9,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/strings/string_piece.h" #include "base/strings/utf_string_conversions.h" #include "content/browser/indexed_db/leveldb/leveldb_slice.h" diff --git a/content/browser/indexed_db/indexed_db_metadata.h b/content/browser/indexed_db/indexed_db_metadata.h index 29f6a9f..4e8562d 100644 --- a/content/browser/indexed_db/indexed_db_metadata.h +++ b/content/browser/indexed_db/indexed_db_metadata.h @@ -8,7 +8,7 @@ #include <map> #include "base/basictypes.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "content/common/indexed_db/indexed_db_key_path.h" namespace content { diff --git a/content/browser/indexed_db/leveldb/leveldb_comparator.h b/content/browser/indexed_db/leveldb/leveldb_comparator.h index 920d97e..1a80410 100644 --- a/content/browser/indexed_db/leveldb/leveldb_comparator.h +++ b/content/browser/indexed_db/leveldb/leveldb_comparator.h @@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_INDEXED_DB_LEVELDB_LEVELDB_COMPARATOR_H_ #define CONTENT_BROWSER_INDEXED_DB_LEVELDB_LEVELDB_COMPARATOR_H_ -#include "base/string16.h" +#include "base/strings/string16.h" namespace content { diff --git a/content/browser/indexed_db/leveldb/leveldb_database.cc b/content/browser/indexed_db/leveldb/leveldb_database.cc index fd9fea8..6fedec1 100644 --- a/content/browser/indexed_db/leveldb/leveldb_database.cc +++ b/content/browser/indexed_db/leveldb/leveldb_database.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" #include "base/sys_info.h" #include "content/browser/indexed_db/leveldb/leveldb_comparator.h" diff --git a/content/browser/indexed_db/leveldb/leveldb_database.h b/content/browser/indexed_db/leveldb/leveldb_database.h index edb6f05..6de2e6e 100644 --- a/content/browser/indexed_db/leveldb/leveldb_database.h +++ b/content/browser/indexed_db/leveldb/leveldb_database.h @@ -10,7 +10,7 @@ #include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "content/common/content_export.h" namespace leveldb { diff --git a/content/browser/indexed_db/leveldb/leveldb_unittest.cc b/content/browser/indexed_db/leveldb/leveldb_unittest.cc index 26b860f..75570a4 100644 --- a/content/browser/indexed_db/leveldb/leveldb_unittest.cc +++ b/content/browser/indexed_db/leveldb/leveldb_unittest.cc @@ -9,7 +9,7 @@ #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/platform_file.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "content/browser/indexed_db/leveldb/leveldb_comparator.h" #include "content/browser/indexed_db/leveldb/leveldb_database.h" #include "content/browser/indexed_db/leveldb/leveldb_iterator.h" |