diff options
59 files changed, 75 insertions, 72 deletions
diff --git a/webkit/mocks/mock_webhyphenator.cc b/webkit/mocks/mock_webhyphenator.cc index 219eca8..0432933 100644 --- a/webkit/mocks/mock_webhyphenator.cc +++ b/webkit/mocks/mock_webhyphenator.cc @@ -7,7 +7,7 @@ #include "base/logging.h" #include "base/memory/scoped_handle.h" #include "base/memory/scoped_ptr.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "third_party/hyphen/hyphen.h" namespace webkit_glue { diff --git a/webkit/plugins/npapi/plugin_constants_win.h b/webkit/plugins/npapi/plugin_constants_win.h index da2cace..35dafa1 100644 --- a/webkit/plugins/npapi/plugin_constants_win.h +++ b/webkit/plugins/npapi/plugin_constants_win.h @@ -5,7 +5,7 @@ #ifndef WEBKIT_PLUGINS_NPAPI_PLUGIN_CONSTANTS_WIN_H_ #define WEBKIT_PLUGINS_NPAPI_PLUGIN_CONSTANTS_WIN_H_ -#include "base/string16.h" +#include "base/strings/string16.h" #if !defined(OS_WIN) #error "Windows-only header" diff --git a/webkit/plugins/npapi/plugin_host.cc b/webkit/plugins/npapi/plugin_host.cc index 91889e5..cfa8f04 100644 --- a/webkit/plugins/npapi/plugin_host.cc +++ b/webkit/plugins/npapi/plugin_host.cc @@ -8,8 +8,8 @@ #include "base/file_util.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/string_util.h" #include "base/strings/string_piece.h" +#include "base/strings/string_util.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" diff --git a/webkit/plugins/npapi/plugin_lib.cc b/webkit/plugins/npapi/plugin_lib.cc index e6baf48..17cf5ec 100644 --- a/webkit/plugins/npapi/plugin_lib.cc +++ b/webkit/plugins/npapi/plugin_lib.cc @@ -8,9 +8,9 @@ #include "base/logging.h" #include "base/message_loop.h" #include "base/metrics/stats_counters.h" -#include "base/string_util.h" -#include "webkit/plugins/npapi/plugin_instance.h" +#include "base/strings/string_util.h" #include "webkit/plugins/npapi/plugin_host.h" +#include "webkit/plugins/npapi/plugin_instance.h" #include "webkit/plugins/npapi/plugin_list.h" namespace webkit { diff --git a/webkit/plugins/npapi/plugin_lib_unittest.cc b/webkit/plugins/npapi/plugin_lib_unittest.cc index 4f2ddf6..10659ce 100644 --- a/webkit/plugins/npapi/plugin_lib_unittest.cc +++ b/webkit/plugins/npapi/plugin_lib_unittest.cc @@ -4,7 +4,7 @@ #include "webkit/plugins/npapi/plugin_lib.h" -#include "base/string_util.h" +#include "base/strings/string_util.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 51863f8..9a0847c 100644 --- a/webkit/plugins/npapi/plugin_list.cc +++ b/webkit/plugins/npapi/plugin_list.cc @@ -9,8 +9,8 @@ #include "base/command_line.h" #include "base/lazy_instance.h" #include "base/logging.h" -#include "base/string_util.h" #include "base/strings/string_split.h" +#include "base/strings/string_util.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" #include "googleurl/src/gurl.h" diff --git a/webkit/plugins/npapi/plugin_list_mac.mm b/webkit/plugins/npapi/plugin_list_mac.mm index ae26ea5..107cc5f 100644 --- a/webkit/plugins/npapi/plugin_list_mac.mm +++ b/webkit/plugins/npapi/plugin_list_mac.mm @@ -13,9 +13,9 @@ #include "base/mac/scoped_cftyperef.h" #include "base/memory/scoped_ptr.h" #include "base/native_library.h" -#include "base/string_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" +#include "base/strings/string_util.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" diff --git a/webkit/plugins/npapi/plugin_list_posix.cc b/webkit/plugins/npapi/plugin_list_posix.cc index 34a3a32..6a10f84 100644 --- a/webkit/plugins/npapi/plugin_list_posix.cc +++ b/webkit/plugins/npapi/plugin_list_posix.cc @@ -23,9 +23,9 @@ #include "base/path_service.h" #include "base/posix/eintr_wrapper.h" #include "base/sha1.h" -#include "base/string_util.h" -#include "base/stringprintf.h" #include "base/strings/string_split.h" +#include "base/strings/string_util.h" +#include "base/strings/stringprintf.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" diff --git a/webkit/plugins/npapi/plugin_list_unittest.cc b/webkit/plugins/npapi/plugin_list_unittest.cc index c083d7a..246f51b 100644 --- a/webkit/plugins/npapi/plugin_list_unittest.cc +++ b/webkit/plugins/npapi/plugin_list_unittest.cc @@ -4,7 +4,7 @@ #include "webkit/plugins/npapi/plugin_list.h" -#include "base/string16.h" +#include "base/strings/string16.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_list_win.cc b/webkit/plugins/npapi/plugin_list_win.cc index 8b3008c..81af8e2 100644 --- a/webkit/plugins/npapi/plugin_list_win.cc +++ b/webkit/plugins/npapi/plugin_list_win.cc @@ -14,9 +14,9 @@ #include "base/files/memory_mapped_file.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" -#include "base/string_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" +#include "base/strings/string_util.h" #include "base/win/pe_image.h" #include "base/win/registry.h" #include "base/win/scoped_handle.h" diff --git a/webkit/plugins/npapi/plugin_stream.cc b/webkit/plugins/npapi/plugin_stream.cc index 5fcbace..1f7f4a6 100644 --- a/webkit/plugins/npapi/plugin_stream.cc +++ b/webkit/plugins/npapi/plugin_stream.cc @@ -12,7 +12,7 @@ #include "base/bind.h" #include "base/message_loop.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "googleurl/src/gurl.h" #include "net/base/mime_util.h" diff --git a/webkit/plugins/npapi/plugin_utils.cc b/webkit/plugins/npapi/plugin_utils.cc index e08f818..beaeb22 100644 --- a/webkit/plugins/npapi/plugin_utils.cc +++ b/webkit/plugins/npapi/plugin_utils.cc @@ -6,8 +6,8 @@ #include <algorithm> -#include "base/string_util.h" #include "base/strings/string_split.h" +#include "base/strings/string_util.h" #include "base/version.h" namespace webkit { diff --git a/webkit/plugins/npapi/plugin_utils.h b/webkit/plugins/npapi/plugin_utils.h index ba0c2e8..cc241d8 100644 --- a/webkit/plugins/npapi/plugin_utils.h +++ b/webkit/plugins/npapi/plugin_utils.h @@ -5,7 +5,7 @@ #ifndef WEBKIT_PLUGINS_NPAPI_PLUGIN_UTILS_H_ #define WEBKIT_PLUGINS_NPAPI_PLUGIN_UTILS_H_ -#include "base/string16.h" +#include "base/strings/string16.h" namespace base { class Version; diff --git a/webkit/plugins/npapi/test/plugin_arguments_test.cc b/webkit/plugins/npapi/test/plugin_arguments_test.cc index bab2298..bde0972 100644 --- a/webkit/plugins/npapi/test/plugin_arguments_test.cc +++ b/webkit/plugins/npapi/test/plugin_arguments_test.cc @@ -7,8 +7,8 @@ #include "webkit/plugins/npapi/test/plugin_arguments_test.h" #include "base/basictypes.h" -#include "base/string_util.h" -#include "base/stringprintf.h" +#include "base/strings/string_util.h" +#include "base/strings/stringprintf.h" namespace NPAPIClient { diff --git a/webkit/plugins/npapi/test/plugin_client.cc b/webkit/plugins/npapi/test/plugin_client.cc index dbd172e..123da9c 100644 --- a/webkit/plugins/npapi/test/plugin_client.cc +++ b/webkit/plugins/npapi/test/plugin_client.cc @@ -4,7 +4,7 @@ #include "webkit/plugins/npapi/test/plugin_client.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "webkit/plugins/npapi/test/plugin_execute_stream_javascript.h" #include "webkit/plugins/npapi/test/plugin_test.h" #include "webkit/plugins/npapi/test/plugin_test_factory.h" diff --git a/webkit/plugins/npapi/test/plugin_geturl_test.cc b/webkit/plugins/npapi/test/plugin_geturl_test.cc index a3c28e6..f412bdd 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_util.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_util.h" #include "base/strings/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_private_test.cc b/webkit/plugins/npapi/test/plugin_private_test.cc index b3aabce..cdfa8a9 100644 --- a/webkit/plugins/npapi/test/plugin_private_test.cc +++ b/webkit/plugins/npapi/test/plugin_private_test.cc @@ -5,7 +5,7 @@ #include "webkit/plugins/npapi/test/plugin_private_test.h" #include "base/basictypes.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "webkit/plugins/npapi/test/plugin_client.h" namespace NPAPIClient { diff --git a/webkit/plugins/npapi/test/plugin_setup_test.cc b/webkit/plugins/npapi/test/plugin_setup_test.cc index ded1379..3d96a539 100644 --- a/webkit/plugins/npapi/test/plugin_setup_test.cc +++ b/webkit/plugins/npapi/test/plugin_setup_test.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/basictypes.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "webkit/plugins/npapi/test/plugin_setup_test.h" diff --git a/webkit/plugins/npapi/test/plugin_test.cc b/webkit/plugins/npapi/test/plugin_test.cc index 17a2421..8dc9b4c 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_util.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_util.h" #include "webkit/plugins/npapi/test/npapi_constants.h" namespace NPAPIClient { diff --git a/webkit/plugins/npapi/test/plugin_thread_async_call_test.cc b/webkit/plugins/npapi/test/plugin_thread_async_call_test.cc index cab4411..d770e3a 100644 --- a/webkit/plugins/npapi/test/plugin_thread_async_call_test.cc +++ b/webkit/plugins/npapi/test/plugin_thread_async_call_test.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/message_loop.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/threading/thread.h" #include "webkit/plugins/npapi/test/plugin_client.h" diff --git a/webkit/plugins/npapi/test/plugin_windowless_test.cc b/webkit/plugins/npapi/test/plugin_windowless_test.cc index 0a04f8a..117834b 100644 --- a/webkit/plugins/npapi/test/plugin_windowless_test.cc +++ b/webkit/plugins/npapi/test/plugin_windowless_test.cc @@ -3,9 +3,11 @@ // found in the LICENSE file. #define STRSAFE_NO_DEPRECATE -#include "base/string_util.h" -#include "base/strings/string_number_conversions.h" + #include "webkit/plugins/npapi/test/plugin_windowless_test.h" + +#include "base/strings/string_number_conversions.h" +#include "base/strings/string_util.h" #include "webkit/plugins/npapi/test/plugin_client.h" #if defined(TOOLKIT_GTK) diff --git a/webkit/plugins/npapi/test/plugin_windowless_test.h b/webkit/plugins/npapi/test/plugin_windowless_test.h index 1669ebf..3b1c313 100644 --- a/webkit/plugins/npapi/test/plugin_windowless_test.h +++ b/webkit/plugins/npapi/test/plugin_windowless_test.h @@ -5,6 +5,7 @@ #ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_EXECUTE_SCRIPT_DELETE_TEST_H_ #define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_EXECUTE_SCRIPT_DELETE_TEST_H_ +#include "base/compiler_specific.h" #include "webkit/plugins/npapi/test/plugin_test.h" namespace NPAPIClient { diff --git a/webkit/plugins/npapi/webplugin_delegate.h b/webkit/plugins/npapi/webplugin_delegate.h index c076f43..959dd73 100644 --- a/webkit/plugins/npapi/webplugin_delegate.h +++ b/webkit/plugins/npapi/webplugin_delegate.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/string16.h" +#include "base/strings/string16.h" #include "build/build_config.h" #include "third_party/WebKit/public/platform/WebCanvas.h" #include "third_party/npapi/bindings/npapi.h" diff --git a/webkit/plugins/npapi/webplugin_delegate_impl.cc b/webkit/plugins/npapi/webplugin_delegate_impl.cc index 8cdf33a..a9c82bc 100644 --- a/webkit/plugins/npapi/webplugin_delegate_impl.cc +++ b/webkit/plugins/npapi/webplugin_delegate_impl.cc @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/process_util.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" #include "webkit/glue/webkit_glue.h" #include "webkit/plugins/npapi/plugin_instance.h" diff --git a/webkit/plugins/npapi/webplugin_delegate_impl_mac.mm b/webkit/plugins/npapi/webplugin_delegate_impl_mac.mm index 9f32f94..ae73c55 100644 --- a/webkit/plugins/npapi/webplugin_delegate_impl_mac.mm +++ b/webkit/plugins/npapi/webplugin_delegate_impl_mac.mm @@ -14,7 +14,7 @@ #include "base/mac/mac_util.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/stats_counters.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" #include "skia/ext/skia_utils_mac.h" diff --git a/webkit/plugins/npapi/webplugin_delegate_impl_win.cc b/webkit/plugins/npapi/webplugin_delegate_impl_win.cc index 0cbeb2d..0624ef3 100644 --- a/webkit/plugins/npapi/webplugin_delegate_impl_win.cc +++ b/webkit/plugins/npapi/webplugin_delegate_impl_win.cc @@ -14,8 +14,8 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/metrics/stats_counters.h" -#include "base/string_util.h" -#include "base/stringprintf.h" +#include "base/strings/string_util.h" +#include "base/strings/stringprintf.h" #include "base/synchronization/lock.h" #include "base/version.h" #include "base/win/iat_patch_function.h" diff --git a/webkit/plugins/npapi/webplugin_ime_win.h b/webkit/plugins/npapi/webplugin_ime_win.h index 0b20584..ea5abb6 100644 --- a/webkit/plugins/npapi/webplugin_ime_win.h +++ b/webkit/plugins/npapi/webplugin_ime_win.h @@ -9,7 +9,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "third_party/npapi/bindings/npapi.h" #include "ui/gfx/rect.h" diff --git a/webkit/plugins/npapi/webplugin_impl.cc b/webkit/plugins/npapi/webplugin_impl.cc index bea3e55..63413f4 100644 --- a/webkit/plugins/npapi/webplugin_impl.cc +++ b/webkit/plugins/npapi/webplugin_impl.cc @@ -9,8 +9,8 @@ #include "base/logging.h" #include "base/memory/linked_ptr.h" #include "base/message_loop.h" -#include "base/string_util.h" -#include "base/stringprintf.h" +#include "base/strings/string_util.h" +#include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "cc/layers/io_surface_layer.h" #include "googleurl/src/gurl.h" diff --git a/webkit/plugins/npapi/webplugin_impl_unittest.cc b/webkit/plugins/npapi/webplugin_impl_unittest.cc index f66df5c..9f531b8 100644 --- a/webkit/plugins/npapi/webplugin_impl_unittest.cc +++ b/webkit/plugins/npapi/webplugin_impl_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/string_util.h" +#include "base/strings/string_util.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/public/platform/WebCString.h" #include "third_party/WebKit/public/platform/WebString.h" diff --git a/webkit/plugins/ppapi/event_conversion.cc b/webkit/plugins/ppapi/event_conversion.cc index eebf3ec..c08db71 100644 --- a/webkit/plugins/ppapi/event_conversion.cc +++ b/webkit/plugins/ppapi/event_conversion.cc @@ -10,8 +10,8 @@ #include "base/i18n/char_iterator.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/string_util.h" -#include "base/stringprintf.h" +#include "base/strings/string_util.h" +#include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversion_utils.h" #include "base/strings/utf_string_conversions.h" #include "ppapi/c/pp_input_event.h" diff --git a/webkit/plugins/ppapi/npapi_glue.cc b/webkit/plugins/ppapi/npapi_glue.cc index 3dcae6b..67af723 100644 --- a/webkit/plugins/ppapi/npapi_glue.cc +++ b/webkit/plugins/ppapi/npapi_glue.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "base/memory/ref_counted.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "webkit/plugins/ppapi/host_array_buffer_var.h" #include "webkit/plugins/ppapi/host_globals.h" #include "webkit/plugins/ppapi/host_var_tracker.h" diff --git a/webkit/plugins/ppapi/plugin_object.cc b/webkit/plugins/ppapi/plugin_object.cc index 9b6a130..4ff6f9e 100644 --- a/webkit/plugins/ppapi/plugin_object.cc +++ b/webkit/plugins/ppapi/plugin_object.cc @@ -7,10 +7,8 @@ #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.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 "base/strings/string_util.h" #include "ppapi/c/dev/ppb_var_deprecated.h" #include "ppapi/c/dev/ppp_class_deprecated.h" #include "ppapi/c/pp_resource.h" @@ -20,6 +18,8 @@ #include "ppapi/shared_impl/var.h" #include "ppapi/shared_impl/var_tracker.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" +#include "third_party/npapi/bindings/npapi.h" +#include "third_party/npapi/bindings/npruntime.h" #include "webkit/plugins/ppapi/npapi_glue.h" #include "webkit/plugins/ppapi/plugin_module.h" #include "webkit/plugins/ppapi/ppapi_plugin_instance.h" diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc index 52846eb..56598741 100644 --- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc +++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc @@ -11,7 +11,7 @@ #include "base/memory/linked_ptr.h" #include "base/message_loop.h" #include "base/stl_util.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/strings/utf_offset_string_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/time.h" diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.h b/webkit/plugins/ppapi/ppapi_plugin_instance.h index c4d4267..3f4cb30 100644 --- a/webkit/plugins/ppapi/ppapi_plugin_instance.h +++ b/webkit/plugins/ppapi/ppapi_plugin_instance.h @@ -14,7 +14,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "cc/layers/texture_layer_client.h" #include "googleurl/src/gurl.h" #include "ppapi/c/dev/pp_cursor_type_dev.h" diff --git a/webkit/plugins/ppapi/ppb_file_ref_impl.cc b/webkit/plugins/ppapi/ppb_file_ref_impl.cc index efacaf5..fbdd960 100644 --- a/webkit/plugins/ppapi/ppb_file_ref_impl.cc +++ b/webkit/plugins/ppapi/ppb_file_ref_impl.cc @@ -6,7 +6,7 @@ #include "base/files/file_util_proxy.h" #include "base/platform_file.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "googleurl/src/gurl.h" #include "net/base/escape.h" diff --git a/webkit/plugins/ppapi/url_request_info_util.cc b/webkit/plugins/ppapi/url_request_info_util.cc index 8706a3c..91ef556 100644 --- a/webkit/plugins/ppapi/url_request_info_util.cc +++ b/webkit/plugins/ppapi/url_request_info_util.cc @@ -5,7 +5,7 @@ #include "webkit/plugins/ppapi/url_request_info_util.h" #include "base/logging.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "googleurl/src/gurl.h" #include "googleurl/src/url_util.h" #include "net/http/http_util.h" diff --git a/webkit/renderer/appcache/web_application_cache_host_impl.cc b/webkit/renderer/appcache/web_application_cache_host_impl.cc index f531674..3b8f70f 100644 --- a/webkit/renderer/appcache/web_application_cache_host_impl.cc +++ b/webkit/renderer/appcache/web_application_cache_host_impl.cc @@ -6,8 +6,8 @@ #include "base/compiler_specific.h" #include "base/id_map.h" -#include "base/string_util.h" -#include "base/stringprintf.h" +#include "base/strings/string_util.h" +#include "base/strings/stringprintf.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/public/platform/WebURL.h" diff --git a/webkit/renderer/compositor_bindings/web_layer_impl.cc b/webkit/renderer/compositor_bindings/web_layer_impl.cc index 5eaaca8..8f0adb4 100644 --- a/webkit/renderer/compositor_bindings/web_layer_impl.cc +++ b/webkit/renderer/compositor_bindings/web_layer_impl.cc @@ -4,7 +4,7 @@ #include "webkit/renderer/compositor_bindings/web_layer_impl.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "cc/animation/animation.h" #include "cc/base/region.h" #include "cc/layers/layer.h" diff --git a/webkit/renderer/cpp_variant.cc b/webkit/renderer/cpp_variant.cc index 4c913ff..0f2c497 100644 --- a/webkit/renderer/cpp_variant.cc +++ b/webkit/renderer/cpp_variant.cc @@ -6,8 +6,8 @@ #include <limits> #include "base/logging.h" -#include "base/string_util.h" -#include "base/stringprintf.h" +#include "base/strings/string_util.h" +#include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" #include "webkit/renderer/cpp_variant.h" diff --git a/webkit/renderer/cpp_variant_unittest.cc b/webkit/renderer/cpp_variant_unittest.cc index 3774171..93b51c0 100644 --- a/webkit/renderer/cpp_variant_unittest.cc +++ b/webkit/renderer/cpp_variant_unittest.cc @@ -5,7 +5,7 @@ #include <vector> #include "base/compiler_specific.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "testing/gtest/include/gtest/gtest.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_proxy.h b/webkit/renderer/dom_storage/dom_storage_proxy.h index 386954b..9b8e5be 100644 --- a/webkit/renderer/dom_storage/dom_storage_proxy.h +++ b/webkit/renderer/dom_storage/dom_storage_proxy.h @@ -8,7 +8,7 @@ #include "base/bind.h" #include "base/memory/ref_counted.h" #include "base/nullable_string16.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "googleurl/src/gurl.h" #include "webkit/common/dom_storage/dom_storage_types.h" diff --git a/webkit/renderer/media/audio_decoder.cc b/webkit/renderer/media/audio_decoder.cc index 428c588..8bd648e 100644 --- a/webkit/renderer/media/audio_decoder.cc +++ b/webkit/renderer/media/audio_decoder.cc @@ -6,7 +6,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/time.h" #include "media/base/audio_bus.h" #include "media/base/limits.h" diff --git a/webkit/renderer/media/buffered_resource_loader.cc b/webkit/renderer/media/buffered_resource_loader.cc index 8e300b5..73f67a8 100644 --- a/webkit/renderer/media/buffered_resource_loader.cc +++ b/webkit/renderer/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_util.h" -#include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_util.h" +#include "base/strings/stringprintf.h" #include "media/base/media_log.h" #include "net/http/http_request_headers.h" #include "third_party/WebKit/public/platform/WebString.h" diff --git a/webkit/renderer/media/buffered_resource_loader_unittest.cc b/webkit/renderer/media/buffered_resource_loader_unittest.cc index 6e7bd9f..5a1c0dd 100644 --- a/webkit/renderer/media/buffered_resource_loader_unittest.cc +++ b/webkit/renderer/media/buffered_resource_loader_unittest.cc @@ -8,7 +8,7 @@ #include "base/bind.h" #include "base/format_macros.h" #include "base/message_loop.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "media/base/media_log.h" #include "media/base/seekable_buffer.h" #include "net/base/net_errors.h" diff --git a/webkit/renderer/media/cache_util.cc b/webkit/renderer/media/cache_util.cc index 788ad79..3feafdc 100644 --- a/webkit/renderer/media/cache_util.cc +++ b/webkit/renderer/media/cache_util.cc @@ -6,8 +6,8 @@ #include <string> -#include "base/string_util.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_util.h" #include "base/time.h" #include "net/http/http_util.h" #include "net/http/http_version.h" diff --git a/webkit/renderer/media/cache_util_unittest.cc b/webkit/renderer/media/cache_util_unittest.cc index d774d30..00ebaca 100644 --- a/webkit/renderer/media/cache_util_unittest.cc +++ b/webkit/renderer/media/cache_util_unittest.cc @@ -7,9 +7,9 @@ #include <string> #include "base/format_macros.h" -#include "base/string_util.h" -#include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_util.h" +#include "base/strings/stringprintf.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/WebURLResponse.h" diff --git a/webkit/renderer/media/crypto/key_systems.cc b/webkit/renderer/media/crypto/key_systems.cc index 7e837f5..161ec88 100644 --- a/webkit/renderer/media/crypto/key_systems.cc +++ b/webkit/renderer/media/crypto/key_systems.cc @@ -8,7 +8,7 @@ #include "base/lazy_instance.h" #include "base/logging.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "net/base/mime_util.h" #include "third_party/WebKit/public/platform/WebCString.h" #include "third_party/WebKit/public/platform/WebString.h" diff --git a/webkit/renderer/media/test_response_generator.cc b/webkit/renderer/media/test_response_generator.cc index ab70e6f..a4d13d1 100644 --- a/webkit/renderer/media/test_response_generator.cc +++ b/webkit/renderer/media/test_response_generator.cc @@ -5,8 +5,8 @@ #include "webkit/renderer/media/test_response_generator.h" #include "base/format_macros.h" -#include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/stringprintf.h" #include "net/base/net_errors.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/WebURLResponse.h" diff --git a/webkit/support/mock_webclipboard_impl.cc b/webkit/support/mock_webclipboard_impl.cc index 704437e..2ff08fc 100644 --- a/webkit/support/mock_webclipboard_impl.cc +++ b/webkit/support/mock_webclipboard_impl.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "base/stl_util.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "third_party/WebKit/public/platform/WebCommon.h" #include "third_party/WebKit/public/platform/WebDragData.h" diff --git a/webkit/support/mock_webclipboard_impl.h b/webkit/support/mock_webclipboard_impl.h index 845d1bf..61efcf4 100644 --- a/webkit/support/mock_webclipboard_impl.h +++ b/webkit/support/mock_webclipboard_impl.h @@ -12,7 +12,7 @@ #include <map> -#include "base/string16.h" +#include "base/strings/string16.h" #include "third_party/WebKit/public/platform/WebClipboard.h" #include "third_party/WebKit/public/platform/WebDragData.h" #include "third_party/WebKit/public/platform/WebImage.h" diff --git a/webkit/support/platform_support_android.cc b/webkit/support/platform_support_android.cc index 581c974..9ea968e 100644 --- a/webkit/support/platform_support_android.cc +++ b/webkit/support/platform_support_android.cc @@ -9,7 +9,7 @@ #include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/strings/string_piece.h" #include "base/test/test_support_android.h" #include "googleurl/src/gurl.h" diff --git a/webkit/support/platform_support_linux.cc b/webkit/support/platform_support_linux.cc index e36c510..d108520 100644 --- a/webkit/support/platform_support_linux.cc +++ b/webkit/support/platform_support_linux.cc @@ -8,7 +8,7 @@ #include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/strings/string_piece.h" #include "grit/webkit_resources.h" #include "ui/base/resource/resource_bundle.h" diff --git a/webkit/support/platform_support_mac.mm b/webkit/support/platform_support_mac.mm index 4c78746..165bffe 100644 --- a/webkit/support/platform_support_mac.mm +++ b/webkit/support/platform_support_mac.mm @@ -15,7 +15,7 @@ #include "base/mac/bundle_locations.h" #include "base/mac/mac_util.h" #include "base/path_service.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" #include "grit/webkit_resources.h" #include "ui/base/resource/data_pack.h" diff --git a/webkit/support/platform_support_win.cc b/webkit/support/platform_support_win.cc index bf7856a..90c4481 100644 --- a/webkit/support/platform_support_win.cc +++ b/webkit/support/platform_support_win.cc @@ -9,7 +9,7 @@ #include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/strings/string_piece.h" #include "base/win/resource_util.h" #include "grit/webkit_chromium_resources.h" diff --git a/webkit/support/simple_clipboard_impl.cc b/webkit/support/simple_clipboard_impl.cc index ac10492..437ff48 100644 --- a/webkit/support/simple_clipboard_impl.cc +++ b/webkit/support/simple_clipboard_impl.cc @@ -8,7 +8,7 @@ #include "base/lazy_instance.h" #include "base/stl_util.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "googleurl/src/gurl.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/zlib/zlib.h" diff --git a/webkit/support/simple_database_system.h b/webkit/support/simple_database_system.h index b920c23..43bd466 100644 --- a/webkit/support/simple_database_system.h +++ b/webkit/support/simple_database_system.h @@ -10,7 +10,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/memory/ref_counted.h" #include "base/platform_file.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/synchronization/lock.h" #include "base/threading/thread.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabaseObserver.h" diff --git a/webkit/support/simple_resource_loader_bridge.cc b/webkit/support/simple_resource_loader_bridge.cc index ade6185..666f6c4 100644 --- a/webkit/support/simple_resource_loader_bridge.cc +++ b/webkit/support/simple_resource_loader_bridge.cc @@ -40,7 +40,7 @@ #include "base/memory/ref_counted.h" #include "base/message_loop.h" #include "base/message_loop/message_loop_proxy.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread.h" #include "base/time.h" diff --git a/webkit/support/test_shell_webmimeregistry_impl.cc b/webkit/support/test_shell_webmimeregistry_impl.cc index eab4b25..50253c6 100644 --- a/webkit/support/test_shell_webmimeregistry_impl.cc +++ b/webkit/support/test_shell_webmimeregistry_impl.cc @@ -5,7 +5,7 @@ #include "webkit/support/test_shell_webmimeregistry_impl.h" #include "base/basictypes.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "net/base/mime_util.h" #include "third_party/WebKit/public/platform/WebString.h" diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc index 783659f..3f16aed 100644 --- a/webkit/support/webkit_support.cc +++ b/webkit/support/webkit_support.cc @@ -22,9 +22,9 @@ #include "base/path_service.h" #include "base/process_util.h" #include "base/run_loop.h" -#include "base/string_util.h" -#include "base/stringprintf.h" #include "base/strings/string_piece.h" +#include "base/strings/string_util.h" +#include "base/strings/stringprintf.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/time.h" |