diff options
Diffstat (limited to 'webkit')
31 files changed, 31 insertions, 31 deletions
diff --git a/webkit/appcache/appcache_disk_cache.cc b/webkit/appcache/appcache_disk_cache.cc index 33edef3..de94477 100644 --- a/webkit/appcache/appcache_disk_cache.cc +++ b/webkit/appcache/appcache_disk_cache.cc @@ -9,7 +9,7 @@ #include "base/files/file_path.h" #include "base/logging.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "net/base/net_errors.h" namespace appcache { diff --git a/webkit/appcache/view_appcache_internals_job.cc b/webkit/appcache/view_appcache_internals_job.cc index 89a2622..4893fe7 100644 --- a/webkit/appcache/view_appcache_internals_job.cc +++ b/webkit/appcache/view_appcache_internals_job.cc @@ -13,9 +13,9 @@ #include "base/i18n/time_formatting.h" #include "base/logging.h" #include "base/memory/weak_ptr.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "net/base/escape.h" #include "net/base/io_buffer.h" diff --git a/webkit/blob/blob_url_request_job.cc b/webkit/blob/blob_url_request_job.cc index c9aefe4..27892ad 100644 --- a/webkit/blob/blob_url_request_job.cc +++ b/webkit/blob/blob_url_request_job.cc @@ -13,7 +13,7 @@ #include "base/message_loop.h" #include "base/message_loop_proxy.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/http/http_request_headers.h" diff --git a/webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.cc b/webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.cc index 6cbc83d..5b27381 100644 --- a/webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.cc +++ b/webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.cc @@ -5,7 +5,7 @@ #include "webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.h" #include "base/command_line.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/synchronization/lock.h" #include "cc/base/switches.h" #include "cc/base/thread.h" diff --git a/webkit/database/database_tracker.cc b/webkit/database/database_tracker.cc index 2cdcfe8..3462ece 100644 --- a/webkit/database/database_tracker.cc +++ b/webkit/database/database_tracker.cc @@ -12,7 +12,7 @@ #include "base/file_util.h" #include "base/message_loop_proxy.h" #include "base/platform_file.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "net/base/net_errors.h" #include "sql/connection.h" diff --git a/webkit/dom_storage/session_storage_database.cc b/webkit/dom_storage/session_storage_database.cc index 741ecf7..2e873d7 100644 --- a/webkit/dom_storage/session_storage_database.cc +++ b/webkit/dom_storage/session_storage_database.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/stringprintf.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "googleurl/src/gurl.h" #include "third_party/leveldatabase/src/include/leveldb/db.h" diff --git a/webkit/dom_storage/session_storage_database_unittest.cc b/webkit/dom_storage/session_storage_database_unittest.cc index 936873b..d570f3f6 100644 --- a/webkit/dom_storage/session_storage_database_unittest.cc +++ b/webkit/dom_storage/session_storage_database_unittest.cc @@ -12,7 +12,7 @@ #include "base/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/logging.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/webkit/fileapi/file_system_directory_database.cc b/webkit/fileapi/file_system_directory_database.cc index 900ef57..8618b98 100644 --- a/webkit/fileapi/file_system_directory_database.cc +++ b/webkit/fileapi/file_system_directory_database.cc @@ -13,8 +13,8 @@ #include "base/location.h" #include "base/metrics/histogram.h" #include "base/pickle.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "third_party/leveldatabase/src/include/leveldb/db.h" #include "third_party/leveldatabase/src/include/leveldb/write_batch.h" #include "webkit/fileapi/file_system_usage_cache.h" diff --git a/webkit/fileapi/file_system_directory_database_unittest.cc b/webkit/fileapi/file_system_directory_database_unittest.cc index 3f15e7e..b612669 100644 --- a/webkit/fileapi/file_system_directory_database_unittest.cc +++ b/webkit/fileapi/file_system_directory_database_unittest.cc @@ -11,8 +11,8 @@ #include "base/files/scoped_temp_dir.h" #include "base/memory/scoped_ptr.h" #include "base/platform_file.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/leveldatabase/src/include/leveldb/db.h" #include "webkit/fileapi/file_system_database_test_helper.h" diff --git a/webkit/fileapi/file_system_origin_database.cc b/webkit/fileapi/file_system_origin_database.cc index ef0df54..1026418 100644 --- a/webkit/fileapi/file_system_origin_database.cc +++ b/webkit/fileapi/file_system_origin_database.cc @@ -11,9 +11,9 @@ #include "base/location.h" #include "base/logging.h" #include "base/metrics/histogram.h" -#include "base/string_number_conversions.h" #include "base/stringprintf.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "third_party/leveldatabase/src/include/leveldb/db.h" #include "third_party/leveldatabase/src/include/leveldb/write_batch.h" #include "webkit/fileapi/file_system_util.h" diff --git a/webkit/fileapi/isolated_context.cc b/webkit/fileapi/isolated_context.cc index 79cdddd..4f1162c 100644 --- a/webkit/fileapi/isolated_context.cc +++ b/webkit/fileapi/isolated_context.cc @@ -9,9 +9,9 @@ #include "base/logging.h" #include "base/rand_util.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "webkit/fileapi/file_system_url.h" namespace fileapi { diff --git a/webkit/fileapi/local_file_system_operation_unittest.cc b/webkit/fileapi/local_file_system_operation_unittest.cc index 95d2e7d..63facaa 100644 --- a/webkit/fileapi/local_file_system_operation_unittest.cc +++ b/webkit/fileapi/local_file_system_operation_unittest.cc @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/message_loop.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/blob/shareable_file_reference.h" diff --git a/webkit/fileapi/local_file_system_quota_unittest.cc b/webkit/fileapi/local_file_system_quota_unittest.cc index b65af7cb..54768ac 100644 --- a/webkit/fileapi/local_file_system_quota_unittest.cc +++ b/webkit/fileapi/local_file_system_quota_unittest.cc @@ -14,7 +14,7 @@ #include "base/memory/weak_ptr.h" #include "base/message_loop.h" #include "base/platform_file.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/fileapi/async_file_test_helper.h" #include "webkit/fileapi/file_system_file_util.h" diff --git a/webkit/fileapi/obfuscated_file_util.cc b/webkit/fileapi/obfuscated_file_util.cc index 6f9a900..5121bba 100644 --- a/webkit/fileapi/obfuscated_file_util.cc +++ b/webkit/fileapi/obfuscated_file_util.cc @@ -13,8 +13,8 @@ #include "base/logging.h" #include "base/message_loop.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/sys_string_conversions.h" #include "googleurl/src/gurl.h" #include "webkit/fileapi/file_observers.h" diff --git a/webkit/glue/multipart_response_delegate.cc b/webkit/glue/multipart_response_delegate.cc index bffb386..e15cfb3 100644 --- a/webkit/glue/multipart_response_delegate.cc +++ b/webkit/glue/multipart_response_delegate.cc @@ -5,8 +5,8 @@ #include "webkit/glue/multipart_response_delegate.h" #include "base/logging.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "net/base/net_util.h" #include "net/http/http_util.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebHTTPHeaderVisitor.h" diff --git a/webkit/glue/webkitplatformsupport_impl.cc b/webkit/glue/webkitplatformsupport_impl.cc index bb06120..fdadd74 100644 --- a/webkit/glue/webkitplatformsupport_impl.cc +++ b/webkit/glue/webkitplatformsupport_impl.cc @@ -19,8 +19,8 @@ #include "base/platform_file.h" #include "base/process_util.h" #include "base/rand_util.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/synchronization/lock.h" #include "base/sys_info.h" #include "base/time.h" diff --git a/webkit/media/buffered_resource_loader.cc b/webkit/media/buffered_resource_loader.cc index fe7c5ba..8468002 100644 --- a/webkit/media/buffered_resource_loader.cc +++ b/webkit/media/buffered_resource_loader.cc @@ -8,9 +8,9 @@ #include "base/callback_helpers.h" #include "base/format_macros.h" #include "base/metrics/histogram.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "media/base/media_log.h" #include "net/http/http_request_headers.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" diff --git a/webkit/media/cache_util.cc b/webkit/media/cache_util.cc index 3e4cd2c..3a34a51 100644 --- a/webkit/media/cache_util.cc +++ b/webkit/media/cache_util.cc @@ -6,8 +6,8 @@ #include <string> -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "net/http/http_util.h" #include "net/http/http_version.h" diff --git a/webkit/media/cache_util_unittest.cc b/webkit/media/cache_util_unittest.cc index 2703026..e937a97d 100644 --- a/webkit/media/cache_util_unittest.cc +++ b/webkit/media/cache_util_unittest.cc @@ -8,8 +8,8 @@ #include "base/format_macros.h" #include "base/stringprintf.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebURLResponse.h" diff --git a/webkit/media/test_response_generator.cc b/webkit/media/test_response_generator.cc index faab513..7ceee23 100644 --- a/webkit/media/test_response_generator.cc +++ b/webkit/media/test_response_generator.cc @@ -5,8 +5,8 @@ #include "webkit/media/test_response_generator.h" #include "base/format_macros.h" -#include "base/string_number_conversions.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "net/base/net_errors.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebURLResponse.h" diff --git a/webkit/media/webmediaplayer_impl.cc b/webkit/media/webmediaplayer_impl.cc index 4008ffc..edae2bb 100644 --- a/webkit/media/webmediaplayer_impl.cc +++ b/webkit/media/webmediaplayer_impl.cc @@ -13,7 +13,7 @@ #include "base/callback.h" #include "base/message_loop_proxy.h" #include "base/metrics/histogram.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/synchronization/waitable_event.h" #include "cc/layers/video_layer.h" #include "gpu/GLES2/gl2extchromium.h" diff --git a/webkit/plugins/npapi/plugin_instance.cc b/webkit/plugins/npapi/plugin_instance.cc index 5891989..0fcdb19 100644 --- a/webkit/plugins/npapi/plugin_instance.cc +++ b/webkit/plugins/npapi/plugin_instance.cc @@ -8,7 +8,7 @@ #include "build/build_config.h" #include "base/file_util.h" #include "base/message_loop.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "net/base/escape.h" #include "webkit/glue/webkit_glue.h" diff --git a/webkit/plugins/npapi/plugin_list_mac.mm b/webkit/plugins/npapi/plugin_list_mac.mm index b8bdc4e..3bdbfc8 100644 --- a/webkit/plugins/npapi/plugin_list_mac.mm +++ b/webkit/plugins/npapi/plugin_list_mac.mm @@ -8,8 +8,8 @@ #include "base/file_util.h" #include "base/mac/mac_util.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/utf_string_conversions.h" #include "webkit/plugins/npapi/plugin_lib.h" diff --git a/webkit/plugins/npapi/plugin_list_win.cc b/webkit/plugins/npapi/plugin_list_win.cc index 4e53953..dd7e036 100644 --- a/webkit/plugins/npapi/plugin_list_win.cc +++ b/webkit/plugins/npapi/plugin_list_win.cc @@ -12,8 +12,8 @@ #include "base/files/memory_mapped_file.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/win/pe_image.h" #include "base/win/registry.h" diff --git a/webkit/plugins/npapi/test/plugin_geturl_test.cc b/webkit/plugins/npapi/test/plugin_geturl_test.cc index c01cbed..9d66a5d2 100644 --- a/webkit/plugins/npapi/test/plugin_geturl_test.cc +++ b/webkit/plugins/npapi/test/plugin_geturl_test.cc @@ -8,8 +8,8 @@ #include "base/basictypes.h" #include "base/file_util.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" // url for "self". The %22%22 is to make a statement for javascript to diff --git a/webkit/plugins/npapi/test/plugin_test.cc b/webkit/plugins/npapi/test/plugin_test.cc index 7ba97a2..17a2421 100644 --- a/webkit/plugins/npapi/test/plugin_test.cc +++ b/webkit/plugins/npapi/test/plugin_test.cc @@ -4,8 +4,8 @@ #include "webkit/plugins/npapi/test/plugin_test.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "webkit/plugins/npapi/test/npapi_constants.h" namespace NPAPIClient { diff --git a/webkit/plugins/npapi/test/plugin_windowless_test.cc b/webkit/plugins/npapi/test/plugin_windowless_test.cc index 9b6cd00..0a04f8a 100644 --- a/webkit/plugins/npapi/test/plugin_windowless_test.cc +++ b/webkit/plugins/npapi/test/plugin_windowless_test.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #define STRSAFE_NO_DEPRECATE -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "webkit/plugins/npapi/test/plugin_windowless_test.h" #include "webkit/plugins/npapi/test/plugin_client.h" diff --git a/webkit/plugins/ppapi/plugin_object.cc b/webkit/plugins/ppapi/plugin_object.cc index 61f155b..a5ef5fe 100644 --- a/webkit/plugins/ppapi/plugin_object.cc +++ b/webkit/plugins/ppapi/plugin_object.cc @@ -7,8 +7,8 @@ #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "third_party/npapi/bindings/npapi.h" #include "third_party/npapi/bindings/npruntime.h" #include "ppapi/c/dev/ppb_var_deprecated.h" diff --git a/webkit/quota/quota_manager.cc b/webkit/quota/quota_manager.cc index aece68f..02b5b19 100644 --- a/webkit/quota/quota_manager.cc +++ b/webkit/quota/quota_manager.cc @@ -18,7 +18,7 @@ #include "base/metrics/histogram.h" #include "base/sequenced_task_runner.h" #include "base/single_thread_task_runner.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/sys_info.h" #include "base/task_runner_util.h" #include "base/time.h" diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc index 36c761d..40ca29d 100644 --- a/webkit/tools/test_shell/test_shell_main.cc +++ b/webkit/tools/test_shell/test_shell_main.cc @@ -17,7 +17,7 @@ #include "base/path_service.h" #include "base/process_util.h" #include "base/rand_util.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/sys_info.h" #include "base/utf_string_conversions.h" #include "net/base/net_module.h" diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc index 2f46ecb..df7ced9 100644 --- a/webkit/tools/test_shell/test_webview_delegate.cc +++ b/webkit/tools/test_shell/test_webview_delegate.cc @@ -12,9 +12,9 @@ #include "base/file_util.h" #include "base/message_loop.h" #include "base/process_util.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "media/base/filter_collection.h" #include "media/base/media_log.h" |