diff options
58 files changed, 65 insertions, 48 deletions
diff --git a/app/clipboard/clipboard_util_win.cc b/app/clipboard/clipboard_util_win.cc index 37b78f7..355e8d9 100644 --- a/app/clipboard/clipboard_util_win.cc +++ b/app/clipboard/clipboard_util_win.cc @@ -12,6 +12,7 @@ #include "base/logging.h" #include "base/scoped_handle.h" #include "base/string_util.h" +#include "base/utf_string_conversions.h" namespace { diff --git a/app/clipboard/clipboard_win.cc b/app/clipboard/clipboard_win.cc index 5e3bc42..b729a52 100644 --- a/app/clipboard/clipboard_win.cc +++ b/app/clipboard/clipboard_win.cc @@ -18,6 +18,7 @@ #include "base/message_loop.h" #include "base/shared_memory.h" #include "base/string_util.h" +#include "base/utf_string_conversions.h" namespace { diff --git a/app/l10n_util_dummy.cc b/app/l10n_util_dummy.cc index 749ecb4..a9a4a92 100644 --- a/app/l10n_util_dummy.cc +++ b/app/l10n_util_dummy.cc @@ -8,8 +8,8 @@ #include "base/command_line.h" #include "base/string16.h" #include "base/string_piece.h" -#include "base/string_util.h" #include "base/sys_string_conversions.h" +#include "base/utf_string_conversions.h" #include "build/build_config.h" #include "unicode/uscript.h" diff --git a/app/os_exchange_data_provider_win.cc b/app/os_exchange_data_provider_win.cc index 8f953d1..578f1fd 100644 --- a/app/os_exchange_data_provider_win.cc +++ b/app/os_exchange_data_provider_win.cc @@ -12,7 +12,7 @@ #include "base/pickle.h" #include "base/scoped_handle.h" #include "base/stl_util-inl.h" -#include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "googleurl/src/gurl.h" #include "grit/app_strings.h" #include "net/base/net_util.h" diff --git a/app/os_exchange_data_win_unittest.cc b/app/os_exchange_data_win_unittest.cc index f4ec8fb..cebf641 100644 --- a/app/os_exchange_data_win_unittest.cc +++ b/app/os_exchange_data_win_unittest.cc @@ -9,7 +9,7 @@ #include "base/ref_counted.h" #include "base/scoped_handle.h" #include "base/scoped_ptr.h" -#include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/app/sql/connection.cc b/app/sql/connection.cc index 8f74e6e..81f3d36 100644 --- a/app/sql/connection.cc +++ b/app/sql/connection.cc @@ -10,6 +10,7 @@ #include "base/file_path.h" #include "base/logging.h" #include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "third_party/sqlite/preprocessed/sqlite3.h" namespace sql { diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc index fffa276..03ef0f0 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc @@ -24,7 +24,7 @@ #include "base/keyboard_codes.h" #include "base/lazy_instance.h" #include "base/ref_counted.h" -#include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/autocomplete/autocomplete_accessibility.h" #include "chrome/browser/autocomplete/autocomplete_popup_model.h" diff --git a/chrome/browser/dom_ui/fileicon_source.cc b/chrome/browser/dom_ui/fileicon_source.cc index 6be786c..20091a9 100644 --- a/chrome/browser/dom_ui/fileicon_source.cc +++ b/chrome/browser/dom_ui/fileicon_source.cc @@ -6,7 +6,7 @@ #include "app/gfx/codec/png_codec.h" #include "base/callback.h" -#include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/common/time_format.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/download/download_file.cc b/chrome/browser/download/download_file.cc index 269d108..4c5f42d 100644 --- a/chrome/browser/download/download_file.cc +++ b/chrome/browser/download/download_file.cc @@ -7,9 +7,9 @@ #include "base/file_util.h" #include "base/path_service.h" #include "base/stl_util-inl.h" -#include "base/string_util.h" #include "base/task.h" #include "base/thread.h" +#include "base/utf_string_conversions.h" #include "build/build_config.h" #include "chrome/browser/chrome_thread.h" #include "chrome/browser/download/download_manager.h" diff --git a/chrome/browser/history/in_memory_database.cc b/chrome/browser/history/in_memory_database.cc index f5bff01..a6a9a6f 100644 --- a/chrome/browser/history/in_memory_database.cc +++ b/chrome/browser/history/in_memory_database.cc @@ -7,8 +7,8 @@ #include "base/file_path.h" #include "base/histogram.h" #include "base/logging.h" -#include "base/string_util.h" #include "base/time.h" +#include "base/utf_string_conversions.h" #include "build/build_config.h" namespace history { diff --git a/chrome/browser/net/url_fixer_upper_unittest.cc b/chrome/browser/net/url_fixer_upper_unittest.cc index 2205f73..8ea1131 100644 --- a/chrome/browser/net/url_fixer_upper_unittest.cc +++ b/chrome/browser/net/url_fixer_upper_unittest.cc @@ -8,6 +8,7 @@ #include "base/file_util.h" #include "base/path_service.h" #include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/common/chrome_paths.h" #include "googleurl/src/url_parse.h" diff --git a/chrome/browser/parsers/metadata_parser_filebase.cc b/chrome/browser/parsers/metadata_parser_filebase.cc index a5bfc6a..ad92ea2 100644 --- a/chrome/browser/parsers/metadata_parser_filebase.cc +++ b/chrome/browser/parsers/metadata_parser_filebase.cc @@ -9,6 +9,7 @@ #include "base/file_util.h" #include "base/string_util.h" +#include "base/utf_string_conversions.h" FileMetadataParser::FileMetadataParser(const FilePath& path) : MetadataParser(path) { diff --git a/chrome/browser/parsers/metadata_parser_jpeg_factory.cc b/chrome/browser/parsers/metadata_parser_jpeg_factory.cc index ac74173..3b60abf 100644 --- a/chrome/browser/parsers/metadata_parser_jpeg_factory.cc +++ b/chrome/browser/parsers/metadata_parser_jpeg_factory.cc @@ -6,7 +6,7 @@ #include "chrome/browser/parsers/metadata_parser_jpeg.h" #include "base/logging.h" -#include "base/string_util.h" +#include "base/utf_string_conversions.h" MetadataParserJpegFactory::MetadataParserJpegFactory() : MetadataParserFactory() { diff --git a/chrome/browser/views/about_network_dialog.cc b/chrome/browser/views/about_network_dialog.cc index 128b2c8..0fc8e16 100644 --- a/chrome/browser/views/about_network_dialog.cc +++ b/chrome/browser/views/about_network_dialog.cc @@ -4,8 +4,8 @@ #include "chrome/browser/views/about_network_dialog.h" -#include "base/string_util.h" #include "base/thread.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/chrome_thread.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_job.h" diff --git a/chrome/browser/views/appcache_info_view.cc b/chrome/browser/views/appcache_info_view.cc index 4de638c..8cc53c2 100644 --- a/chrome/browser/views/appcache_info_view.cc +++ b/chrome/browser/views/appcache_info_view.cc @@ -9,7 +9,7 @@ #include "app/gfx/color_utils.h" #include "app/l10n_util.h" #include "base/i18n/time_formatting.h" -#include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "grit/generated_resources.h" #include "views/grid_layout.h" #include "views/controls/label.h" diff --git a/chrome/browser/views/bug_report_view.cc b/chrome/browser/views/bug_report_view.cc index 90b9fbe..8dc597c 100644 --- a/chrome/browser/views/bug_report_view.cc +++ b/chrome/browser/views/bug_report_view.cc @@ -7,7 +7,7 @@ #include "app/combobox_model.h" #include "app/l10n_util.h" #include "base/file_version_info.h" -#include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/bug_report_util.h" #include "chrome/browser/net/url_fetcher.h" #include "chrome/browser/pref_service.h" diff --git a/chrome/browser/views/cookie_prompt_view.cc b/chrome/browser/views/cookie_prompt_view.cc index fa0bbe6..1c84dd5 100644 --- a/chrome/browser/views/cookie_prompt_view.cc +++ b/chrome/browser/views/cookie_prompt_view.cc @@ -11,7 +11,7 @@ #include "app/l10n_util.h" #include "base/i18n/time_formatting.h" #include "base/message_loop.h" -#include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/cookie_modal_dialog.h" #include "chrome/browser/pref_service.h" diff --git a/chrome/browser/views/database_info_view.cc b/chrome/browser/views/database_info_view.cc index 2d9a801..4f5eb54 100644 --- a/chrome/browser/views/database_info_view.cc +++ b/chrome/browser/views/database_info_view.cc @@ -9,7 +9,7 @@ #include "app/gfx/color_utils.h" #include "app/l10n_util.h" #include "base/i18n/time_formatting.h" -#include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "grit/generated_resources.h" #include "views/grid_layout.h" #include "views/controls/label.h" diff --git a/chrome/browser/views/database_open_info_view.cc b/chrome/browser/views/database_open_info_view.cc index 20b315b4..0a81793 100644 --- a/chrome/browser/views/database_open_info_view.cc +++ b/chrome/browser/views/database_open_info_view.cc @@ -9,7 +9,7 @@ #include "app/gfx/color_utils.h" #include "app/l10n_util.h" #include "base/i18n/time_formatting.h" -#include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "grit/generated_resources.h" #include "views/grid_layout.h" #include "views/controls/label.h" diff --git a/chrome/browser/views/external_protocol_dialog.cc b/chrome/browser/views/external_protocol_dialog.cc index 6548eb6..34f391e 100644 --- a/chrome/browser/views/external_protocol_dialog.cc +++ b/chrome/browser/views/external_protocol_dialog.cc @@ -8,8 +8,8 @@ #include "app/message_box_flags.h" #include "base/histogram.h" #include "base/registry.h" -#include "base/string_util.h" #include "base/thread.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/external_protocol_handler.h" #include "chrome/browser/tab_contents/tab_contents.h" diff --git a/chrome/browser/views/local_storage_info_view.cc b/chrome/browser/views/local_storage_info_view.cc index 21e5242..e47536c 100644 --- a/chrome/browser/views/local_storage_info_view.cc +++ b/chrome/browser/views/local_storage_info_view.cc @@ -9,7 +9,7 @@ #include "app/gfx/color_utils.h" #include "app/l10n_util.h" #include "base/i18n/time_formatting.h" -#include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "grit/generated_resources.h" #include "views/grid_layout.h" #include "views/controls/label.h" diff --git a/chrome/browser/views/local_storage_set_item_info_view.cc b/chrome/browser/views/local_storage_set_item_info_view.cc index 699c2f5..3eb13ef 100644 --- a/chrome/browser/views/local_storage_set_item_info_view.cc +++ b/chrome/browser/views/local_storage_set_item_info_view.cc @@ -9,7 +9,7 @@ #include "app/gfx/color_utils.h" #include "app/l10n_util.h" #include "base/i18n/time_formatting.h" -#include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "grit/generated_resources.h" #include "views/grid_layout.h" #include "views/controls/label.h" diff --git a/chrome/browser/views/notifications/balloon_view.cc b/chrome/browser/views/notifications/balloon_view.cc index 9292de4..f8c31a2 100644 --- a/chrome/browser/views/notifications/balloon_view.cc +++ b/chrome/browser/views/notifications/balloon_view.cc @@ -12,7 +12,7 @@ #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/message_loop.h" -#include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/browser_theme_provider.h" #include "chrome/browser/notifications/balloon.h" #include "chrome/browser/notifications/balloon_collection.h" diff --git a/chrome/browser/views/options/exception_editor_view.cc b/chrome/browser/views/options/exception_editor_view.cc index 97f84e0..49bc2ac 100644 --- a/chrome/browser/views/options/exception_editor_view.cc +++ b/chrome/browser/views/options/exception_editor_view.cc @@ -6,6 +6,7 @@ #include "app/l10n_util.h" #include "app/resource_bundle.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/content_exceptions_table_model.h" #include "chrome/browser/host_content_settings_map.h" #include "googleurl/src/url_canon.h" diff --git a/chrome/browser/views/page_info_window_view.cc b/chrome/browser/views/page_info_window_view.cc index 9f0a197..539a281 100644 --- a/chrome/browser/views/page_info_window_view.cc +++ b/chrome/browser/views/page_info_window_view.cc @@ -13,7 +13,7 @@ #include "app/resource_bundle.h" #include "app/l10n_util.h" #include "base/compiler_specific.h" -#include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/cert_store.h" #include "chrome/browser/page_info_model.h" #include "chrome/browser/page_info_window.h" diff --git a/chrome/browser/views/shell_dialogs_win.cc b/chrome/browser/views/shell_dialogs_win.cc index 8cb28a6..c668390 100644 --- a/chrome/browser/views/shell_dialogs_win.cc +++ b/chrome/browser/views/shell_dialogs_win.cc @@ -17,8 +17,8 @@ #include "base/file_util.h" #include "base/registry.h" #include "base/scoped_comptr_win.h" -#include "base/string_util.h" #include "base/thread.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/chrome_thread.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/tabs/side_tab.cc b/chrome/browser/views/tabs/side_tab.cc index b1b0280..efa3d8d 100644 --- a/chrome/browser/views/tabs/side_tab.cc +++ b/chrome/browser/views/tabs/side_tab.cc @@ -9,7 +9,7 @@ #include "app/gfx/skia_util.h" #include "app/resource_bundle.h" #include "app/theme_provider.h" -#include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "grit/app_resources.h" #include "grit/theme_resources.h" #include "views/controls/button/image_button.h" diff --git a/chrome/browser/views/url_picker.cc b/chrome/browser/views/url_picker.cc index 65e983d..60ee014 100644 --- a/chrome/browser/views/url_picker.cc +++ b/chrome/browser/views/url_picker.cc @@ -10,7 +10,7 @@ #include "app/table_model_observer.h" #include "base/keyboard_codes.h" #include "base/stl_util-inl.h" -#include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/possible_url_model.h" #include "chrome/browser/pref_service.h" diff --git a/chrome/browser/webdata/web_database_win.cc b/chrome/browser/webdata/web_database_win.cc index 9ffbf9b..d9d3e19 100644 --- a/chrome/browser/webdata/web_database_win.cc +++ b/chrome/browser/webdata/web_database_win.cc @@ -6,8 +6,8 @@ #include "app/sql/statement.h" #include "base/logging.h" -#include "base/string_util.h" #include "base/time.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/password_manager/ie7_password.h" bool WebDatabase::AddIE7Login(const IE7PasswordInfo& info) { diff --git a/chrome/common/child_process_logging_win.cc b/chrome/common/child_process_logging_win.cc index 654b4fb..0dc0579 100644 --- a/chrome/common/child_process_logging_win.cc +++ b/chrome/common/child_process_logging_win.cc @@ -7,6 +7,7 @@ #include <windows.h> #include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "chrome/app/breakpad_win.h" #include "chrome/common/chrome_constants.h" #include "chrome/installer/util/google_update_settings.h" diff --git a/chrome/common/extensions/extension_file_util_unittest.cc b/chrome/common/extensions/extension_file_util_unittest.cc index 9856e42..278006c 100644 --- a/chrome/common/extensions/extension_file_util_unittest.cc +++ b/chrome/common/extensions/extension_file_util_unittest.cc @@ -5,9 +5,9 @@ #include "chrome/common/extensions/extension_file_util.h" #include "base/file_util.h" -#include "base/scoped_temp_dir.h" -#include "base/string_util.h" #include "base/path_service.h" +#include "base/scoped_temp_dir.h" +#include "base/utf_string_conversions.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" diff --git a/chrome/common/zip.cc b/chrome/common/zip.cc index 3d5e729..f1d89b5 100644 --- a/chrome/common/zip.cc +++ b/chrome/common/zip.cc @@ -5,7 +5,9 @@ #include "chrome/common/zip.h" #include "base/file_util.h" +#include "base/logging.h" #include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "net/base/file_stream.h" #include "third_party/zlib/contrib/minizip/unzip.h" #include "third_party/zlib/contrib/minizip/zip.h" diff --git a/chrome/installer/util/lzma_util.cc b/chrome/installer/util/lzma_util.cc index 3c232c7..5e4ae29 100644 --- a/chrome/installer/util/lzma_util.cc +++ b/chrome/installer/util/lzma_util.cc @@ -5,7 +5,8 @@ #include "chrome/installer/util/lzma_util.h" #include "base/file_util.h" -#include "base/string_util.h" +#include "base/logging.h" +#include "base/utf_string_conversions.h" extern "C" { #include "third_party/lzma_sdk/Archive/7z/7zExtract.h" diff --git a/chrome/test/mini_installer_test/mini_installer_test_util.cc b/chrome/test/mini_installer_test/mini_installer_test_util.cc index 6b78d36..5bba692 100644 --- a/chrome/test/mini_installer_test/mini_installer_test_util.cc +++ b/chrome/test/mini_installer_test/mini_installer_test_util.cc @@ -8,8 +8,8 @@ #include "base/path_service.h" #include "base/platform_thread.h" #include "base/process_util.h" -#include "base/string_util.h" #include "base/time.h" +#include "base/utf_string_conversions.h" #include "chrome/installer/util/logging_installer.h" #include "chrome/test/mini_installer_test/mini_installer_test_constants.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/tools/profiles/generate_profile.cc b/chrome/tools/profiles/generate_profile.cc index fe7af1e..a7a2bd9 100644 --- a/chrome/tools/profiles/generate_profile.cc +++ b/chrome/tools/profiles/generate_profile.cc @@ -14,8 +14,8 @@ #include "base/message_loop.h" #include "base/path_service.h" #include "base/process_util.h" -#include "base/string_util.h" #include "base/time.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/history/history.h" #include "chrome/common/thumbnail_score.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome_frame/com_message_event.cc b/chrome_frame/com_message_event.cc index 24bbdfb..5ec982a 100644 --- a/chrome_frame/com_message_event.cc +++ b/chrome_frame/com_message_event.cc @@ -6,6 +6,7 @@ #include "base/logging.h" #include "base/string_util.h" +#include "base/utf_string_conversions.h" ComMessageEvent::ComMessageEvent() { } diff --git a/chrome_frame/np_event_listener.cc b/chrome_frame/np_event_listener.cc index ff5479a..3b477aa 100644 --- a/chrome_frame/np_event_listener.cc +++ b/chrome_frame/np_event_listener.cc @@ -5,15 +5,14 @@ #include "chrome_frame/np_event_listener.h" #include "base/string_util.h" - +#include "base/utf_string_conversions.h" +#include "chrome_frame/scoped_ns_ptr_win.h" +#include "chrome_frame/ns_associate_iid_win.h" #include "third_party/xulrunner-sdk/win/include/string/nsEmbedString.h" #include "third_party/xulrunner-sdk/win/include/dom/nsIDOMElement.h" #include "third_party/xulrunner-sdk/win/include/dom/nsIDOMEventTarget.h" #include "third_party/xulrunner-sdk/win/include/dom/nsIDOMEvent.h" -#include "chrome_frame/scoped_ns_ptr_win.h" -#include "chrome_frame/ns_associate_iid_win.h" - ASSOCIATE_IID(NS_IDOMELEMENT_IID_STR, nsIDOMElement); ASSOCIATE_IID(NS_IDOMNODE_IID_STR, nsIDOMNode); ASSOCIATE_IID(NS_IDOMEVENTTARGET_IID_STR, nsIDOMEventTarget); diff --git a/chrome_frame/test/chrome_frame_test_utils.cc b/chrome_frame/test/chrome_frame_test_utils.cc index 79c4eff..c2f0abb 100644 --- a/chrome_frame/test/chrome_frame_test_utils.cc +++ b/chrome_frame/test/chrome_frame_test_utils.cc @@ -15,7 +15,7 @@ #include "base/registry.h" // to find IE and firefox #include "base/scoped_handle.h" #include "base/scoped_comptr_win.h" -#include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "base/win_util.h" #include "chrome/common/chrome_switches.h" #include "chrome_frame/utils.h" @@ -427,7 +427,7 @@ _ATL_FUNC_INFO WebBrowserEventSink::kFileDownloadInfo = { // WebBrowserEventSink member defines void WebBrowserEventSink::Attach(IDispatch* browser_disp) { EXPECT_TRUE(NULL != browser_disp); - if(browser_disp) { + if (browser_disp) { EXPECT_HRESULT_SUCCEEDED(web_browser2_.QueryFrom(browser_disp)); EXPECT_TRUE(S_OK == DispEventAdvise(web_browser2_, &DIID_DWebBrowserEvents2)); diff --git a/chrome_frame/utils.cc b/chrome_frame/utils.cc index 04bac77..560d4dc 100644 --- a/chrome_frame/utils.cc +++ b/chrome_frame/utils.cc @@ -17,6 +17,7 @@ #include "base/scoped_variant_win.h" #include "base/string_util.h" #include "base/thread_local.h" +#include "base/utf_string_conversions.h" #include "chrome/common/url_constants.h" #include "chrome/installer/util/chrome_frame_distribution.h" #include "chrome_frame/extra_system_apis.h" diff --git a/media/filters/file_data_source.cc b/media/filters/file_data_source.cc index b14ad9f..901e107 100644 --- a/media/filters/file_data_source.cc +++ b/media/filters/file_data_source.cc @@ -5,7 +5,7 @@ #include <limits> #include "base/file_util.h" -#include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "media/base/filter_host.h" #include "media/base/filters.h" #include "media/base/pipeline.h" diff --git a/media/filters/file_data_source_unittest.cc b/media/filters/file_data_source_unittest.cc index 8089edf..80df9b7 100644 --- a/media/filters/file_data_source_unittest.cc +++ b/media/filters/file_data_source_unittest.cc @@ -8,7 +8,7 @@ #include "base/callback.h" #include "base/file_path.h" #include "base/path_service.h" -#include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "media/base/mock_filter_host.h" #include "media/base/mock_filters.h" #include "media/filters/file_data_source.h" diff --git a/media/tools/player_wtl/movie.cc b/media/tools/player_wtl/movie.cc index b1d957a..c65f35a 100644 --- a/media/tools/player_wtl/movie.cc +++ b/media/tools/player_wtl/movie.cc @@ -4,7 +4,7 @@ #include "media/tools/player_wtl/movie.h" -#include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "media/base/pipeline_impl.h" #include "media/filters/audio_renderer_impl.h" #include "media/filters/ffmpeg_audio_decoder.h" diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc index 0bccb0a..fc57b58 100644 --- a/net/base/mime_util.cc +++ b/net/base/mime_util.cc @@ -11,6 +11,7 @@ #include "base/logging.h" #include "base/singleton.h" #include "base/string_util.h" +#include "base/utf_string_conversions.h" using std::string; diff --git a/net/base/net_util_win.cc b/net/base/net_util_win.cc index 244f4ad..a6d37c1 100644 --- a/net/base/net_util_win.cc +++ b/net/base/net_util_win.cc @@ -8,6 +8,7 @@ #include "base/string_piece.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" +#include "base/utf_string_conversions.h" #include "googleurl/src/gurl.h" #include "net/base/escape.h" diff --git a/net/base/platform_mime_util_win.cc b/net/base/platform_mime_util_win.cc index b07a02d..26d924b 100644 --- a/net/base/platform_mime_util_win.cc +++ b/net/base/platform_mime_util_win.cc @@ -7,7 +7,7 @@ #include "net/base/platform_mime_util.h" #include "base/registry.h" -#include "base/string_util.h" +#include "base/utf_string_conversions.h" namespace net { diff --git a/net/base/x509_certificate_win.cc b/net/base/x509_certificate_win.cc index 7f3f09e..ffe5b2c 100644 --- a/net/base/x509_certificate_win.cc +++ b/net/base/x509_certificate_win.cc @@ -8,6 +8,7 @@ #include "base/pickle.h" #include "base/string_tokenizer.h" #include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "net/base/cert_status_flags.h" #include "net/base/cert_verify_result.h" #include "net/base/ev_root_ca_metadata.h" diff --git a/net/socket/ssl_test_util.cc b/net/socket/ssl_test_util.cc index 56eba9c..e02c71f 100644 --- a/net/socket/ssl_test_util.cc +++ b/net/socket/ssl_test_util.cc @@ -30,7 +30,7 @@ #include "base/file_util.h" #include "base/logging.h" #include "base/path_service.h" -#include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "net/base/host_resolver.h" #include "net/base/net_test_constants.h" #include "net/base/test_completion_callback.h" diff --git a/views/controls/label.cc b/views/controls/label.cc index 4610cdb..9837a89 100644 --- a/views/controls/label.cc +++ b/views/controls/label.cc @@ -15,7 +15,7 @@ #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/logging.h" -#include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "views/background.h" namespace views { diff --git a/views/controls/label_unittest.cc b/views/controls/label_unittest.cc index 06c159d..7d08595 100644 --- a/views/controls/label_unittest.cc +++ b/views/controls/label_unittest.cc @@ -4,7 +4,7 @@ #include "app/gfx/canvas.h" #include "app/l10n_util.h" -#include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "views/border.h" #include "views/controls/label.h" diff --git a/views/controls/message_box_view.cc b/views/controls/message_box_view.cc index df6a580..c5d8882 100644 --- a/views/controls/message_box_view.cc +++ b/views/controls/message_box_view.cc @@ -9,7 +9,7 @@ #include "app/l10n_util.h" #include "app/message_box_flags.h" #include "base/message_loop.h" -#include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "views/controls/button/checkbox.h" #include "views/standard_layout.h" #include "views/views_delegate.h" diff --git a/views/drag_utils.cc b/views/drag_utils.cc index 44deeb2..3344b4e 100644 --- a/views/drag_utils.cc +++ b/views/drag_utils.cc @@ -11,7 +11,7 @@ #include "app/resource_bundle.h" #include "base/file_util.h" #include "base/logging.h" -#include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "googleurl/src/gurl.h" #include "grit/app_resources.h" #include "views/controls/button/text_button.h" diff --git a/views/examples/menu_example.h b/views/examples/menu_example.h index c316e2e..07d27d1 100644 --- a/views/examples/menu_example.h +++ b/views/examples/menu_example.h @@ -8,6 +8,7 @@ #include <set> #include "app/menus/simple_menu_model.h" +#include "base/utf_string_conversions.h" #include "views/controls/button/menu_button.h" #include "views/controls/menu/menu_2.h" #include "views/controls/menu/view_menu_delegate.h" diff --git a/views/examples/textfield_example.h b/views/examples/textfield_example.h index 15aff6f..a348cd3 100644 --- a/views/examples/textfield_example.h +++ b/views/examples/textfield_example.h @@ -5,7 +5,7 @@ #ifndef VIEWS_EXAMPLES_TEXTFIELD_EXAMPLE_H_ #define VIEWS_EXAMPLES_TEXTFIELD_EXAMPLE_H_ -#include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "views/controls/button/text_button.h" #include "views/controls/label.h" #include "views/controls/tabbed_pane/tabbed_pane.h" diff --git a/views/view.cc b/views/view.cc index d88defc..c04a4df7 100644 --- a/views/view.cc +++ b/views/view.cc @@ -16,7 +16,7 @@ #include "base/logging.h" #include "base/message_loop.h" #include "base/scoped_handle.h" -#include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "third_party/skia/include/core/SkShader.h" #include "views/background.h" #include "views/layout_manager.h" diff --git a/webkit/default_plugin/plugin_database_handler.cc b/webkit/default_plugin/plugin_database_handler.cc index c597d5a..d35fdb1 100644 --- a/webkit/default_plugin/plugin_database_handler.cc +++ b/webkit/default_plugin/plugin_database_handler.cc @@ -16,6 +16,7 @@ #include "base/path_service.h" #include "base/string_util.h" #include "base/time.h" +#include "base/utf_string_conversions.h" #include "webkit/default_plugin/plugin_impl.h" #include "webkit/default_plugin/plugin_main.h" diff --git a/webkit/glue/plugins/plugin_stream.cc b/webkit/glue/plugins/plugin_stream.cc index 6acfb7c..728b180 100644 --- a/webkit/glue/plugins/plugin_stream.cc +++ b/webkit/glue/plugins/plugin_stream.cc @@ -8,8 +8,9 @@ #include "webkit/glue/plugins/plugin_stream.h" -#include "base/string_util.h" #include "base/message_loop.h" +#include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "net/base/mime_util.h" #include "webkit/glue/plugins/plugin_instance.h" #include "googleurl/src/gurl.h" diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc index 0e4e6c1..8ce1bcb 100644 --- a/webkit/tools/test_shell/test_shell_win.cc +++ b/webkit/tools/test_shell/test_shell_win.cc @@ -19,8 +19,8 @@ #include "base/resource_util.h" #include "base/stack_container.h" #include "base/string_piece.h" -#include "base/string_util.h" #include "base/trace_event.h" +#include "base/utf_string_conversions.h" #include "base/win_util.h" #include "breakpad/src/client/windows/handler/exception_handler.h" #include "grit/webkit_resources.h" diff --git a/webkit/tools/test_shell/test_webview_delegate_win.cc b/webkit/tools/test_shell/test_webview_delegate_win.cc index 8fef1d1..11c8732 100644 --- a/webkit/tools/test_shell/test_webview_delegate_win.cc +++ b/webkit/tools/test_shell/test_webview_delegate_win.cc @@ -16,8 +16,8 @@ #include "app/gfx/native_widget_types.h" #include "base/gfx/point.h" #include "base/message_loop.h" -#include "base/string_util.h" #include "base/trace_event.h" +#include "base/utf_string_conversions.h" #include "net/base/net_errors.h" #include "third_party/WebKit/WebKit/chromium/public/WebCursorInfo.h" #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" |