From 906265870c8a3cc44ebbcad14eaea84559a49aed Mon Sep 17 00:00:00 2001 From: "avi@chromium.org" Date: Fri, 7 Jun 2013 22:40:45 +0000 Subject: Use a direct include of utf_string_conversions.h in google_apis/, gpu/, ipc/, media/, ppapi/, printing/, remoting/, rlz/, skia/, sql/, sync/, third_party/, tools/, webkit/, win8/. BUG=none TEST=none TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/15995038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204967 0039d316-1c4b-4281-b951-d872f2087c98 --- google_apis/gaia/oauth2_mint_token_flow.cc | 2 +- google_apis/gaia/oauth2_mint_token_flow_unittest.cc | 2 +- gpu/config/gpu_dx_diagnostics_win.cc | 2 +- gpu/demos/framework/window_linux.cc | 2 +- ipc/ipc_channel_win.cc | 2 +- ipc/ipc_message_utils.cc | 2 +- media/audio/win/audio_device_listener_win.cc | 2 +- media/audio/win/audio_device_listener_win_unittest.cc | 2 +- media/audio/win/audio_low_latency_input_win.cc | 2 +- media/audio/win/audio_low_latency_output_win.cc | 2 +- media/audio/win/core_audio_util_win.cc | 2 +- media/audio/win/device_enumeration_win.cc | 2 +- media/filters/file_data_source_unittest.cc | 2 +- media/test/ffmpeg_tests/ffmpeg_tests.cc | 2 +- media/tools/media_bench/media_bench.cc | 2 +- ppapi/proxy/browser_font_resource_trusted.cc | 2 +- ppapi/proxy/pdf_resource_unittest.cc | 2 +- printing/backend/print_backend_unittest.cc | 2 +- printing/backend/print_backend_win.cc | 2 +- printing/backend/win_helper.cc | 2 +- printing/print_settings_initializer.cc | 2 +- printing/print_settings_initializer_gtk.cc | 2 +- printing/printed_document.cc | 2 +- printing/printing_context_win.cc | 2 +- remoting/base/breakpad_win.cc | 4 ++-- remoting/base/breakpad_win_unittest.cc | 2 +- remoting/host/clipboard_win.cc | 2 +- remoting/host/continue_window_gtk.cc | 2 +- remoting/host/continue_window_win.cc | 2 +- remoting/host/daemon_process_win.cc | 2 +- remoting/host/desktop_session_win.cc | 2 +- remoting/host/disconnect_window_gtk.cc | 2 +- remoting/host/disconnect_window_mac.h | 2 +- remoting/host/disconnect_window_win.cc | 2 +- remoting/host/host_event_logger_win.cc | 2 +- remoting/host/host_main.cc | 2 +- remoting/host/ipc_util_win.cc | 2 +- remoting/host/plugin/host_script_object.cc | 2 +- remoting/host/policy_hack/policy_watcher_win.cc | 2 +- remoting/host/remoting_me2me_host.cc | 2 +- remoting/host/sas_injector_win.cc | 2 +- remoting/host/setup/daemon_controller_win.cc | 2 +- remoting/host/setup/daemon_installer_win.cc | 2 +- remoting/host/setup/win/auth_code_getter.cc | 2 +- remoting/host/setup/win/start_host_window.cc | 2 +- remoting/host/ui_strings.cc | 2 +- remoting/host/verify_config_window_win.cc | 2 +- remoting/host/win/elevated_controller.cc | 4 ++-- remoting/host/win/host_service.cc | 2 +- remoting/host/win/launch_process_with_token.cc | 2 +- remoting/host/win/message_window.cc | 2 +- remoting/host/win/rdp_client_window.cc | 2 +- remoting/host/win/security_descriptor.cc | 2 +- remoting/host/win/unprivileged_process_delegate.cc | 2 +- remoting/host/win/wts_session_process_delegate.cc | 2 +- remoting/host/win/wts_terminal_monitor.cc | 2 +- rlz/lib/financial_ping.cc | 2 +- rlz/lib/financial_ping_test.cc | 2 +- rlz/lib/machine_id_unittest.cc | 2 +- rlz/lib/string_utils_unittest.cc | 2 +- rlz/mac/lib/machine_id_mac.cc | 2 +- rlz/win/lib/registry_util.cc | 2 +- rlz/win/lib/rlz_value_store_registry.cc | 4 ++-- skia/ext/image_operations_bench.cc | 2 +- skia/ext/vector_canvas_unittest.cc | 2 +- sql/connection.cc | 2 +- sql/statement.cc | 2 +- sync/internal_api/base_node.cc | 2 +- sync/internal_api/sync_manager_impl_unittest.cc | 2 +- sync/internal_api/write_node.cc | 2 +- sync/util/time.cc | 2 +- third_party/leveldatabase/env_chromium.cc | 2 +- third_party/zlib/google/zip_internal.cc | 2 +- third_party/zlib/google/zip_reader.cc | 2 +- third_party/zlib/google/zip_reader_unittest.cc | 2 +- tools/imagediff/image_diff.cc | 2 +- tools/memory_watcher/memory_watcher.cc | 2 +- webkit/base/file_path_string_conversions.cc | 2 +- webkit/base/origin_url_conversions.cc | 2 +- webkit/browser/appcache/appcache_database.cc | 2 +- webkit/browser/appcache/manifest_parser.cc | 2 +- webkit/browser/appcache/view_appcache_internals_job.cc | 2 +- webkit/browser/blob/view_blob_internals_job.cc | 2 +- webkit/browser/chromeos/fileapi/cros_mount_point_provider.cc | 2 +- webkit/browser/chromeos/fileapi/remote_file_system_operation.cc | 2 +- webkit/browser/database/database_quota_client_unittest.cc | 2 +- webkit/browser/database/database_tracker.cc | 2 +- webkit/browser/database/database_tracker_unittest.cc | 2 +- webkit/browser/database/database_util.cc | 2 +- webkit/browser/database/database_util_unittest.cc | 2 +- webkit/browser/database/databases_table.cc | 2 +- webkit/browser/database/databases_table_unittest.cc | 2 +- webkit/browser/dom_storage/dom_storage_area.cc | 2 +- webkit/browser/dom_storage/dom_storage_area_unittest.cc | 2 +- webkit/browser/dom_storage/dom_storage_context_unittest.cc | 2 +- webkit/browser/dom_storage/dom_storage_database_unittest.cc | 2 +- webkit/browser/dom_storage/session_storage_database.cc | 4 ++-- webkit/browser/dom_storage/session_storage_database_unittest.cc | 2 +- webkit/browser/fileapi/file_system_dir_url_request_job.cc | 2 +- webkit/browser/fileapi/file_system_dir_url_request_job_unittest.cc | 2 +- webkit/browser/fileapi/file_system_url_request_job_unittest.cc | 2 +- webkit/browser/fileapi/local_file_system_operation.cc | 2 +- webkit/browser/fileapi/local_file_util_unittest.cc | 2 +- webkit/browser/fileapi/obfuscated_file_util.cc | 2 +- webkit/common/blob/blob_data.cc | 2 +- webkit/common/database/database_connections_unittest.cc | 2 +- webkit/common/dom_storage/dom_storage_map_unittest.cc | 2 +- webkit/common/fileapi/file_system_util.cc | 2 +- webkit/common/webdropdata.cc | 2 +- webkit/common/webpreferences.cc | 2 +- webkit/glue/ftp_directory_listing_response_delegate.cc | 2 +- webkit/glue/glue_serialize_deprecated.cc | 2 +- webkit/glue/simple_webmimeregistry_impl.cc | 2 +- webkit/glue/webclipboard_impl.cc | 2 +- webkit/glue/webkit_glue.cc | 2 +- webkit/glue/webkitplatformsupport_impl.cc | 2 +- webkit/plugins/npapi/plugin_host.cc | 2 +- webkit/plugins/npapi/plugin_instance.cc | 4 ++-- webkit/plugins/npapi/plugin_lib_unittest.cc | 2 +- webkit/plugins/npapi/plugin_list.cc | 2 +- webkit/plugins/npapi/plugin_list_mac.mm | 2 +- webkit/plugins/npapi/plugin_list_posix.cc | 2 +- webkit/plugins/npapi/plugin_list_unittest.cc | 2 +- webkit/plugins/npapi/plugin_stream.cc | 4 ++-- webkit/plugins/npapi/plugin_utils_unittest.cc | 2 +- webkit/plugins/npapi/test/plugin_geturl_test.cc | 2 +- webkit/plugins/npapi/webplugin_delegate_impl_mac.mm | 2 +- webkit/plugins/npapi/webplugin_ime_win.cc | 2 +- webkit/plugins/npapi/webplugin_impl.cc | 2 +- webkit/plugins/ppapi/event_conversion.cc | 2 +- webkit/plugins/ppapi/host_globals.cc | 2 +- webkit/plugins/ppapi/ppapi_plugin_instance.cc | 2 +- webkit/plugins/ppapi/ppb_file_ref_impl.cc | 2 +- webkit/plugins/ppapi/ppb_graphics_3d_impl.cc | 2 +- webkit/plugins/webplugininfo.cc | 2 +- webkit/renderer/cpp_bound_class.cc | 2 +- webkit/renderer/cpp_variant.cc | 2 +- webkit/renderer/dom_storage/dom_storage_cached_area_unittest.cc | 2 +- webkit/renderer/fileapi/webfilewriter_base_unittest.cc | 2 +- webkit/renderer/webpreferences_renderer.cc | 2 +- webkit/support/mock_webclipboard_impl.cc | 2 +- webkit/support/platform_support_mac.mm | 2 +- webkit/support/simple_database_system.cc | 2 +- webkit/support/simple_file_system.cc | 2 +- webkit/support/simple_socket_stream_bridge.cc | 2 +- webkit/support/test_webkit_platform_support.cc | 2 +- webkit/support/webkit_support.cc | 2 +- win8/delegate_execute/chrome_util.cc | 2 +- win8/delegate_execute/command_execute_impl.cc | 2 +- win8/delegate_execute/delegate_execute_util_unittest.cc | 2 +- win8/metro_driver/secondary_tile.cc | 2 +- win8/metro_driver/toast_notification_handler.cc | 2 +- 152 files changed, 158 insertions(+), 158 deletions(-) diff --git a/google_apis/gaia/oauth2_mint_token_flow.cc b/google_apis/gaia/oauth2_mint_token_flow.cc index 3aee16d..24abb9a 100644 --- a/google_apis/gaia/oauth2_mint_token_flow.cc +++ b/google_apis/gaia/oauth2_mint_token_flow.cc @@ -15,7 +15,7 @@ #include "base/string_util.h" #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "google_apis/gaia/gaia_urls.h" #include "google_apis/gaia/google_service_auth_error.h" diff --git a/google_apis/gaia/oauth2_mint_token_flow_unittest.cc b/google_apis/gaia/oauth2_mint_token_flow_unittest.cc index 48a9ff1..7cd3d67 100644 --- a/google_apis/gaia/oauth2_mint_token_flow_unittest.cc +++ b/google_apis/gaia/oauth2_mint_token_flow_unittest.cc @@ -9,7 +9,7 @@ #include "base/json/json_reader.h" #include "base/memory/scoped_ptr.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "google_apis/gaia/google_service_auth_error.h" #include "google_apis/gaia/oauth2_mint_token_flow.h" diff --git a/gpu/config/gpu_dx_diagnostics_win.cc b/gpu/config/gpu_dx_diagnostics_win.cc index ed2fc91..04791e6 100644 --- a/gpu/config/gpu_dx_diagnostics_win.cc +++ b/gpu/config/gpu_dx_diagnostics_win.cc @@ -10,7 +10,7 @@ #include #include "base/string_number_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/win/scoped_com_initializer.h" #include "gpu/config/gpu_info_collector.h" diff --git a/gpu/demos/framework/window_linux.cc b/gpu/demos/framework/window_linux.cc index 552bb97..6a447f5 100644 --- a/gpu/demos/framework/window_linux.cc +++ b/gpu/demos/framework/window_linux.cc @@ -7,7 +7,7 @@ #include #include -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" namespace { using gpu::demos::Window; diff --git a/ipc/ipc_channel_win.cc b/ipc/ipc_channel_win.cc index 8963707..21b1cec 100644 --- a/ipc/ipc_channel_win.cc +++ b/ipc/ipc_channel_win.cc @@ -14,8 +14,8 @@ #include "base/process_util.h" #include "base/rand_util.h" #include "base/string_number_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/threading/thread_checker.h" -#include "base/utf_string_conversions.h" #include "base/win/scoped_handle.h" #include "ipc/ipc_listener.h" #include "ipc/ipc_logging.h" diff --git a/ipc/ipc_message_utils.cc b/ipc/ipc_message_utils.cc index ea79176..c05d9df 100644 --- a/ipc/ipc_message_utils.cc +++ b/ipc/ipc_message_utils.cc @@ -9,8 +9,8 @@ #include "base/memory/scoped_ptr.h" #include "base/nullable_string16.h" #include "base/string_number_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "base/values.h" #include "ipc/ipc_channel_handle.h" diff --git a/media/audio/win/audio_device_listener_win.cc b/media/audio/win/audio_device_listener_win.cc index 5f0038f..8734cf2 100644 --- a/media/audio/win/audio_device_listener_win.cc +++ b/media/audio/win/audio_device_listener_win.cc @@ -7,8 +7,8 @@ #include #include "base/logging.h" +#include "base/strings/utf_string_conversions.h" #include "base/system_monitor/system_monitor.h" -#include "base/utf_string_conversions.h" #include "base/win/scoped_co_mem.h" #include "base/win/windows_version.h" #include "media/audio/audio_util.h" diff --git a/media/audio/win/audio_device_listener_win_unittest.cc b/media/audio/win/audio_device_listener_win_unittest.cc index 3f84a52..3076fff 100644 --- a/media/audio/win/audio_device_listener_win_unittest.cc +++ b/media/audio/win/audio_device_listener_win_unittest.cc @@ -7,8 +7,8 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/memory/scoped_ptr.h" +#include "base/strings/utf_string_conversions.h" #include "base/win/scoped_com_initializer.h" -#include "base/utf_string_conversions.h" #include "media/audio/audio_manager.h" #include "media/audio/win/audio_device_listener_win.h" #include "media/audio/win/core_audio_util_win.h" diff --git a/media/audio/win/audio_low_latency_input_win.cc b/media/audio/win/audio_low_latency_input_win.cc index a57a1cb..e081943 100644 --- a/media/audio/win/audio_low_latency_input_win.cc +++ b/media/audio/win/audio_low_latency_input_win.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "media/audio/audio_util.h" #include "media/audio/win/audio_manager_win.h" #include "media/audio/win/avrt_wrapper_win.h" diff --git a/media/audio/win/audio_low_latency_output_win.cc b/media/audio/win/audio_low_latency_output_win.cc index 8a909d0..b2098b0 100644 --- a/media/audio/win/audio_low_latency_output_win.cc +++ b/media/audio/win/audio_low_latency_output_win.cc @@ -11,7 +11,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/win/scoped_propvariant.h" #include "media/audio/win/audio_manager_win.h" #include "media/audio/win/avrt_wrapper_win.h" diff --git a/media/audio/win/core_audio_util_win.cc b/media/audio/win/core_audio_util_win.cc index a526065..0ad773a 100644 --- a/media/audio/win/core_audio_util_win.cc +++ b/media/audio/win/core_audio_util_win.cc @@ -10,7 +10,7 @@ #include "base/command_line.h" #include "base/logging.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/win/scoped_co_mem.h" #include "base/win/scoped_handle.h" #include "base/win/scoped_propvariant.h" diff --git a/media/audio/win/device_enumeration_win.cc b/media/audio/win/device_enumeration_win.cc index be11b31..36ed291 100644 --- a/media/audio/win/device_enumeration_win.cc +++ b/media/audio/win/device_enumeration_win.cc @@ -9,7 +9,7 @@ #include "media/audio/win/audio_manager_win.h" #include "base/logging.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/win/scoped_co_mem.h" #include "base/win/scoped_comptr.h" #include "base/win/scoped_propvariant.h" diff --git a/media/filters/file_data_source_unittest.cc b/media/filters/file_data_source_unittest.cc index e68b850..f6c9b89 100644 --- a/media/filters/file_data_source_unittest.cc +++ b/media/filters/file_data_source_unittest.cc @@ -8,7 +8,7 @@ #include "base/bind.h" #include "base/files/file_path.h" #include "base/path_service.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "media/base/mock_data_source_host.h" #include "media/base/test_helpers.h" #include "media/filters/file_data_source.h" diff --git a/media/test/ffmpeg_tests/ffmpeg_tests.cc b/media/test/ffmpeg_tests/ffmpeg_tests.cc index 222c987..fe3b628 100644 --- a/media/test/ffmpeg_tests/ffmpeg_tests.cc +++ b/media/test/ffmpeg_tests/ffmpeg_tests.cc @@ -20,8 +20,8 @@ #include "base/md5.h" #include "base/path_service.h" #include "base/string_util.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "media/base/djb2.h" #include "media/base/media.h" #include "media/ffmpeg/ffmpeg_common.h" diff --git a/media/tools/media_bench/media_bench.cc b/media/tools/media_bench/media_bench.cc index d4e4c4f..6ea1ff6 100644 --- a/media/tools/media_bench/media_bench.cc +++ b/media/tools/media_bench/media_bench.cc @@ -22,8 +22,8 @@ #include "base/path_service.h" #include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "build/build_config.h" #include "media/base/djb2.h" #include "media/base/media.h" diff --git a/ppapi/proxy/browser_font_resource_trusted.cc b/ppapi/proxy/browser_font_resource_trusted.cc index e11f14a..aec17f1 100644 --- a/ppapi/proxy/browser_font_resource_trusted.cc +++ b/ppapi/proxy/browser_font_resource_trusted.cc @@ -5,7 +5,7 @@ #include "ppapi/proxy/browser_font_resource_trusted.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "ppapi/c/dev/ppb_font_dev.h" #include "ppapi/shared_impl/ppapi_preferences.h" #include "ppapi/shared_impl/var.h" diff --git a/ppapi/proxy/pdf_resource_unittest.cc b/ppapi/proxy/pdf_resource_unittest.cc index cad6907..14b7d33 100644 --- a/ppapi/proxy/pdf_resource_unittest.cc +++ b/ppapi/proxy/pdf_resource_unittest.cc @@ -4,7 +4,7 @@ #include -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "ppapi/c/dev/ppb_memory_dev.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_image_data.h" diff --git a/printing/backend/print_backend_unittest.cc b/printing/backend/print_backend_unittest.cc index 5575035..356a346 100644 --- a/printing/backend/print_backend_unittest.cc +++ b/printing/backend/print_backend_unittest.cc @@ -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/strings/utf_string_conversions.h" #include "printing/backend/print_backend.h" -#include "base/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" namespace printing { diff --git a/printing/backend/print_backend_win.cc b/printing/backend/print_backend_win.cc index 14d87aa..521207b 100644 --- a/printing/backend/print_backend_win.cc +++ b/printing/backend/print_backend_win.cc @@ -9,7 +9,7 @@ #include "base/memory/scoped_ptr.h" #include "base/strings/string_piece.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/win/scoped_bstr.h" #include "base/win/scoped_comptr.h" #include "base/win/scoped_hglobal.h" diff --git a/printing/backend/win_helper.cc b/printing/backend/win_helper.cc index 5a59220..3832dff 100644 --- a/printing/backend/win_helper.cc +++ b/printing/backend/win_helper.cc @@ -10,7 +10,7 @@ #include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "printing/backend/print_backend.h" #include "printing/backend/print_backend_consts.h" #include "printing/backend/printing_info_win.h" diff --git a/printing/print_settings_initializer.cc b/printing/print_settings_initializer.cc index c49a556..ed5ba07 100644 --- a/printing/print_settings_initializer.cc +++ b/printing/print_settings_initializer.cc @@ -10,8 +10,8 @@ #include "base/i18n/time_formatting.h" #include "base/string_number_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "base/values.h" #include "googleurl/src/gurl.h" #include "printing/print_job_constants.h" diff --git a/printing/print_settings_initializer_gtk.cc b/printing/print_settings_initializer_gtk.cc index 92316a6..60f60ce 100644 --- a/printing/print_settings_initializer_gtk.cc +++ b/printing/print_settings_initializer_gtk.cc @@ -8,7 +8,7 @@ #include #include "base/string16.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "printing/print_settings.h" #include "printing/units.h" diff --git a/printing/printed_document.cc b/printing/printed_document.cc index 17e4c35..052a78c 100644 --- a/printing/printed_document.cc +++ b/printing/printed_document.cc @@ -17,7 +17,7 @@ #include "base/message_loop.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "printing/page_number.h" #include "printing/printed_page.h" #include "printing/printed_pages_source.h" diff --git a/printing/printing_context_win.cc b/printing/printing_context_win.cc index e5e6151..b5a57cf 100644 --- a/printing/printing_context_win.cc +++ b/printing/printing_context_win.cc @@ -12,8 +12,8 @@ #include "base/i18n/time_formatting.h" #include "base/message_loop.h" #include "base/metrics/histogram.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "base/values.h" #include "base/win/metro.h" #include "printing/backend/print_backend.h" diff --git a/remoting/base/breakpad_win.cc b/remoting/base/breakpad_win.cc index d083ceed..7c6af9a 100644 --- a/remoting/base/breakpad_win.cc +++ b/remoting/base/breakpad_win.cc @@ -16,12 +16,12 @@ #include #include "base/atomicops.h" -#include "base/logging.h" #include "base/file_version_info.h" #include "base/lazy_instance.h" +#include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/process_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/win/wrapped_window_proc.h" #include "breakpad/src/client/windows/handler/exception_handler.h" diff --git a/remoting/base/breakpad_win_unittest.cc b/remoting/base/breakpad_win_unittest.cc index ea85280..856c43e 100644 --- a/remoting/base/breakpad_win_unittest.cc +++ b/remoting/base/breakpad_win_unittest.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "breakpad/src/client/windows/crash_generation/client_info.h" #include "breakpad/src/client/windows/crash_generation/crash_generation_server.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/remoting/host/clipboard_win.cc b/remoting/host/clipboard_win.cc index 419316a4..8d94aa1 100644 --- a/remoting/host/clipboard_win.cc +++ b/remoting/host/clipboard_win.cc @@ -11,8 +11,8 @@ #include "base/logging.h" #include "base/process_util.h" #include "base/string16.h" +#include "base/strings/utf_string_conversions.h" #include "base/threading/platform_thread.h" -#include "base/utf_string_conversions.h" #include "base/win/scoped_hglobal.h" #include "base/win/windows_version.h" #include "base/win/wrapped_window_proc.h" diff --git a/remoting/host/continue_window_gtk.cc b/remoting/host/continue_window_gtk.cc index e22e62e..238b509 100644 --- a/remoting/host/continue_window_gtk.cc +++ b/remoting/host/continue_window_gtk.cc @@ -6,7 +6,7 @@ #include "base/compiler_specific.h" #include "base/logging.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "remoting/host/continue_window.h" #include "ui/base/gtk/gtk_signal.h" diff --git a/remoting/host/continue_window_win.cc b/remoting/host/continue_window_win.cc index d710d52..366e722 100644 --- a/remoting/host/continue_window_win.cc +++ b/remoting/host/continue_window_win.cc @@ -11,7 +11,7 @@ #include "base/logging.h" #include "base/process_util.h" #include "base/single_thread_task_runner.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "remoting/host/continue_window.h" #include "remoting/host/win/core_resource.h" diff --git a/remoting/host/daemon_process_win.cc b/remoting/host/daemon_process_win.cc index 5d2dc94..5603c9a 100644 --- a/remoting/host/daemon_process_win.cc +++ b/remoting/host/daemon_process_win.cc @@ -13,9 +13,9 @@ #include "base/memory/scoped_ptr.h" #include "base/process.h" #include "base/single_thread_task_runner.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" #include "base/timer.h" -#include "base/utf_string_conversions.h" #include "base/win/scoped_handle.h" #include "ipc/ipc_message.h" #include "ipc/ipc_message_macros.h" diff --git a/remoting/host/desktop_session_win.cc b/remoting/host/desktop_session_win.cc index 1ae4fa5..ff6b548 100644 --- a/remoting/host/desktop_session_win.cc +++ b/remoting/host/desktop_session_win.cc @@ -15,9 +15,9 @@ #include "base/memory/weak_ptr.h" #include "base/path_service.h" #include "base/stringprintf.h" +#include "base/strings/utf_string_conversions.h" #include "base/threading/thread_checker.h" #include "base/timer.h" -#include "base/utf_string_conversions.h" #include "base/win/scoped_comptr.h" #include "base/win/scoped_handle.h" #include "base/win/windows_version.h" diff --git a/remoting/host/disconnect_window_gtk.cc b/remoting/host/disconnect_window_gtk.cc index 9908f34..11f63bf 100644 --- a/remoting/host/disconnect_window_gtk.cc +++ b/remoting/host/disconnect_window_gtk.cc @@ -8,7 +8,7 @@ #include "base/compiler_specific.h" #include "base/logging.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "remoting/host/client_session_control.h" #include "remoting/host/host_window.h" #include "remoting/host/ui_strings.h" diff --git a/remoting/host/disconnect_window_mac.h b/remoting/host/disconnect_window_mac.h index a6cb3b6..c4a3423 100644 --- a/remoting/host/disconnect_window_mac.h +++ b/remoting/host/disconnect_window_mac.h @@ -8,7 +8,7 @@ #include "base/callback.h" #include "base/string16.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" namespace remoting { struct UiStrings; diff --git a/remoting/host/disconnect_window_win.cc b/remoting/host/disconnect_window_win.cc index 6d06346..94bb9cd 100644 --- a/remoting/host/disconnect_window_win.cc +++ b/remoting/host/disconnect_window_win.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "base/process_util.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/win/scoped_gdi_object.h" #include "base/win/scoped_hdc.h" #include "base/win/scoped_select_object.h" diff --git a/remoting/host/host_event_logger_win.cc b/remoting/host/host_event_logger_win.cc index a0a30c9..14fea26 100644 --- a/remoting/host/host_event_logger_win.cc +++ b/remoting/host/host_event_logger_win.cc @@ -11,7 +11,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/string16.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "net/base/ip_endpoint.h" #include "remoting/host/host_status_monitor.h" #include "remoting/host/host_status_observer.h" diff --git a/remoting/host/host_main.cc b/remoting/host/host_main.cc index 79a3918..83f486e 100644 --- a/remoting/host/host_main.cc +++ b/remoting/host/host_main.cc @@ -15,7 +15,7 @@ #include "base/logging.h" #include "base/stringprintf.h" #include "base/strings/stringize_macros.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "remoting/base/breakpad.h" #include "remoting/host/host_exit_codes.h" #include "remoting/host/logging.h" diff --git a/remoting/host/ipc_util_win.cc b/remoting/host/ipc_util_win.cc index e445225..e3b7cec 100644 --- a/remoting/host/ipc_util_win.cc +++ b/remoting/host/ipc_util_win.cc @@ -7,7 +7,7 @@ #include "base/logging.h" #include "base/single_thread_task_runner.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/win/scoped_handle.h" #include "base/win/win_util.h" #include "ipc/ipc_channel.h" diff --git a/remoting/host/plugin/host_script_object.cc b/remoting/host/plugin/host_script_object.cc index 7300a4e..46e849a 100644 --- a/remoting/host/plugin/host_script_object.cc +++ b/remoting/host/plugin/host_script_object.cc @@ -12,8 +12,8 @@ #include "base/string_util.h" #include "base/stringprintf.h" #include "base/strings/sys_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/threading/platform_thread.h" -#include "base/utf_string_conversions.h" #include "base/values.h" #include "net/base/net_util.h" #include "remoting/base/auth_token_util.h" diff --git a/remoting/host/policy_hack/policy_watcher_win.cc b/remoting/host/policy_hack/policy_watcher_win.cc index af943e8..2150de3 100644 --- a/remoting/host/policy_hack/policy_watcher_win.cc +++ b/remoting/host/policy_hack/policy_watcher_win.cc @@ -18,8 +18,8 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop_proxy.h" #include "base/string16.h" +#include "base/strings/utf_string_conversions.h" #include "base/synchronization/waitable_event.h" -#include "base/utf_string_conversions.h" #include "base/values.h" #include "base/win/object_watcher.h" #include "base/win/registry.h" diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc index 38765df..4e3b779 100644 --- a/remoting/host/remoting_me2me_host.cc +++ b/remoting/host/remoting_me2me_host.cc @@ -19,9 +19,9 @@ #include "base/single_thread_task_runner.h" #include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/utf_string_conversions.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread.h" -#include "base/utf_string_conversions.h" #include "build/build_config.h" #include "crypto/nss_util.h" #include "ipc/ipc_channel.h" diff --git a/remoting/host/sas_injector_win.cc b/remoting/host/sas_injector_win.cc index a29d727..1a866f6 100644 --- a/remoting/host/sas_injector_win.cc +++ b/remoting/host/sas_injector_win.cc @@ -11,7 +11,7 @@ #include "base/logging.h" #include "base/path_service.h" #include "base/scoped_native_library.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/win/registry.h" #include "base/win/windows_version.h" #include "third_party/webrtc/modules/desktop_capture/win/desktop.h" diff --git a/remoting/host/setup/daemon_controller_win.cc b/remoting/host/setup/daemon_controller_win.cc index 1a23029..f0f23c8 100644 --- a/remoting/host/setup/daemon_controller_win.cc +++ b/remoting/host/setup/daemon_controller_win.cc @@ -14,10 +14,10 @@ #include "base/json/json_writer.h" #include "base/logging.h" #include "base/string16.h" +#include "base/strings/utf_string_conversions.h" #include "base/threading/thread.h" #include "base/time.h" #include "base/timer.h" -#include "base/utf_string_conversions.h" #include "base/values.h" #include "base/win/scoped_bstr.h" #include "base/win/scoped_comptr.h" diff --git a/remoting/host/setup/daemon_installer_win.cc b/remoting/host/setup/daemon_installer_win.cc index 2fd8d4c..7c6ab04 100644 --- a/remoting/host/setup/daemon_installer_win.cc +++ b/remoting/host/setup/daemon_installer_win.cc @@ -11,9 +11,9 @@ #include "base/process_util.h" #include "base/string16.h" #include "base/stringprintf.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" #include "base/timer.h" -#include "base/utf_string_conversions.h" #include "base/win/object_watcher.h" #include "base/win/registry.h" #include "base/win/scoped_bstr.h" diff --git a/remoting/host/setup/win/auth_code_getter.cc b/remoting/host/setup/win/auth_code_getter.cc index 6b3944d..a958779 100644 --- a/remoting/host/setup/win/auth_code_getter.cc +++ b/remoting/host/setup/win/auth_code_getter.cc @@ -4,8 +4,8 @@ #include "remoting/host/setup/win/auth_code_getter.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "base/win/scoped_bstr.h" #include "base/win/scoped_variant.h" #include "remoting/host/setup/oauth_helper.h" diff --git a/remoting/host/setup/win/start_host_window.cc b/remoting/host/setup/win/start_host_window.cc index 428e049..ceede64 100644 --- a/remoting/host/setup/win/start_host_window.cc +++ b/remoting/host/setup/win/start_host_window.cc @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "base/string16.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "google_apis/gaia/gaia_urls.h" #include "remoting/host/service_urls.h" #include "remoting/host/setup/oauth_helper.h" diff --git a/remoting/host/ui_strings.cc b/remoting/host/ui_strings.cc index f8cb639..e59dd5c6 100644 --- a/remoting/host/ui_strings.cc +++ b/remoting/host/ui_strings.cc @@ -4,7 +4,7 @@ #include "remoting/host/ui_strings.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" namespace remoting { diff --git a/remoting/host/verify_config_window_win.cc b/remoting/host/verify_config_window_win.cc index d080208..d9e591f 100644 --- a/remoting/host/verify_config_window_win.cc +++ b/remoting/host/verify_config_window_win.cc @@ -11,7 +11,7 @@ #include "base/base64.h" #include "base/compiler_specific.h" #include "base/logging.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "remoting/host/pin_hash.h" #include "remoting/host/win/core_resource.h" #include "remoting/protocol/authentication_method.h" diff --git a/remoting/host/win/elevated_controller.cc b/remoting/host/win/elevated_controller.cc index 6dbf459..3911c2e 100644 --- a/remoting/host/win/elevated_controller.cc +++ b/remoting/host/win/elevated_controller.cc @@ -6,13 +6,13 @@ #include "base/file_util.h" #include "base/file_version_info.h" -#include "base/logging.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" +#include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/process_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "base/win/scoped_handle.h" #include "remoting/host/branding.h" diff --git a/remoting/host/win/host_service.cc b/remoting/host/win/host_service.cc index b3cf6b0..a76eb05 100644 --- a/remoting/host/win/host_service.cc +++ b/remoting/host/win/host_service.cc @@ -19,8 +19,8 @@ #include "base/message_loop.h" #include "base/run_loop.h" #include "base/single_thread_task_runner.h" +#include "base/strings/utf_string_conversions.h" #include "base/threading/thread.h" -#include "base/utf_string_conversions.h" #include "base/win/scoped_com_initializer.h" #include "base/win/windows_version.h" #include "remoting/base/auto_thread.h" diff --git a/remoting/host/win/launch_process_with_token.cc b/remoting/host/win/launch_process_with_token.cc index 8f0173c..e23523d 100644 --- a/remoting/host/win/launch_process_with_token.cc +++ b/remoting/host/win/launch_process_with_token.cc @@ -16,7 +16,7 @@ #include "base/scoped_native_library.h" #include "base/string16.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/win/scoped_handle.h" #include "base/win/scoped_process_information.h" #include "base/win/windows_version.h" diff --git a/remoting/host/win/message_window.cc b/remoting/host/win/message_window.cc index b36b3f6..b4f9494 100644 --- a/remoting/host/win/message_window.cc +++ b/remoting/host/win/message_window.cc @@ -7,7 +7,7 @@ #include "base/logging.h" #include "base/process_util.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/win/wrapped_window_proc.h" const char kClassNameFormat[] = "Chromoting_MessageWindow_%p"; diff --git a/remoting/host/win/rdp_client_window.cc b/remoting/host/win/rdp_client_window.cc index 787f8d2..543a20a 100644 --- a/remoting/host/win/rdp_client_window.cc +++ b/remoting/host/win/rdp_client_window.cc @@ -11,8 +11,8 @@ #include "base/lazy_instance.h" #include "base/logging.h" #include "base/string16.h" +#include "base/strings/utf_string_conversions.h" #include "base/threading/thread_local.h" -#include "base/utf_string_conversions.h" #include "base/win/scoped_bstr.h" namespace remoting { diff --git a/remoting/host/win/security_descriptor.cc b/remoting/host/win/security_descriptor.cc index 1f53505..f7e535d 100644 --- a/remoting/host/win/security_descriptor.cc +++ b/remoting/host/win/security_descriptor.cc @@ -7,7 +7,7 @@ #include #include "base/string16.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" namespace remoting { diff --git a/remoting/host/win/unprivileged_process_delegate.cc b/remoting/host/win/unprivileged_process_delegate.cc index a52876e..e968c38 100644 --- a/remoting/host/win/unprivileged_process_delegate.cc +++ b/remoting/host/win/unprivileged_process_delegate.cc @@ -17,8 +17,8 @@ #include "base/single_thread_task_runner.h" #include "base/string16.h" #include "base/stringprintf.h" +#include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock.h" -#include "base/utf_string_conversions.h" #include "base/win/scoped_handle.h" #include "base/win/windows_version.h" #include "ipc/ipc_channel.h" diff --git a/remoting/host/win/wts_session_process_delegate.cc b/remoting/host/win/wts_session_process_delegate.cc index 26e4eea..57920d5 100644 --- a/remoting/host/win/wts_session_process_delegate.cc +++ b/remoting/host/win/wts_session_process_delegate.cc @@ -13,8 +13,8 @@ #include "base/logging.h" #include "base/message_loop.h" #include "base/single_thread_task_runner.h" +#include "base/strings/utf_string_conversions.h" #include "base/thread_task_runner_handle.h" -#include "base/utf_string_conversions.h" #include "base/win/scoped_handle.h" #include "base/win/windows_version.h" #include "ipc/ipc_channel.h" diff --git a/remoting/host/win/wts_terminal_monitor.cc b/remoting/host/win/wts_terminal_monitor.cc index 414a86b..33896de 100644 --- a/remoting/host/win/wts_terminal_monitor.cc +++ b/remoting/host/win/wts_terminal_monitor.cc @@ -13,7 +13,7 @@ #include "base/lazy_instance.h" #include "base/native_library.h" #include "base/scoped_native_library.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "net/base/ip_endpoint.h" namespace { diff --git a/rlz/lib/financial_ping.cc b/rlz/lib/financial_ping.cc index e6cbef3..0c49506 100644 --- a/rlz/lib/financial_ping.cc +++ b/rlz/lib/financial_ping.cc @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "rlz/lib/assert.h" #include "rlz/lib/lib_values.h" #include "rlz/lib/machine_id.h" diff --git a/rlz/lib/financial_ping_test.cc b/rlz/lib/financial_ping_test.cc index c04cf46..8df566c 100644 --- a/rlz/lib/financial_ping_test.cc +++ b/rlz/lib/financial_ping_test.cc @@ -20,7 +20,7 @@ #include "base/logging.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "rlz/lib/lib_values.h" #include "rlz/lib/machine_id.h" #include "rlz/lib/rlz_lib.h" diff --git a/rlz/lib/machine_id_unittest.cc b/rlz/lib/machine_id_unittest.cc index cecf529..9d0d35f 100644 --- a/rlz/lib/machine_id_unittest.cc +++ b/rlz/lib/machine_id_unittest.cc @@ -5,7 +5,7 @@ #include "rlz/lib/machine_id.h" #include "base/string16.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "rlz/test/rlz_test_helpers.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/rlz/lib/string_utils_unittest.cc b/rlz/lib/string_utils_unittest.cc index 82a6edb..d8be24a8 100644 --- a/rlz/lib/string_utils_unittest.cc +++ b/rlz/lib/string_utils_unittest.cc @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/logging.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "rlz/lib/assert.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/rlz/mac/lib/machine_id_mac.cc b/rlz/mac/lib/machine_id_mac.cc index 0d26d1d..e66d152 100644 --- a/rlz/mac/lib/machine_id_mac.cc +++ b/rlz/mac/lib/machine_id_mac.cc @@ -15,7 +15,7 @@ #include "base/string16.h" #include "base/stringprintf.h" #include "base/strings/sys_string_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" namespace rlz_lib { diff --git a/rlz/win/lib/registry_util.cc b/rlz/win/lib/registry_util.cc index 6a324d5..674661a 100644 --- a/rlz/win/lib/registry_util.cc +++ b/rlz/win/lib/registry_util.cc @@ -8,7 +8,7 @@ #include "rlz/win/lib/registry_util.h" #include "base/process_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/win/registry.h" #include "base/win/windows_version.h" #include "rlz/lib/assert.h" diff --git a/rlz/win/lib/rlz_value_store_registry.cc b/rlz/win/lib/rlz_value_store_registry.cc index 36c53d5..3008437 100644 --- a/rlz/win/lib/rlz_value_store_registry.cc +++ b/rlz/win/lib/rlz_value_store_registry.cc @@ -4,9 +4,9 @@ #include "rlz/win/lib/rlz_value_store_registry.h" -#include "base/win/registry.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" +#include "base/win/registry.h" #include "rlz/lib/assert.h" #include "rlz/lib/lib_values.h" #include "rlz/lib/rlz_lib.h" diff --git a/skia/ext/image_operations_bench.cc b/skia/ext/image_operations_bench.cc index 0a56650..3234820 100644 --- a/skia/ext/image_operations_bench.cc +++ b/skia/ext/image_operations_bench.cc @@ -22,8 +22,8 @@ #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/strings/string_split.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "skia/ext/image_operations.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkRect.h" diff --git a/skia/ext/vector_canvas_unittest.cc b/skia/ext/vector_canvas_unittest.cc index 59f70e6..b07a776 100644 --- a/skia/ext/vector_canvas_unittest.cc +++ b/skia/ext/vector_canvas_unittest.cc @@ -13,7 +13,7 @@ #include "base/path_service.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "skia/ext/vector_canvas.h" #include "skia/ext/vector_platform_device_emf_win.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/sql/connection.cc b/sql/connection.cc index a7a599c..b498121 100644 --- a/sql/connection.cc +++ b/sql/connection.cc @@ -14,7 +14,7 @@ #include "base/string_util.h" #include "base/stringprintf.h" #include "base/strings/string_split.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "sql/statement.h" #include "third_party/sqlite/sqlite3.h" diff --git a/sql/statement.cc b/sql/statement.cc index 5736d7d..0ba57c3 100644 --- a/sql/statement.cc +++ b/sql/statement.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "third_party/sqlite/sqlite3.h" namespace sql { diff --git a/sync/internal_api/base_node.cc b/sync/internal_api/base_node.cc index a0ae01e..c6989ca 100644 --- a/sync/internal_api/base_node.cc +++ b/sync/internal_api/base_node.cc @@ -7,7 +7,7 @@ #include #include "base/string_number_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "sync/internal_api/public/base_transaction.h" #include "sync/internal_api/syncapi_internal.h" diff --git a/sync/internal_api/sync_manager_impl_unittest.cc b/sync/internal_api/sync_manager_impl_unittest.cc index ff04a0b..e0de2e4 100644 --- a/sync/internal_api/sync_manager_impl_unittest.cc +++ b/sync/internal_api/sync_manager_impl_unittest.cc @@ -20,8 +20,8 @@ #include "base/message_loop_proxy.h" #include "base/string_number_conversions.h" #include "base/stringprintf.h" +#include "base/strings/utf_string_conversions.h" #include "base/test/values_test_util.h" -#include "base/utf_string_conversions.h" #include "base/values.h" #include "sync/engine/sync_scheduler.h" #include "sync/internal_api/public/base/model_type_test_util.h" diff --git a/sync/internal_api/write_node.cc b/sync/internal_api/write_node.cc index 22496c1..bde2b32 100644 --- a/sync/internal_api/write_node.cc +++ b/sync/internal_api/write_node.cc @@ -5,7 +5,7 @@ #include "sync/internal_api/public/write_node.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "sync/internal_api/public/base_transaction.h" #include "sync/internal_api/public/write_transaction.h" diff --git a/sync/util/time.cc b/sync/util/time.cc index a921f07..00ff1b2 100644 --- a/sync/util/time.cc +++ b/sync/util/time.cc @@ -5,7 +5,7 @@ #include "sync/util/time.h" #include "base/i18n/time_formatting.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" namespace syncer { diff --git a/third_party/leveldatabase/env_chromium.cc b/third_party/leveldatabase/env_chromium.cc index d88f460..ae3f551 100644 --- a/third_party/leveldatabase/env_chromium.cc +++ b/third_party/leveldatabase/env_chromium.cc @@ -17,11 +17,11 @@ #include "base/metrics/histogram.h" #include "base/platform_file.h" #include "base/posix/eintr_wrapper.h" +#include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock.h" #include "base/sys_info.h" #include "base/threading/platform_thread.h" #include "base/threading/thread.h" -#include "base/utf_string_conversions.h" #include "chromium_logger.h" #include "env_chromium.h" #include "leveldb/env.h" diff --git a/third_party/zlib/google/zip_internal.cc b/third_party/zlib/google/zip_internal.cc index 3a3a51a..b4f54d5 100644 --- a/third_party/zlib/google/zip_internal.cc +++ b/third_party/zlib/google/zip_internal.cc @@ -7,7 +7,7 @@ #include #include "base/logging.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #if defined(USE_SYSTEM_MINIZIP) #include diff --git a/third_party/zlib/google/zip_reader.cc b/third_party/zlib/google/zip_reader.cc index 5433b04..e1f6cdd 100644 --- a/third_party/zlib/google/zip_reader.cc +++ b/third_party/zlib/google/zip_reader.cc @@ -7,7 +7,7 @@ #include "base/file_util.h" #include "base/logging.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "net/base/file_stream.h" #include "third_party/zlib/google/zip_internal.h" diff --git a/third_party/zlib/google/zip_reader_unittest.cc b/third_party/zlib/google/zip_reader_unittest.cc index a12b04e..a47ac53 100644 --- a/third_party/zlib/google/zip_reader_unittest.cc +++ b/third_party/zlib/google/zip_reader_unittest.cc @@ -13,8 +13,8 @@ #include "base/md5.h" #include "base/path_service.h" #include "base/platform_file.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" #include "third_party/zlib/google/zip_internal.h" diff --git a/tools/imagediff/image_diff.cc b/tools/imagediff/image_diff.cc index 29d8dd1..9c2a2f2 100644 --- a/tools/imagediff/image_diff.cc +++ b/tools/imagediff/image_diff.cc @@ -22,7 +22,7 @@ #include "base/process_util.h" #include "base/safe_numerics.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "ui/gfx/codec/png_codec.h" #include "ui/gfx/size.h" diff --git a/tools/memory_watcher/memory_watcher.cc b/tools/memory_watcher/memory_watcher.cc index 7c4d801c..66c4aaf 100644 --- a/tools/memory_watcher/memory_watcher.cc +++ b/tools/memory_watcher/memory_watcher.cc @@ -12,8 +12,8 @@ #include "base/logging.h" #include "base/metrics/stats_counters.h" #include "base/string_util.h" +#include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock.h" -#include "base/utf_string_conversions.h" #include "tools/memory_watcher/call_stack.h" #include "tools/memory_watcher/preamble_patcher.h" diff --git a/webkit/base/file_path_string_conversions.cc b/webkit/base/file_path_string_conversions.cc index e7d8986..cb64809d 100644 --- a/webkit/base/file_path_string_conversions.cc +++ b/webkit/base/file_path_string_conversions.cc @@ -5,7 +5,7 @@ #include "webkit/base/file_path_string_conversions.h" #include "base/strings/sys_string_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "third_party/WebKit/public/platform/WebString.h" namespace webkit_base { diff --git a/webkit/base/origin_url_conversions.cc b/webkit/base/origin_url_conversions.cc index 82bef21..1b2d7f2 100644 --- a/webkit/base/origin_url_conversions.cc +++ b/webkit/base/origin_url_conversions.cc @@ -4,7 +4,7 @@ #include "webkit/base/origin_url_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "googleurl/src/gurl.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" diff --git a/webkit/browser/appcache/appcache_database.cc b/webkit/browser/appcache/appcache_database.cc index a06fa10..47b2c85 100644 --- a/webkit/browser/appcache/appcache_database.cc +++ b/webkit/browser/appcache/appcache_database.cc @@ -8,7 +8,7 @@ #include "base/command_line.h" #include "base/file_util.h" #include "base/logging.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "sql/connection.h" #include "sql/meta_table.h" #include "sql/statement.h" diff --git a/webkit/browser/appcache/manifest_parser.cc b/webkit/browser/appcache/manifest_parser.cc index 3bc3be0..5048300 100644 --- a/webkit/browser/appcache/manifest_parser.cc +++ b/webkit/browser/appcache/manifest_parser.cc @@ -34,7 +34,7 @@ #include "base/command_line.h" #include "base/i18n/icu_string_conversions.h" #include "base/logging.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "googleurl/src/gurl.h" namespace appcache { diff --git a/webkit/browser/appcache/view_appcache_internals_job.cc b/webkit/browser/appcache/view_appcache_internals_job.cc index 217089c..fafbc1e 100644 --- a/webkit/browser/appcache/view_appcache_internals_job.cc +++ b/webkit/browser/appcache/view_appcache_internals_job.cc @@ -16,7 +16,7 @@ #include "base/string_util.h" #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "net/base/escape.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" diff --git a/webkit/browser/blob/view_blob_internals_job.cc b/webkit/browser/blob/view_blob_internals_job.cc index 2cc8348..54bb52b 100644 --- a/webkit/browser/blob/view_blob_internals_job.cc +++ b/webkit/browser/blob/view_blob_internals_job.cc @@ -13,7 +13,7 @@ #include "base/message_loop.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "net/base/escape.h" #include "net/base/net_errors.h" #include "net/url_request/url_request.h" diff --git a/webkit/browser/chromeos/fileapi/cros_mount_point_provider.cc b/webkit/browser/chromeos/fileapi/cros_mount_point_provider.cc index cc59ac5..92fa828 100644 --- a/webkit/browser/chromeos/fileapi/cros_mount_point_provider.cc +++ b/webkit/browser/chromeos/fileapi/cros_mount_point_provider.cc @@ -10,8 +10,8 @@ #include "base/message_loop.h" #include "base/path_service.h" #include "base/stringprintf.h" +#include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock.h" -#include "base/utf_string_conversions.h" #include "chromeos/dbus/cros_disks_client.h" #include "third_party/WebKit/public/platform/WebCString.h" #include "third_party/WebKit/public/platform/WebFileSystem.h" diff --git a/webkit/browser/chromeos/fileapi/remote_file_system_operation.cc b/webkit/browser/chromeos/fileapi/remote_file_system_operation.cc index fcf129d..f508c2c 100644 --- a/webkit/browser/chromeos/fileapi/remote_file_system_operation.cc +++ b/webkit/browser/chromeos/fileapi/remote_file_system_operation.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/platform_file.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "googleurl/src/gurl.h" #include "net/url_request/url_request_context.h" diff --git a/webkit/browser/database/database_quota_client_unittest.cc b/webkit/browser/database/database_quota_client_unittest.cc index abb7f21..ddb7aef 100644 --- a/webkit/browser/database/database_quota_client_unittest.cc +++ b/webkit/browser/database/database_quota_client_unittest.cc @@ -8,7 +8,7 @@ #include "base/files/file_path.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "net/base/completion_callback.h" #include "net/base/net_errors.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/webkit/browser/database/database_tracker.cc b/webkit/browser/database/database_tracker.cc index 2567539..d82c46a 100644 --- a/webkit/browser/database/database_tracker.cc +++ b/webkit/browser/database/database_tracker.cc @@ -13,7 +13,7 @@ #include "base/message_loop_proxy.h" #include "base/platform_file.h" #include "base/strings/string_number_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "net/base/net_errors.h" #include "sql/connection.h" #include "sql/meta_table.h" diff --git a/webkit/browser/database/database_tracker_unittest.cc b/webkit/browser/database/database_tracker_unittest.cc index 056aa88..c9abd12 100644 --- a/webkit/browser/database/database_tracker_unittest.cc +++ b/webkit/browser/database/database_tracker_unittest.cc @@ -9,8 +9,8 @@ #include "base/message_loop.h" #include "base/message_loop_proxy.h" #include "base/platform_file.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "net/base/net_errors.h" #include "net/base/test_completion_callback.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/webkit/browser/database/database_util.cc b/webkit/browser/database/database_util.cc index b2b1cde..b5929cc 100644 --- a/webkit/browser/database/database_util.cc +++ b/webkit/browser/database/database_util.cc @@ -5,7 +5,7 @@ #include "webkit/browser/database/database_util.h" #include "base/basictypes.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" #include "webkit/browser/database/database_tracker.h" diff --git a/webkit/browser/database/database_util_unittest.cc b/webkit/browser/database/database_util_unittest.cc index 649b58a..c0b85f8 100644 --- a/webkit/browser/database/database_util_unittest.cc +++ b/webkit/browser/database/database_util_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/strings/string_piece.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/base/origin_url_conversions.h" #include "webkit/browser/database/database_util.h" diff --git a/webkit/browser/database/databases_table.cc b/webkit/browser/database/databases_table.cc index 45c76ec..1d06676 100644 --- a/webkit/browser/database/databases_table.cc +++ b/webkit/browser/database/databases_table.cc @@ -5,7 +5,7 @@ #include "webkit/browser/database/databases_table.h" #include "base/logging.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "sql/statement.h" namespace webkit_database { diff --git a/webkit/browser/database/databases_table_unittest.cc b/webkit/browser/database/databases_table_unittest.cc index a5fd0b4..e967205 100644 --- a/webkit/browser/database/databases_table_unittest.cc +++ b/webkit/browser/database/databases_table_unittest.cc @@ -4,7 +4,7 @@ #include "base/bind.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "sql/connection.h" #include "sql/statement.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/webkit/browser/dom_storage/dom_storage_area.cc b/webkit/browser/dom_storage/dom_storage_area.cc index ad71ed7..645fcb0 100644 --- a/webkit/browser/dom_storage/dom_storage_area.cc +++ b/webkit/browser/dom_storage/dom_storage_area.cc @@ -8,8 +8,8 @@ #include "base/location.h" #include "base/logging.h" #include "base/metrics/histogram.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "third_party/WebKit/public/platform/WebString.h" #include "webkit/base/file_path_string_conversions.h" #include "webkit/base/origin_url_conversions.h" diff --git a/webkit/browser/dom_storage/dom_storage_area_unittest.cc b/webkit/browser/dom_storage/dom_storage_area_unittest.cc index c47f635..05b6bbf 100644 --- a/webkit/browser/dom_storage/dom_storage_area_unittest.cc +++ b/webkit/browser/dom_storage/dom_storage_area_unittest.cc @@ -7,9 +7,9 @@ #include "base/files/scoped_temp_dir.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" +#include "base/strings/utf_string_conversions.h" #include "base/threading/sequenced_worker_pool.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/browser/dom_storage/dom_storage_area.h" #include "webkit/browser/dom_storage/dom_storage_database.h" diff --git a/webkit/browser/dom_storage/dom_storage_context_unittest.cc b/webkit/browser/dom_storage/dom_storage_context_unittest.cc index fc38115e..002a62b 100644 --- a/webkit/browser/dom_storage/dom_storage_context_unittest.cc +++ b/webkit/browser/dom_storage/dom_storage_context_unittest.cc @@ -7,9 +7,9 @@ #include "base/files/scoped_temp_dir.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" +#include "base/strings/utf_string_conversions.h" #include "base/threading/sequenced_worker_pool.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/browser/dom_storage/dom_storage_area.h" #include "webkit/browser/dom_storage/dom_storage_context.h" diff --git a/webkit/browser/dom_storage/dom_storage_database_unittest.cc b/webkit/browser/dom_storage/dom_storage_database_unittest.cc index 363d438..3feed4000 100644 --- a/webkit/browser/dom_storage/dom_storage_database_unittest.cc +++ b/webkit/browser/dom_storage/dom_storage_database_unittest.cc @@ -8,7 +8,7 @@ #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/path_service.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "sql/statement.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/webkit/browser/dom_storage/session_storage_database.cc b/webkit/browser/dom_storage/session_storage_database.cc index 5d8d886..47fd806 100644 --- a/webkit/browser/dom_storage/session_storage_database.cc +++ b/webkit/browser/dom_storage/session_storage_database.cc @@ -9,12 +9,12 @@ #include "base/metrics/histogram.h" #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "googleurl/src/gurl.h" #include "third_party/leveldatabase/src/include/leveldb/db.h" #include "third_party/leveldatabase/src/include/leveldb/iterator.h" -#include "third_party/leveldatabase/src/include/leveldb/status.h" #include "third_party/leveldatabase/src/include/leveldb/options.h" +#include "third_party/leveldatabase/src/include/leveldb/status.h" #include "third_party/leveldatabase/src/include/leveldb/write_batch.h" diff --git a/webkit/browser/dom_storage/session_storage_database_unittest.cc b/webkit/browser/dom_storage/session_storage_database_unittest.cc index 692f3c5..9216793 100644 --- a/webkit/browser/dom_storage/session_storage_database_unittest.cc +++ b/webkit/browser/dom_storage/session_storage_database_unittest.cc @@ -13,7 +13,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/logging.h" #include "base/strings/string_number_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/leveldatabase/src/include/leveldb/db.h" diff --git a/webkit/browser/fileapi/file_system_dir_url_request_job.cc b/webkit/browser/fileapi/file_system_dir_url_request_job.cc index ef40df5..a693296 100644 --- a/webkit/browser/fileapi/file_system_dir_url_request_job.cc +++ b/webkit/browser/fileapi/file_system_dir_url_request_job.cc @@ -11,8 +11,8 @@ #include "base/message_loop.h" #include "base/platform_file.h" #include "base/strings/sys_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "build/build_config.h" #include "googleurl/src/gurl.h" #include "net/base/io_buffer.h" diff --git a/webkit/browser/fileapi/file_system_dir_url_request_job_unittest.cc b/webkit/browser/fileapi/file_system_dir_url_request_job_unittest.cc index 153752e..b86b907 100644 --- a/webkit/browser/fileapi/file_system_dir_url_request_job_unittest.cc +++ b/webkit/browser/fileapi/file_system_dir_url_request_job_unittest.cc @@ -13,7 +13,7 @@ #include "base/message_loop.h" #include "base/platform_file.h" #include "base/strings/string_piece.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" #include "net/http/http_request_headers.h" diff --git a/webkit/browser/fileapi/file_system_url_request_job_unittest.cc b/webkit/browser/fileapi/file_system_url_request_job_unittest.cc index 0b1db55..abf497e 100644 --- a/webkit/browser/fileapi/file_system_url_request_job_unittest.cc +++ b/webkit/browser/fileapi/file_system_url_request_job_unittest.cc @@ -18,7 +18,7 @@ #include "base/rand_util.h" #include "base/stringprintf.h" #include "base/strings/string_piece.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "net/base/load_flags.h" #include "net/base/mime_util.h" #include "net/base/net_errors.h" diff --git a/webkit/browser/fileapi/local_file_system_operation.cc b/webkit/browser/fileapi/local_file_system_operation.cc index e95648a..cd49b2a 100644 --- a/webkit/browser/fileapi/local_file_system_operation.cc +++ b/webkit/browser/fileapi/local_file_system_operation.cc @@ -6,8 +6,8 @@ #include "base/bind.h" #include "base/single_thread_task_runner.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "net/base/escape.h" #include "net/url_request/url_request_context.h" #include "webkit/browser/fileapi/async_file_util.h" diff --git a/webkit/browser/fileapi/local_file_util_unittest.cc b/webkit/browser/fileapi/local_file_util_unittest.cc index 9abcffc..36f0b4e 100644 --- a/webkit/browser/fileapi/local_file_util_unittest.cc +++ b/webkit/browser/fileapi/local_file_util_unittest.cc @@ -11,7 +11,7 @@ #include "base/message_loop_proxy.h" #include "base/platform_file.h" #include "base/strings/sys_string_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/browser/fileapi/async_file_test_helper.h" #include "webkit/browser/fileapi/file_system_context.h" diff --git a/webkit/browser/fileapi/obfuscated_file_util.cc b/webkit/browser/fileapi/obfuscated_file_util.cc index 0fe7776..68e6322 100644 --- a/webkit/browser/fileapi/obfuscated_file_util.cc +++ b/webkit/browser/fileapi/obfuscated_file_util.cc @@ -16,8 +16,8 @@ #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" #include "base/strings/sys_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "googleurl/src/gurl.h" #include "webkit/base/origin_url_conversions.h" #include "webkit/browser/fileapi/file_observers.h" diff --git a/webkit/common/blob/blob_data.cc b/webkit/common/blob/blob_data.cc index 26b11d2..8d6acff 100644 --- a/webkit/common/blob/blob_data.cc +++ b/webkit/common/blob/blob_data.cc @@ -6,8 +6,8 @@ #include "base/logging.h" #include "base/strings/sys_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" namespace webkit_blob { diff --git a/webkit/common/database/database_connections_unittest.cc b/webkit/common/database/database_connections_unittest.cc index 23d6847..013edd5 100644 --- a/webkit/common/database/database_connections_unittest.cc +++ b/webkit/common/database/database_connections_unittest.cc @@ -4,8 +4,8 @@ #include "base/bind.h" #include "base/message_loop.h" +#include "base/strings/utf_string_conversions.h" #include "base/threading/thread.h" -#include "base/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/common/database/database_connections.h" diff --git a/webkit/common/dom_storage/dom_storage_map_unittest.cc b/webkit/common/dom_storage/dom_storage_map_unittest.cc index 29f5bb1..232b5e6 100644 --- a/webkit/common/dom_storage/dom_storage_map_unittest.cc +++ b/webkit/common/dom_storage/dom_storage_map_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/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/common/dom_storage/dom_storage_map.h" diff --git a/webkit/common/fileapi/file_system_util.cc b/webkit/common/fileapi/file_system_util.cc index 2583d54..a2e14c1 100644 --- a/webkit/common/fileapi/file_system_util.cc +++ b/webkit/common/fileapi/file_system_util.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/string_util.h" #include "base/strings/sys_string_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "googleurl/src/gurl.h" #include "webkit/base/origin_url_conversions.h" diff --git a/webkit/common/webdropdata.cc b/webkit/common/webdropdata.cc index 97c0497..b32e8a3 100644 --- a/webkit/common/webdropdata.cc +++ b/webkit/common/webdropdata.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "third_party/WebKit/public/platform/WebData.h" #include "third_party/WebKit/public/platform/WebDragData.h" #include "third_party/WebKit/public/platform/WebString.h" diff --git a/webkit/common/webpreferences.cc b/webkit/common/webpreferences.cc index 9bf7e3e..db977f5 100644 --- a/webkit/common/webpreferences.cc +++ b/webkit/common/webpreferences.cc @@ -6,7 +6,7 @@ #include "base/basictypes.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSettings.h" #include "third_party/icu/public/common/unicode/uchar.h" diff --git a/webkit/glue/ftp_directory_listing_response_delegate.cc b/webkit/glue/ftp_directory_listing_response_delegate.cc index dd56ce4..d32389f 100644 --- a/webkit/glue/ftp_directory_listing_response_delegate.cc +++ b/webkit/glue/ftp_directory_listing_response_delegate.cc @@ -11,8 +11,8 @@ #include "base/logging.h" #include "base/string_util.h" #include "base/strings/sys_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "net/base/escape.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" diff --git a/webkit/glue/glue_serialize_deprecated.cc b/webkit/glue/glue_serialize_deprecated.cc index 0582801..750a46f 100644 --- a/webkit/glue/glue_serialize_deprecated.cc +++ b/webkit/glue/glue_serialize_deprecated.cc @@ -7,7 +7,7 @@ #include #include "base/pickle.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "googleurl/src/gurl.h" #include "third_party/WebKit/public/platform/WebData.h" #include "third_party/WebKit/public/platform/WebHTTPBody.h" diff --git a/webkit/glue/simple_webmimeregistry_impl.cc b/webkit/glue/simple_webmimeregistry_impl.cc index fcf7b4f..799dfec 100644 --- a/webkit/glue/simple_webmimeregistry_impl.cc +++ b/webkit/glue/simple_webmimeregistry_impl.cc @@ -6,7 +6,7 @@ #include "base/string_util.h" #include "base/strings/sys_string_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "media/filters/stream_parser_factory.h" #include "net/base/mime_util.h" #include "third_party/WebKit/public/platform/WebString.h" diff --git a/webkit/glue/webclipboard_impl.cc b/webkit/glue/webclipboard_impl.cc index 85c6e2d..026dcf1 100644 --- a/webkit/glue/webclipboard_impl.cc +++ b/webkit/glue/webclipboard_impl.cc @@ -7,7 +7,7 @@ #include "base/logging.h" #include "base/pickle.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "googleurl/src/gurl.h" #include "net/base/escape.h" #include "third_party/WebKit/public/platform/WebData.h" diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc index 6485e58..7a534ea 100644 --- a/webkit/glue/webkit_glue.cc +++ b/webkit/glue/webkit_glue.cc @@ -25,8 +25,8 @@ #include "base/stringprintf.h" #include "base/strings/string_piece.h" #include "base/strings/string_tokenizer.h" +#include "base/strings/utf_string_conversions.h" #include "base/sys_info.h" -#include "base/utf_string_conversions.h" #include "net/base/escape.h" #include "net/url_request/url_request.h" #include "skia/ext/platform_canvas.h" diff --git a/webkit/glue/webkitplatformsupport_impl.cc b/webkit/glue/webkitplatformsupport_impl.cc index 850041b..00208bb 100644 --- a/webkit/glue/webkitplatformsupport_impl.cc +++ b/webkit/glue/webkitplatformsupport_impl.cc @@ -21,10 +21,10 @@ #include "base/rand_util.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock.h" #include "base/sys_info.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "grit/webkit_chromium_resources.h" #include "grit/webkit_resources.h" #include "grit/webkit_strings.h" diff --git a/webkit/plugins/npapi/plugin_host.cc b/webkit/plugins/npapi/plugin_host.cc index ccbb9af..91889e5 100644 --- a/webkit/plugins/npapi/plugin_host.cc +++ b/webkit/plugins/npapi/plugin_host.cc @@ -11,7 +11,7 @@ #include "base/string_util.h" #include "base/strings/string_piece.h" #include "base/strings/sys_string_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "net/base/net_util.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" diff --git a/webkit/plugins/npapi/plugin_instance.cc b/webkit/plugins/npapi/plugin_instance.cc index e24ff35..beabcd6 100644 --- a/webkit/plugins/npapi/plugin_instance.cc +++ b/webkit/plugins/npapi/plugin_instance.cc @@ -5,11 +5,11 @@ #include "webkit/plugins/npapi/plugin_instance.h" #include "base/bind.h" -#include "build/build_config.h" #include "base/file_util.h" #include "base/message_loop.h" #include "base/strings/string_number_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "net/base/escape.h" #include "webkit/plugins/npapi/plugin_host.h" #include "webkit/plugins/npapi/plugin_lib.h" diff --git a/webkit/plugins/npapi/plugin_lib_unittest.cc b/webkit/plugins/npapi/plugin_lib_unittest.cc index 2cff95f..4f2ddf6 100644 --- a/webkit/plugins/npapi/plugin_lib_unittest.cc +++ b/webkit/plugins/npapi/plugin_lib_unittest.cc @@ -5,7 +5,7 @@ #include "webkit/plugins/npapi/plugin_lib.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/webkit/plugins/npapi/plugin_list.cc b/webkit/plugins/npapi/plugin_list.cc index 1d3cf05..51863f8 100644 --- a/webkit/plugins/npapi/plugin_list.cc +++ b/webkit/plugins/npapi/plugin_list.cc @@ -12,7 +12,7 @@ #include "base/string_util.h" #include "base/strings/string_split.h" #include "base/strings/sys_string_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "googleurl/src/gurl.h" #include "net/base/mime_util.h" #include "webkit/plugins/npapi/plugin_utils.h" diff --git a/webkit/plugins/npapi/plugin_list_mac.mm b/webkit/plugins/npapi/plugin_list_mac.mm index 5f5ffee..dff25d7 100644 --- a/webkit/plugins/npapi/plugin_list_mac.mm +++ b/webkit/plugins/npapi/plugin_list_mac.mm @@ -16,7 +16,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/strings/sys_string_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" using base::mac::ScopedCFTypeRef; diff --git a/webkit/plugins/npapi/plugin_list_posix.cc b/webkit/plugins/npapi/plugin_list_posix.cc index 6d3de14..ce7aabf 100644 --- a/webkit/plugins/npapi/plugin_list_posix.cc +++ b/webkit/plugins/npapi/plugin_list_posix.cc @@ -26,7 +26,7 @@ #include "base/stringprintf.h" #include "base/strings/string_split.h" #include "base/strings/sys_string_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "build/build_config.h" // These headers must be included in this order to make the declaration gods diff --git a/webkit/plugins/npapi/plugin_list_unittest.cc b/webkit/plugins/npapi/plugin_list_unittest.cc index a562b07..c083d7a 100644 --- a/webkit/plugins/npapi/plugin_list_unittest.cc +++ b/webkit/plugins/npapi/plugin_list_unittest.cc @@ -5,7 +5,7 @@ #include "webkit/plugins/npapi/plugin_list.h" #include "base/string16.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/plugins/npapi/mock_plugin_list.h" diff --git a/webkit/plugins/npapi/plugin_stream.cc b/webkit/plugins/npapi/plugin_stream.cc index 44fc224..5fcbace 100644 --- a/webkit/plugins/npapi/plugin_stream.cc +++ b/webkit/plugins/npapi/plugin_stream.cc @@ -13,10 +13,10 @@ #include "base/bind.h" #include "base/message_loop.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" +#include "googleurl/src/gurl.h" #include "net/base/mime_util.h" #include "webkit/plugins/npapi/plugin_instance.h" -#include "googleurl/src/gurl.h" namespace webkit { namespace npapi { diff --git a/webkit/plugins/npapi/plugin_utils_unittest.cc b/webkit/plugins/npapi/plugin_utils_unittest.cc index d03606c..780c112 100644 --- a/webkit/plugins/npapi/plugin_utils_unittest.cc +++ b/webkit/plugins/npapi/plugin_utils_unittest.cc @@ -8,7 +8,7 @@ #include #include "base/memory/scoped_ptr.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/version.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/webkit/plugins/npapi/test/plugin_geturl_test.cc b/webkit/plugins/npapi/test/plugin_geturl_test.cc index 9d66a5d2..a3c28e6 100644 --- a/webkit/plugins/npapi/test/plugin_geturl_test.cc +++ b/webkit/plugins/npapi/test/plugin_geturl_test.cc @@ -10,7 +10,7 @@ #include "base/file_util.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" // url for "self". The %22%22 is to make a statement for javascript to // evaluate and return. diff --git a/webkit/plugins/npapi/webplugin_delegate_impl_mac.mm b/webkit/plugins/npapi/webplugin_delegate_impl_mac.mm index 161bb6f..9f32f94 100644 --- a/webkit/plugins/npapi/webplugin_delegate_impl_mac.mm +++ b/webkit/plugins/npapi/webplugin_delegate_impl_mac.mm @@ -16,7 +16,7 @@ #include "base/metrics/stats_counters.h" #include "base/string_util.h" #include "base/strings/sys_string_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "skia/ext/skia_utils_mac.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" diff --git a/webkit/plugins/npapi/webplugin_ime_win.cc b/webkit/plugins/npapi/webplugin_ime_win.cc index 46bfaa9..e779b2d 100644 --- a/webkit/plugins/npapi/webplugin_ime_win.cc +++ b/webkit/plugins/npapi/webplugin_ime_win.cc @@ -10,8 +10,8 @@ #include "base/lazy_instance.h" #include "base/logging.h" +#include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock.h" -#include "base/utf_string_conversions.h" #include "webkit/plugins/npapi/plugin_constants_win.h" #include "webkit/plugins/npapi/plugin_instance.h" diff --git a/webkit/plugins/npapi/webplugin_impl.cc b/webkit/plugins/npapi/webplugin_impl.cc index 71ce0a2..bea3e55 100644 --- a/webkit/plugins/npapi/webplugin_impl.cc +++ b/webkit/plugins/npapi/webplugin_impl.cc @@ -11,7 +11,7 @@ #include "base/message_loop.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "cc/layers/io_surface_layer.h" #include "googleurl/src/gurl.h" #include "googleurl/src/url_util.h" diff --git a/webkit/plugins/ppapi/event_conversion.cc b/webkit/plugins/ppapi/event_conversion.cc index c0c1199..eebf3ec 100644 --- a/webkit/plugins/ppapi/event_conversion.cc +++ b/webkit/plugins/ppapi/event_conversion.cc @@ -13,7 +13,7 @@ #include "base/string_util.h" #include "base/stringprintf.h" #include "base/strings/utf_string_conversion_utils.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "ppapi/c/pp_input_event.h" #include "ppapi/shared_impl/ppb_input_event_shared.h" #include "ppapi/shared_impl/time_conversion.h" diff --git a/webkit/plugins/ppapi/host_globals.cc b/webkit/plugins/ppapi/host_globals.cc index 6631282..fb437bb 100644 --- a/webkit/plugins/ppapi/host_globals.cc +++ b/webkit/plugins/ppapi/host_globals.cc @@ -9,7 +9,7 @@ #include "base/command_line.h" #include "base/logging.h" #include "base/rand_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "ppapi/shared_impl/api_id.h" #include "ppapi/shared_impl/id_assignment.h" #include "third_party/WebKit/public/platform/WebString.h" diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc index 6391d95..456b467 100644 --- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc +++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc @@ -13,8 +13,8 @@ #include "base/stl_util.h" #include "base/stringprintf.h" #include "base/strings/utf_offset_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "cc/layers/texture_layer.h" #include "ppapi/c/dev/ppb_find_dev.h" #include "ppapi/c/dev/ppb_zoom_dev.h" diff --git a/webkit/plugins/ppapi/ppb_file_ref_impl.cc b/webkit/plugins/ppapi/ppb_file_ref_impl.cc index c3d810d..efacaf5 100644 --- a/webkit/plugins/ppapi/ppb_file_ref_impl.cc +++ b/webkit/plugins/ppapi/ppb_file_ref_impl.cc @@ -7,7 +7,7 @@ #include "base/files/file_util_proxy.h" #include "base/platform_file.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "googleurl/src/gurl.h" #include "net/base/escape.h" #include "ppapi/c/pp_errors.h" diff --git a/webkit/plugins/ppapi/ppb_graphics_3d_impl.cc b/webkit/plugins/ppapi/ppb_graphics_3d_impl.cc index a3326c1..ef5ddae 100644 --- a/webkit/plugins/ppapi/ppb_graphics_3d_impl.cc +++ b/webkit/plugins/ppapi/ppb_graphics_3d_impl.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/message_loop.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "gpu/command_buffer/client/gles2_implementation.h" #include "ppapi/c/ppp_graphics_3d.h" #include "ppapi/thunk/enter.h" diff --git a/webkit/plugins/webplugininfo.cc b/webkit/plugins/webplugininfo.cc index be80fcf..e7a54d5 100644 --- a/webkit/plugins/webplugininfo.cc +++ b/webkit/plugins/webplugininfo.cc @@ -5,7 +5,7 @@ #include "webkit/plugins/webplugininfo.h" #include "base/logging.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" namespace webkit { diff --git a/webkit/renderer/cpp_bound_class.cc b/webkit/renderer/cpp_bound_class.cc index 6e7e923..0fdcedf 100644 --- a/webkit/renderer/cpp_bound_class.cc +++ b/webkit/renderer/cpp_bound_class.cc @@ -17,7 +17,7 @@ #include "base/compiler_specific.h" #include "base/logging.h" #include "base/stl_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/public/platform/WebString.h" diff --git a/webkit/renderer/cpp_variant.cc b/webkit/renderer/cpp_variant.cc index bea0573..4c913ff 100644 --- a/webkit/renderer/cpp_variant.cc +++ b/webkit/renderer/cpp_variant.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" #include "webkit/renderer/cpp_variant.h" diff --git a/webkit/renderer/dom_storage/dom_storage_cached_area_unittest.cc b/webkit/renderer/dom_storage/dom_storage_cached_area_unittest.cc index aab4bf7..418e805 100644 --- a/webkit/renderer/dom_storage/dom_storage_cached_area_unittest.cc +++ b/webkit/renderer/dom_storage/dom_storage_cached_area_unittest.cc @@ -5,7 +5,7 @@ #include #include "base/bind.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/renderer/dom_storage/dom_storage_cached_area.h" #include "webkit/renderer/dom_storage/dom_storage_proxy.h" diff --git a/webkit/renderer/fileapi/webfilewriter_base_unittest.cc b/webkit/renderer/fileapi/webfilewriter_base_unittest.cc index cdacfa4..7e2f4b2 100644 --- a/webkit/renderer/fileapi/webfilewriter_base_unittest.cc +++ b/webkit/renderer/fileapi/webfilewriter_base_unittest.cc @@ -7,7 +7,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/public/platform/WebURL.h" diff --git a/webkit/renderer/webpreferences_renderer.cc b/webkit/renderer/webpreferences_renderer.cc index 2a311ac..9e0e517 100644 --- a/webkit/renderer/webpreferences_renderer.cc +++ b/webkit/renderer/webpreferences_renderer.cc @@ -4,7 +4,7 @@ #include "webkit/renderer/webpreferences_renderer.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebNetworkStateNotifier.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" diff --git a/webkit/support/mock_webclipboard_impl.cc b/webkit/support/mock_webclipboard_impl.cc index e71681c..704437e 100644 --- a/webkit/support/mock_webclipboard_impl.cc +++ b/webkit/support/mock_webclipboard_impl.cc @@ -9,7 +9,7 @@ #include "base/logging.h" #include "base/stl_util.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "third_party/WebKit/public/platform/WebCommon.h" #include "third_party/WebKit/public/platform/WebDragData.h" #include "third_party/WebKit/public/platform/WebImage.h" diff --git a/webkit/support/platform_support_mac.mm b/webkit/support/platform_support_mac.mm index 9a48d95..4c78746 100644 --- a/webkit/support/platform_support_mac.mm +++ b/webkit/support/platform_support_mac.mm @@ -16,7 +16,7 @@ #include "base/mac/mac_util.h" #include "base/path_service.h" #include "base/string16.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "grit/webkit_resources.h" #include "ui/base/resource/data_pack.h" #include "webkit/plugins/npapi/plugin_list.h" diff --git a/webkit/support/simple_database_system.cc b/webkit/support/simple_database_system.cc index 8786c82..0855c48 100644 --- a/webkit/support/simple_database_system.cc +++ b/webkit/support/simple_database_system.cc @@ -10,9 +10,9 @@ #include "base/file_util.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" +#include "base/strings/utf_string_conversions.h" #include "base/synchronization/waitable_event.h" #include "base/threading/platform_thread.h" -#include "base/utf_string_conversions.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabase.h" #include "third_party/sqlite/sqlite3.h" diff --git a/webkit/support/simple_file_system.cc b/webkit/support/simple_file_system.cc index b7e9ef3..67309f1 100644 --- a/webkit/support/simple_file_system.cc +++ b/webkit/support/simple_file_system.cc @@ -8,8 +8,8 @@ #include "base/files/file_path.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "googleurl/src/gurl.h" #include "net/base/mime_util.h" #include "third_party/WebKit/public/platform/WebFileInfo.h" diff --git a/webkit/support/simple_socket_stream_bridge.cc b/webkit/support/simple_socket_stream_bridge.cc index 0dce0c0..771ddd2 100644 --- a/webkit/support/simple_socket_stream_bridge.cc +++ b/webkit/support/simple_socket_stream_bridge.cc @@ -10,7 +10,7 @@ #include "base/bind.h" #include "base/memory/ref_counted.h" #include "base/message_loop.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "googleurl/src/gurl.h" #include "net/socket_stream/socket_stream_job.h" #include "net/url_request/url_request_context.h" diff --git a/webkit/support/test_webkit_platform_support.cc b/webkit/support/test_webkit_platform_support.cc index abbcdee..83b3276 100644 --- a/webkit/support/test_webkit_platform_support.cc +++ b/webkit/support/test_webkit_platform_support.cc @@ -9,7 +9,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/metrics/stats_counters.h" #include "base/path_service.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "cc/base/thread_impl.h" #include "cc/output/context_provider.h" #include "media/base/media.h" diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc index 51997ec..783659f 100644 --- a/webkit/support/webkit_support.cc +++ b/webkit/support/webkit_support.cc @@ -26,8 +26,8 @@ #include "base/stringprintf.h" #include "base/strings/string_piece.h" #include "base/strings/sys_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "cc/base/thread_impl.h" #include "googleurl/src/url_util.h" #include "grit/webkit_chromium_resources.h" diff --git a/win8/delegate_execute/chrome_util.cc b/win8/delegate_execute/chrome_util.cc index ad00bad..30af215 100644 --- a/win8/delegate_execute/chrome_util.cc +++ b/win8/delegate_execute/chrome_util.cc @@ -17,7 +17,7 @@ #include "base/md5.h" #include "base/process_util.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/win/registry.h" #include "base/win/scoped_comptr.h" #include "base/win/scoped_handle.h" diff --git a/win8/delegate_execute/command_execute_impl.cc b/win8/delegate_execute/command_execute_impl.cc index 102f3e4..3d56344 100644 --- a/win8/delegate_execute/command_execute_impl.cc +++ b/win8/delegate_execute/command_execute_impl.cc @@ -11,7 +11,7 @@ #include "base/file_util.h" #include "base/path_service.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/win/registry.h" #include "base/win/scoped_co_mem.h" #include "base/win/scoped_handle.h" diff --git a/win8/delegate_execute/delegate_execute_util_unittest.cc b/win8/delegate_execute/delegate_execute_util_unittest.cc index d0cf3b3..431ad39 100644 --- a/win8/delegate_execute/delegate_execute_util_unittest.cc +++ b/win8/delegate_execute/delegate_execute_util_unittest.cc @@ -9,7 +9,7 @@ #include "base/command_line.h" #include "base/files/file_path.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/win8/metro_driver/secondary_tile.cc b/win8/metro_driver/secondary_tile.cc index 0cbe358..dde56f7 100644 --- a/win8/metro_driver/secondary_tile.cc +++ b/win8/metro_driver/secondary_tile.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/logging.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "googleurl/src/gurl.h" #include "win8/metro_driver/chrome_app_view.h" #include "win8/metro_driver/winrt_utils.h" diff --git a/win8/metro_driver/toast_notification_handler.cc b/win8/metro_driver/toast_notification_handler.cc index 9448e12..fb85456 100644 --- a/win8/metro_driver/toast_notification_handler.cc +++ b/win8/metro_driver/toast_notification_handler.cc @@ -10,7 +10,7 @@ #include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" // TODO(ananta) // Refactor the chrome_util and shell_util code from chrome into a common lib #include "win8/delegate_execute/chrome_util.h" -- cgit v1.1