diff options
56 files changed, 59 insertions, 59 deletions
diff --git a/android_webview/renderer/aw_render_view_ext.cc b/android_webview/renderer/aw_render_view_ext.cc index df24c77..2e253ef 100644 --- a/android_webview/renderer/aw_render_view_ext.cc +++ b/android_webview/renderer/aw_render_view_ext.cc @@ -10,7 +10,7 @@ #include "android_webview/common/render_view_messages.h" #include "android_webview/common/renderer_picture_map.h" #include "base/bind.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "content/public/common/url_constants.h" #include "content/public/renderer/android_content_detection_prefixes.h" #include "content/public/renderer/document_state.h" diff --git a/ash/display/display_controller.cc b/ash/display/display_controller.cc index b534bbe..ed85e94 100644 --- a/ash/display/display_controller.cc +++ b/ash/display/display_controller.cc @@ -21,9 +21,9 @@ #include "ash/wm/window_util.h" #include "base/command_line.h" #include "base/json/json_value_converter.h" -#include "base/string_piece.h" #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_piece.h" #include "base/values.h" #include "third_party/skia/include/utils/SkMatrix44.h" #include "ui/aura/client/cursor_client.h" diff --git a/ash/display/display_pref_util.h b/ash/display/display_pref_util.h index b9f41f6..1b44962 100644 --- a/ash/display/display_pref_util.h +++ b/ash/display/display_pref_util.h @@ -8,7 +8,7 @@ #include <map> #include <string> -#include "base/string_piece.h" +#include "base/strings/string_piece.h" namespace ash { diff --git a/cc/trees/layer_tree_host_perftest.cc b/cc/trees/layer_tree_host_perftest.cc index a3ee7a6..dddd743 100644 --- a/cc/trees/layer_tree_host_perftest.cc +++ b/cc/trees/layer_tree_host_perftest.cc @@ -7,7 +7,7 @@ #include "base/file_util.h" #include "base/files/file_path.h" #include "base/path_service.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "cc/layers/content_layer.h" #include "cc/layers/nine_patch_layer.h" #include "cc/layers/solid_color_layer.h" diff --git a/chrome_frame/chrome_tab.cc b/chrome_frame/chrome_tab.cc index d686b64..0d6e059 100644 --- a/chrome_frame/chrome_tab.cc +++ b/chrome_frame/chrome_tab.cc @@ -21,8 +21,8 @@ #include "base/path_service.h" #include "base/string16.h" #include "base/string_number_conversions.h" -#include "base/string_piece.h" #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/win/registry.h" diff --git a/chrome_frame/test/chrome_frame_test_utils.cc b/chrome_frame/test/chrome_frame_test_utils.cc index 7e14bca..65bbbd8 100644 --- a/chrome_frame/test/chrome_frame_test_utils.cc +++ b/chrome_frame/test/chrome_frame_test_utils.cc @@ -20,9 +20,9 @@ #include "base/process.h" #include "base/process_util.h" #include "base/string_number_conversions.h" -#include "base/string_piece.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_piece.h" #include "base/utf_string_conversions.h" #include "base/win/registry.h" #include "base/win/scoped_handle.h" diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc index c065333..d46021d 100644 --- a/chrome_frame/test/net/fake_external_tab.cc +++ b/chrome_frame/test/net/fake_external_tab.cc @@ -22,9 +22,9 @@ #include "base/prefs/json_pref_store.h" #include "base/prefs/pref_registry_simple.h" #include "base/prefs/pref_service.h" -#include "base/string_piece.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_piece.h" #include "base/system_monitor/system_monitor.h" #include "base/test/test_timeouts.h" #include "base/threading/platform_thread.h" diff --git a/chrome_frame/test/test_scrubber.h b/chrome_frame/test/test_scrubber.h index 64fbbdc..dd124ce 100644 --- a/chrome_frame/test/test_scrubber.h +++ b/chrome_frame/test/test_scrubber.h @@ -15,7 +15,7 @@ #ifndef CHROME_FRAME_TEST_TEST_SCRUBBER_H_ #define CHROME_FRAME_TEST_TEST_SCRUBBER_H_ -#include "base/string_piece.h" +#include "base/strings/string_piece.h" namespace testing { class UnitTest; diff --git a/chrome_frame/test/test_server.cc b/chrome_frame/test/test_server.cc index 7577e2d..181209e 100644 --- a/chrome_frame/test/test_server.cc +++ b/chrome_frame/test/test_server.cc @@ -11,9 +11,9 @@ #include "base/bind.h" #include "base/logging.h" #include "base/string_number_conversions.h" -#include "base/string_piece.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_piece.h" #include "base/utf_string_conversions.h" #include "chrome_frame/test/chrome_frame_test_utils.h" #include "net/base/winsock_init.h" diff --git a/chrome_frame/utils.cc b/chrome_frame/utils.cc index d7b4847..e7865b7 100644 --- a/chrome_frame/utils.cc +++ b/chrome_frame/utils.cc @@ -16,9 +16,9 @@ #include "base/logging.h" #include "base/path_service.h" #include "base/string_number_conversions.h" -#include "base/string_piece.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_piece.h" #include "base/strings/string_tokenizer.h" #include "base/threading/thread_local.h" #include "base/utf_string_conversions.h" diff --git a/chromeos/network/network_configuration_handler_unittest.cc b/chromeos/network/network_configuration_handler_unittest.cc index 00554f6..e33f64a 100644 --- a/chromeos/network/network_configuration_handler_unittest.cc +++ b/chromeos/network/network_configuration_handler_unittest.cc @@ -5,7 +5,7 @@ #include "base/bind.h" #include "base/json/json_writer.h" #include "base/message_loop.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "base/values.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/mock_dbus_thread_manager.h" diff --git a/crypto/encryptor.h b/crypto/encryptor.h index 798a26f..c91d5a4 100644 --- a/crypto/encryptor.h +++ b/crypto/encryptor.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "build/build_config.h" #include "crypto/crypto_export.h" diff --git a/crypto/hkdf.h b/crypto/hkdf.h index c980c36..1d7a876 100644 --- a/crypto/hkdf.h +++ b/crypto/hkdf.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "build/build_config.h" #include "crypto/crypto_export.h" diff --git a/crypto/hmac.h b/crypto/hmac.h index d527d16..c7b22fa 100644 --- a/crypto/hmac.h +++ b/crypto/hmac.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "crypto/crypto_export.h" namespace crypto { diff --git a/crypto/openpgp_symmetric_encryption.h b/crypto/openpgp_symmetric_encryption.h index f70f2cb..bcc81d6 100644 --- a/crypto/openpgp_symmetric_encryption.h +++ b/crypto/openpgp_symmetric_encryption.h @@ -7,7 +7,7 @@ #include <string> -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "crypto/crypto_export.h" namespace crypto { diff --git a/crypto/openssl_util.cc b/crypto/openssl_util.cc index bdf24e6..5bc3ce5 100644 --- a/crypto/openssl_util.cc +++ b/crypto/openssl_util.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/memory/scoped_vector.h" #include "base/memory/singleton.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "base/synchronization/lock.h" namespace crypto { diff --git a/crypto/p224.h b/crypto/p224.h index 815be16..2efecfa 100644 --- a/crypto/p224.h +++ b/crypto/p224.h @@ -8,7 +8,7 @@ #include <string> #include "base/basictypes.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "crypto/crypto_export.h" namespace crypto { diff --git a/crypto/p224_spake.h b/crypto/p224_spake.h index 1711d56..6905ef2 100644 --- a/crypto/p224_spake.h +++ b/crypto/p224_spake.h @@ -5,7 +5,7 @@ #ifndef CRYPTO_P224_SPAKE_H_ #define CRYPTO_P224_SPAKE_H_ -#include <base/string_piece.h> +#include <base/strings/string_piece.h> #include <crypto/p224.h> #include <crypto/sha2.h> diff --git a/crypto/sha2.h b/crypto/sha2.h index e235f82..7e279d3 100644 --- a/crypto/sha2.h +++ b/crypto/sha2.h @@ -7,7 +7,7 @@ #include <string> -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "crypto/crypto_export.h" namespace crypto { diff --git a/dbus/object_proxy.cc b/dbus/object_proxy.cc index 9a84f25..f6b2952 100644 --- a/dbus/object_proxy.cc +++ b/dbus/object_proxy.cc @@ -8,8 +8,8 @@ #include "base/logging.h" #include "base/message_loop.h" #include "base/metrics/histogram.h" -#include "base/string_piece.h" #include "base/stringprintf.h" +#include "base/strings/string_piece.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" #include "dbus/dbus_statistics.h" diff --git a/dbus/object_proxy.h b/dbus/object_proxy.h index 61576e6..23c0f4c 100644 --- a/dbus/object_proxy.h +++ b/dbus/object_proxy.h @@ -13,7 +13,7 @@ #include "base/callback.h" #include "base/memory/ref_counted.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "base/time.h" #include "dbus/dbus_export.h" #include "dbus/object_path.h" diff --git a/extensions/common/url_pattern.cc b/extensions/common/url_pattern.cc index 435fc78..17983dc 100644 --- a/extensions/common/url_pattern.cc +++ b/extensions/common/url_pattern.cc @@ -5,8 +5,8 @@ #include "extensions/common/url_pattern.h" #include "base/string_number_conversions.h" -#include "base/string_piece.h" #include "base/string_util.h" +#include "base/strings/string_piece.h" #include "base/strings/string_split.h" #include "content/public/common/url_constants.h" #include "extensions/common/constants.h" diff --git a/jingle/glue/fake_ssl_client_socket.h b/jingle/glue/fake_ssl_client_socket.h index f92aa76..5bc4547 100644 --- a/jingle/glue/fake_ssl_client_socket.h +++ b/jingle/glue/fake_ssl_client_socket.h @@ -22,7 +22,7 @@ #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "net/base/completion_callback.h" #include "net/base/net_errors.h" #include "net/socket/stream_socket.h" diff --git a/jingle/notifier/base/xmpp_connection.cc b/jingle/notifier/base/xmpp_connection.cc index 8bcb197..603b474 100644 --- a/jingle/notifier/base/xmpp_connection.cc +++ b/jingle/notifier/base/xmpp_connection.cc @@ -7,7 +7,7 @@ #include "base/compiler_specific.h" #include "base/logging.h" #include "base/message_loop.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "jingle/glue/chrome_async_socket.h" #include "jingle/glue/task_pump.h" #include "jingle/glue/xmpp_client_socket_factory.h" diff --git a/media/base/audio_hash.h b/media/base/audio_hash.h index e7f6417..3dc0e9e 100644 --- a/media/base/audio_hash.h +++ b/media/base/audio_hash.h @@ -8,7 +8,7 @@ #include <string> #include "base/basictypes.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "media/base/media_export.h" namespace media { diff --git a/media/base/ranges_unittest.cc b/media/base/ranges_unittest.cc index 967d138..ad9f0d3 100644 --- a/media/base/ranges_unittest.cc +++ b/media/base/ranges_unittest.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include <sstream> - #include "media/base/ranges.h" -#include "base/string_piece.h" +#include <sstream> + +#include "base/strings/string_piece.h" #include "testing/gtest/include/gtest/gtest.h" namespace media { diff --git a/media/base/video_frame.cc b/media/base/video_frame.cc index 62e81ca..9c3b4b6 100644 --- a/media/base/video_frame.cc +++ b/media/base/video_frame.cc @@ -10,7 +10,7 @@ #include "base/callback_helpers.h" #include "base/logging.h" #include "base/memory/aligned_memory.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "media/base/limits.h" #include "media/base/video_util.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/media/crypto/aes_decryptor.h b/media/crypto/aes_decryptor.h index 30d37b4..38d6788 100644 --- a/media/crypto/aes_decryptor.h +++ b/media/crypto/aes_decryptor.h @@ -11,7 +11,7 @@ #include "base/hash_tables.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "base/synchronization/lock.h" #include "media/base/decryptor.h" #include "media/base/media_export.h" diff --git a/printing/backend/print_backend_win.cc b/printing/backend/print_backend_win.cc index c52d2e9..14d87aa 100644 --- a/printing/backend/print_backend_win.cc +++ b/printing/backend/print_backend_win.cc @@ -8,7 +8,7 @@ #include <winspool.h> #include "base/memory/scoped_ptr.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "base/utf_string_conversions.h" #include "base/win/scoped_bstr.h" #include "base/win/scoped_comptr.h" diff --git a/remoting/protocol/auth_util.h b/remoting/protocol/auth_util.h index 3493550..e73fee8 100644 --- a/remoting/protocol/auth_util.h +++ b/remoting/protocol/auth_util.h @@ -7,7 +7,7 @@ #include <string> -#include "base/string_piece.h" +#include "base/strings/string_piece.h" namespace net { class SSLSocket; diff --git a/tools/android/forwarder2/command.cc b/tools/android/forwarder2/command.cc index c070ed9..3f1d3c9 100644 --- a/tools/android/forwarder2/command.cc +++ b/tools/android/forwarder2/command.cc @@ -12,7 +12,7 @@ #include "base/logging.h" #include "base/safe_strerror_posix.h" #include "base/string_number_conversions.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "tools/android/forwarder2/socket.h" using base::StringPiece; diff --git a/tools/android/forwarder2/device_forwarder_main.cc b/tools/android/forwarder2/device_forwarder_main.cc index c6f0442..4fcd836 100644 --- a/tools/android/forwarder2/device_forwarder_main.cc +++ b/tools/android/forwarder2/device_forwarder_main.cc @@ -13,8 +13,8 @@ #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/logging.h" -#include "base/string_piece.h" #include "base/stringprintf.h" +#include "base/strings/string_piece.h" #include "base/threading/thread.h" #include "tools/android/forwarder2/common.h" #include "tools/android/forwarder2/daemon.h" diff --git a/tools/android/forwarder2/host_forwarder_main.cc b/tools/android/forwarder2/host_forwarder_main.cc index 64e2676..ffc248c 100644 --- a/tools/android/forwarder2/host_forwarder_main.cc +++ b/tools/android/forwarder2/host_forwarder_main.cc @@ -20,9 +20,9 @@ #include "base/posix/eintr_wrapper.h" #include "base/safe_strerror_posix.h" #include "base/string_number_conversions.h" -#include "base/string_piece.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_piece.h" #include "base/strings/string_split.h" #include "tools/android/forwarder2/common.h" #include "tools/android/forwarder2/daemon.h" diff --git a/tools/json_schema_compiler/cpp_bundle_generator.py b/tools/json_schema_compiler/cpp_bundle_generator.py index e98f0c3..453e446 100644 --- a/tools/json_schema_compiler/cpp_bundle_generator.py +++ b/tools/json_schema_compiler/cpp_bundle_generator.py @@ -209,7 +209,7 @@ class _SchemasHGenerator(object): c.Append('#include <map>') c.Append('#include <string>') c.Append(); - c.Append('#include "base/string_piece.h"') + c.Append('#include "base/strings/string_piece.h"') c.Append() c.Concat(cpp_util.OpenNamespace(self._bundle._cpp_namespace)) c.Append() diff --git a/ui/base/resource/data_pack.cc b/ui/base/resource/data_pack.cc index 4901a9b..54694d9 100644 --- a/ui/base/resource/data_pack.cc +++ b/ui/base/resource/data_pack.cc @@ -11,7 +11,7 @@ #include "base/logging.h" #include "base/memory/ref_counted_memory.h" #include "base/metrics/histogram.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" // For details of the file layout, see // http://dev.chromium.org/developers/design-documents/linuxresourcesandlocalizedstrings diff --git a/ui/base/resource/data_pack.h b/ui/base/resource/data_pack.h index 3935e6b..2ea938f 100644 --- a/ui/base/resource/data_pack.h +++ b/ui/base/resource/data_pack.h @@ -14,7 +14,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "base/platform_file.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "ui/base/layout.h" #include "ui/base/resource/resource_handle.h" #include "ui/base/ui_export.h" diff --git a/ui/base/resource/data_pack_unittest.cc b/ui/base/resource/data_pack_unittest.cc index 8804350..0ac7819d 100644 --- a/ui/base/resource/data_pack_unittest.cc +++ b/ui/base/resource/data_pack_unittest.cc @@ -6,7 +6,7 @@ #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/path_service.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/resource/data_pack.h" diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc index c1687f8..6dee8d3 100644 --- a/ui/base/resource/resource_bundle.cc +++ b/ui/base/resource/resource_bundle.cc @@ -13,7 +13,7 @@ #include "base/metrics/histogram.h" #include "base/path_service.h" #include "base/stl_util.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "base/synchronization/lock.h" #include "base/utf_string_conversions.h" #include "build/build_config.h" diff --git a/ui/base/resource/resource_bundle.h b/ui/base/resource/resource_bundle.h index 2fa6bf0..9ef3c5a1 100644 --- a/ui/base/resource/resource_bundle.h +++ b/ui/base/resource/resource_bundle.h @@ -17,7 +17,7 @@ #include "base/memory/scoped_vector.h" #include "base/platform_file.h" #include "base/string16.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "ui/base/layout.h" #include "ui/base/ui_export.h" #include "ui/gfx/font.h" diff --git a/ui/base/resource/resource_handle.h b/ui/base/resource/resource_handle.h index 267e232..14be54e 100644 --- a/ui/base/resource/resource_handle.h +++ b/ui/base/resource/resource_handle.h @@ -6,7 +6,7 @@ #define UI_BASE_RESOURCE_RESOURCE_HANDLE_H_ #include "base/basictypes.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "ui/base/layout.h" #include "ui/base/ui_export.h" diff --git a/ui/gfx/platform_font_pango.cc b/ui/gfx/platform_font_pango.cc index 539e50b..88181d0 100644 --- a/ui/gfx/platform_font_pango.cc +++ b/ui/gfx/platform_font_pango.cc @@ -11,7 +11,7 @@ #include <string> #include "base/logging.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "base/strings/string_split.h" #include "base/utf_string_conversions.h" #include "grit/app_locale_settings.h" diff --git a/ui/webui/jstemplate_builder.h b/ui/webui/jstemplate_builder.h index 8b4f0e9..6a27ee8 100644 --- a/ui/webui/jstemplate_builder.h +++ b/ui/webui/jstemplate_builder.h @@ -15,7 +15,7 @@ #include <string> -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "ui/base/ui_export.h" namespace base { diff --git a/ui/webui/web_ui_util.h b/ui/webui/web_ui_util.h index 0dcbee5..c1e3635 100644 --- a/ui/webui/web_ui_util.h +++ b/ui/webui/web_ui_util.h @@ -7,11 +7,11 @@ #include <string> -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "base/values.h" #include "ui/base/layout.h" -#include "ui/base/window_open_disposition.h" #include "ui/base/ui_export.h" +#include "ui/base/window_open_disposition.h" class GURL; class SkBitmap; diff --git a/webkit/database/database_util_unittest.cc b/webkit/database/database_util_unittest.cc index bbbfcd6b..6a57c04 100644 --- a/webkit/database/database_util_unittest.cc +++ b/webkit/database/database_util_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_piece.h" +#include "base/strings/string_piece.h" #include "base/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/database/database_util.h" diff --git a/webkit/fileapi/file_system_dir_url_request_job_unittest.cc b/webkit/fileapi/file_system_dir_url_request_job_unittest.cc index cacb8ca..f922d81 100644 --- a/webkit/fileapi/file_system_dir_url_request_job_unittest.cc +++ b/webkit/fileapi/file_system_dir_url_request_job_unittest.cc @@ -12,7 +12,7 @@ #include "base/memory/weak_ptr.h" #include "base/message_loop.h" #include "base/platform_file.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "base/utf_string_conversions.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" diff --git a/webkit/fileapi/file_system_url_request_job_unittest.cc b/webkit/fileapi/file_system_url_request_job_unittest.cc index 19db330..fba2703 100644 --- a/webkit/fileapi/file_system_url_request_job_unittest.cc +++ b/webkit/fileapi/file_system_url_request_job_unittest.cc @@ -16,8 +16,8 @@ #include "base/message_loop_proxy.h" #include "base/platform_file.h" #include "base/rand_util.h" -#include "base/string_piece.h" #include "base/stringprintf.h" +#include "base/strings/string_piece.h" #include "base/utf_string_conversions.h" #include "net/base/load_flags.h" #include "net/base/mime_util.h" diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc index d3b260f..d44b739 100644 --- a/webkit/glue/webkit_glue.cc +++ b/webkit/glue/webkit_glue.cc @@ -21,9 +21,9 @@ #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/process_util.h" -#include "base/string_piece.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_piece.h" #include "base/strings/string_tokenizer.h" #include "base/sys_info.h" #include "base/utf_string_conversions.h" diff --git a/webkit/plugins/npapi/plugin_host.cc b/webkit/plugins/npapi/plugin_host.cc index a96d0ba..752fa36 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_piece.h" #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 "build/build_config.h" diff --git a/webkit/support/platform_support_android.cc b/webkit/support/platform_support_android.cc index d192ce9..2b670c9 100644 --- a/webkit/support/platform_support_android.cc +++ b/webkit/support/platform_support_android.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/path_service.h" #include "base/string16.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "base/test/test_support_android.h" #include "googleurl/src/gurl.h" #include "grit/webkit_resources.h" diff --git a/webkit/support/platform_support_linux.cc b/webkit/support/platform_support_linux.cc index 2b6d0b5..e36c510 100644 --- a/webkit/support/platform_support_linux.cc +++ b/webkit/support/platform_support_linux.cc @@ -9,7 +9,7 @@ #include "base/logging.h" #include "base/path_service.h" #include "base/string16.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "grit/webkit_resources.h" #include "ui/base/resource/resource_bundle.h" #include "webkit/support/test_webkit_platform_support.h" diff --git a/webkit/support/platform_support_win.cc b/webkit/support/platform_support_win.cc index 01bf814..bf7856a 100644 --- a/webkit/support/platform_support_win.cc +++ b/webkit/support/platform_support_win.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/path_service.h" #include "base/string16.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "base/win/resource_util.h" #include "grit/webkit_chromium_resources.h" #include "grit/webkit_resources.h" diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc index 70372981..03fb552 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_piece.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_piece.h" #include "base/strings/sys_string_conversions.h" #include "base/time.h" #include "base/utf_string_conversions.h" diff --git a/webkit/tools/test_shell/test_shell.h b/webkit/tools/test_shell/test_shell.h index 2640224..d2ee7a9 100644 --- a/webkit/tools/test_shell/test_shell.h +++ b/webkit/tools/test_shell/test_shell.h @@ -17,7 +17,7 @@ #include "base/lazy_instance.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebNavigationPolicy.h" #include "ui/gfx/native_widget_types.h" #include "webkit/tools/test_shell/webview_host.h" diff --git a/webkit/tools/test_shell/test_shell_gtk.cc b/webkit/tools/test_shell/test_shell_gtk.cc index eedb4b4..50f1578 100644 --- a/webkit/tools/test_shell/test_shell_gtk.cc +++ b/webkit/tools/test_shell/test_shell_gtk.cc @@ -16,7 +16,7 @@ #include "base/message_loop.h" #include "base/path_service.h" #include "base/string16.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "base/utf_string_conversions.h" #include "grit/test_shell_resources.h" #include "grit/webkit_resources.h" diff --git a/webkit/tools/test_shell/test_shell_mac.mm b/webkit/tools/test_shell/test_shell_mac.mm index fb0f232..73aa907 100644 --- a/webkit/tools/test_shell/test_shell_mac.mm +++ b/webkit/tools/test_shell/test_shell_mac.mm @@ -21,7 +21,7 @@ #include "base/message_loop.h" #include "base/path_service.h" #include "base/string16.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "base/utf_string_conversions.h" #include "grit/webkit_resources.h" #include "net/base/mime_util.h" diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc index 49a0f47..ecc1647 100644 --- a/webkit/tools/test_shell/test_shell_win.cc +++ b/webkit/tools/test_shell/test_shell_win.cc @@ -16,8 +16,8 @@ #include "base/file_util.h" #include "base/message_loop.h" #include "base/path_service.h" -#include "base/string_piece.h" #include "base/string_util.h" +#include "base/strings/string_piece.h" #include "base/utf_string_conversions.h" #include "base/win/resource_util.h" #include "breakpad/src/client/windows/handler/exception_handler.h" |