diff options
Diffstat (limited to 'webkit')
70 files changed, 73 insertions, 73 deletions
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 <string> #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 <vector> #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 <list> #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" |