Remove remaining base/strings/string_piece_forward.h usage

Switch all includes of base/strings/string_piece_forward.h to use
string_piece.h instead, except in string_piece.h. This will make
reduce potential churn when deleting string_piece_forward.h.

Bug: 691162
Change-Id: Icd204f97f574e764b46ebfba32bce7b742a2cacd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5009848
Commit-Queue: Lei Zhang <thestig@chromium.org>
Owners-Override: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1221311}

ash/accelerators/accelerator_tracker.h

@@ -8,7 +8,7 @@
 #include "ash/ash_export.h"
 #include "base/containers/flat_map.h"
 #include "base/containers/span.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/events/event_handler.h"
 

ash/accelerators/accelerator_tracker_unittest.cc

@@ -5,7 +5,7 @@
 #include "ash/accelerators/accelerator_tracker.h"
 
 #include "ash/test/ash_test_base.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "base/test/metrics/user_action_tester.h"
 
 namespace ash {

ash/clipboard/clipboard_history_util.h

@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "ash/ash_export.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "chromeos/crosapi/mojom/clipboard_history.mojom.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 #include "ui/base/models/image_model.h"

ash/display/window_tree_host_manager_unittest.cc

@@ -25,7 +25,7 @@
 #include "base/command_line.h"
 #include "base/memory/raw_ptr.h"
 #include "base/run_loop.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/metrics/histogram_tester.h"
 #include "base/test/scoped_feature_list.h"

ash/public/cpp/assistant/assistant_state_base.cc

@@ -10,7 +10,7 @@
 #include "ash/public/cpp/accelerators.h"
 #include "base/functional/bind.h"
 #include "base/strings/string_number_conversions.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "chromeos/ash/components/audio/cras_audio_handler.h"
 #include "components/prefs/pref_change_registrar.h"
 #include "components/prefs/pref_service.h"

ash/system/input_device_settings/input_device_key_alias_manager.h

@@ -10,7 +10,7 @@
 #include "ash/ash_export.h"
 #include "base/containers/flat_map.h"
 #include "base/containers/flat_set.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "ui/events/devices/input_device.h"
 
 namespace ash {

ash/system/input_device_settings/input_device_settings_metrics_manager.cc

@@ -23,7 +23,7 @@
 #include "base/json/values_util.h"
 #include "base/metrics/histogram_functions.h"
 #include "base/strings/strcat.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "base/strings/stringprintf.h"
 #include "base/time/time.h"
 #include "components/prefs/pref_service.h"

ash/system/input_device_settings/input_device_tracker.cc

@@ -14,7 +14,7 @@
 #include "ash/system/input_device_settings/input_device_settings_controller_impl.h"
 #include "ash/system/input_device_settings/input_device_settings_pref_names.h"
 #include "base/containers/contains.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "components/prefs/pref_member.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"

ash/system/input_device_settings/input_device_tracker_unittest.cc

@@ -11,7 +11,7 @@
 #include "ash/system/input_device_settings/input_device_settings_pref_names.h"
 #include "ash/test/ash_test_base.h"
 #include "base/containers/contains.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "base/test/scoped_feature_list.h"
 #include "components/account_id/account_id.h"
 #include "components/prefs/pref_service.h"

ash/system/input_device_settings/keyboard_modifier_metrics_recorder.cc

@@ -16,7 +16,7 @@
 #include "base/functional/callback_forward.h"
 #include "base/metrics/histogram_functions.h"
 #include "base/strings/strcat.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "components/prefs/pref_member.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"

ash/system/input_device_settings/pref_handlers/keyboard_pref_handler_impl.cc

@@ -20,7 +20,7 @@
 #include "base/containers/flat_map.h"
 #include "base/json/values_util.h"
 #include "base/strings/string_number_conversions.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "components/account_id/account_id.h"

ash/system/phonehub/app_stream_launcher_item.cc

@@ -6,7 +6,7 @@
 
 #include "ash/strings/grit/ash_strings.h"
 #include "base/hash/hash.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/geometry/insets.h"

ash/system/power/battery_saver_controller_unittest.cc

@@ -16,7 +16,7 @@
 #include "ash/test/ash_test_base.h"
 #include "base/memory/raw_ptr.h"
 #include "base/run_loop.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "base/test/metrics/histogram_tester.h"
 #include "base/test/scoped_feature_list.h"
 #include "chromeos/dbus/power/fake_power_manager_client.h"

ash/system/unified/classroom_bubble_student_view.cc

@@ -20,7 +20,7 @@
 #include "base/check.h"
 #include "base/functional/bind.h"
 #include "base/metrics/user_metrics.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "base/time/time.h"
 #include "base/types/cxx23_to_underlying.h"
 #include "components/prefs/pref_registry_simple.h"

ash/system/unified/classroom_bubble_teacher_view.cc

@@ -19,7 +19,7 @@
 #include "base/check.h"
 #include "base/functional/bind.h"
 #include "base/metrics/user_metrics.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/metadata/metadata_impl_macros.h"
 #include "ui/views/controls/combobox/combobox.h"

ash/wallpaper/wallpaper_controller_impl.cc

@@ -62,7 +62,7 @@
 #include "base/no_destructor.h"
 #include "base/rand_util.h"
 #include "base/ranges/algorithm.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "base/task/sequenced_task_runner.h"
 #include "base/task/thread_pool.h"
 #include "base/types/cxx23_to_underlying.h"

ash/webui/diagnostics_ui/backend/input/input_data_provider_keyboard_unittest.cc

@@ -16,7 +16,7 @@
 #include "ash/webui/diagnostics_ui/mojom/input_data_provider.mojom-shared.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "chromeos/ash/components/system/fake_statistics_provider.h"
 #include "chromeos/ash/components/test/ash_test_suite.h"
 #include "content/public/test/browser_task_environment.h"

ash/webui/diagnostics_ui/diagnostics_metrics_message_handler.cc

@@ -11,7 +11,7 @@
 #include "base/functional/bind.h"
 #include "base/metrics/histogram_functions.h"
 #include "base/notreached.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "base/time/time.h"
 #include "content/public/browser/web_ui.h"
 

ash/webui/diagnostics_ui/diagnostics_ui.cc

@@ -31,7 +31,7 @@
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/metrics/histogram_functions.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"

base/android/feature_map.h

@@ -8,7 +8,7 @@
 #include "base/base_export.h"
 #include "base/containers/flat_map.h"
 #include "base/feature_list.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 
 namespace base::android {
 

base/fuchsia/fuchsia_logging.h

@@ -16,7 +16,7 @@
 #include "base/base_export.h"
 #include "base/check.h"
 #include "base/logging.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 
 // Use the ZX_LOG family of macros along with a zx_status_t containing a Zircon
 // error. The error value will be decoded so that logged messages explain the

base/fuchsia/intl_profile_watcher.h

@@ -10,7 +10,7 @@
 
 #include "base/base_export.h"
 #include "base/functional/callback.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 
 namespace base {
 

base/fuchsia/mem_buffer_util.h

@@ -10,7 +10,7 @@
 
 #include "base/base_export.h"
 #include "base/files/file.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 
 namespace base {

base/fuchsia/scoped_service_binding.h

@@ -19,7 +19,7 @@
 #include "base/base_export.h"
 #include "base/fuchsia/scoped_service_publisher.h"
 #include "base/functional/callback.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 
 namespace sys {

base/fuchsia/system_product_info_unittest.cc

@@ -18,7 +18,7 @@
 #include "base/functional/bind.h"
 #include "base/location.h"
 #include "base/run_loop.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "base/test/bind.h"
 #include "base/test/gtest_util.h"
 #include "base/test/task_environment.h"

base/ios/scoped_critical_action.h

@@ -10,7 +10,7 @@
 #include <utility>
 
 #include "base/memory/ref_counted.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "base/synchronization/lock.h"
 #include "base/time/time.h"
 

base/logging.h

@@ -18,7 +18,7 @@
 #include "base/dcheck_is_on.h"
 #include "base/functional/callback_forward.h"
 #include "base/scoped_clear_last_error.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "base/strings/utf_ostream_operators.h"
 #include "build/build_config.h"
 #include "build/chromeos_buildflags.h"

base/strings/abseil_string_number_conversions.h

@@ -6,7 +6,7 @@
 #define BASE_STRINGS_ABSEIL_STRING_NUMBER_CONVERSIONS_H_
 
 #include "base/base_export.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "third_party/abseil-cpp/absl/numeric/int128.h"
 
 namespace base {

base/strings/string_piece_rust.h

@@ -8,7 +8,7 @@
 #include <stdint.h>
 
 #include "base/rust_buildflags.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "third_party/rust/cxx/v1/crate/include/cxx.h"
 
 #if !BUILDFLAG(BUILD_RUST_BASE_CONVERSIONS)

base/strings/string_util.h

@@ -96,7 +96,7 @@ constexpr BasicStringPiece<CharT> MakeBasicStringPiece(Iter begin, Iter end) {
 }
 
 // Explicit instantiations of MakeBasicStringPiece for the BasicStringPiece
-// aliases defined in base/strings/string_piece_forward.h
+// aliases defined in base/strings/string_piece.h
 template <typename Iter>
 constexpr StringPiece MakeStringPiece(Iter begin, Iter end) {
   return MakeBasicStringPiece<char>(begin, end);

base/token.h

@@ -12,7 +12,7 @@
 
 #include "base/base_export.h"
 #include "base/containers/span.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 
 namespace base {

base/win/scoped_hstring.h

@@ -10,7 +10,7 @@
 #include <string>
 
 #include "base/scoped_generic.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 
 namespace base {
 

chromecast/media/api/cast_audio_demuxer.h

@@ -5,7 +5,7 @@
 #ifndef CHROMECAST_MEDIA_API_CAST_AUDIO_DEMUXER_H_
 #define CHROMECAST_MEDIA_API_CAST_AUDIO_DEMUXER_H_
 
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "base/time/time.h"
 #include "chromecast/media/api/decoder_buffer_base.h"
 #include "chromecast/public/media/decoder_config.h"

chromeos/ash/components/dbus/biod/fake_biod_client.cc

@@ -19,7 +19,7 @@
 #include "base/notreached.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "base/strings/string_split.h"
 #include "base/task/single_thread_task_runner.h"
 #include "base/threading/thread_restrictions.h"

chromeos/ash/components/network/onc/onc_translation_tables.h

@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "base/component_export.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "chromeos/components/onc/onc_signature.h"
 
 namespace ash::onc {

chromeos/ash/services/recording/audio_stream_mixer.h

@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "base/sequence_checker.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "base/threading/sequence_bound.h"
 #include "base/time/time.h"
 #include "base/types/pass_key.h"

chromeos/ash/services/recording/gif_file_writer.h

@@ -8,7 +8,7 @@
 #include <cstdint>
 
 #include "base/files/file.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "chromeos/ash/services/recording/recording_file_io_helper.h"
 
 namespace recording {

chromeos/printing/ppd_metadata_parser.h

@@ -23,7 +23,7 @@
 
 #include "base/component_export.h"
 #include "base/containers/flat_map.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "base/version.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 

chromeos/ui/base/file_icon_util.cc

@@ -11,7 +11,7 @@
 #include "base/files/file_path.h"
 #include "base/memory/raw_ref.h"
 #include "base/no_destructor.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chromeos/constants/chromeos_features.h"

content/browser/aggregation_service/aggregation_service_storage_sql.h

@@ -13,7 +13,7 @@
 #include "base/files/file_path.h"
 #include "base/memory/raw_ref.h"
 #include "base/sequence_checker.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "base/thread_annotations.h"
 #include "base/time/time.h"
 #include "content/browser/aggregation_service/aggregation_service.h"

content/browser/back_forward_cache_browsertest.cc

@@ -14,7 +14,7 @@
 #include "base/memory/raw_ptr.h"
 #include "base/metrics/metrics_hashes.h"
 #include "base/run_loop.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "base/system/sys_info.h"
 #include "base/task/common/task_annotator.h"
 #include "base/task/single_thread_task_runner.h"

content/browser/direct_sockets/direct_sockets_test_utils.h

@@ -11,7 +11,7 @@
 
 #include "base/containers/span.h"
 #include "base/functional/callback_forward.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "base/test/test_future.h"
 #include "base/token.h"
 #include "content/public/browser/web_contents.h"

content/browser/first_party_sets/first_party_set_parser.h

@@ -9,7 +9,7 @@
 #include <utility>
 
 #include "base/containers/flat_map.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "base/types/expected.h"
 #include "base/values.h"
 #include "content/common/content_export.h"

content/browser/interest_group/auction_url_loader_factory_proxy.h

@@ -8,7 +8,7 @@
 #include <stdint.h>
 
 #include "base/functional/callback_forward.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "content/browser/interest_group/subresource_url_authorizations.h"
 #include "content/common/content_export.h"
 #include "content/services/auction_worklet/public/mojom/auction_network_events_handler.mojom.h"

content/browser/media/media_license_manager_unittest.cc

@@ -11,7 +11,7 @@
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_refptr.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "base/task/single_thread_task_runner.h"
 #include "base/test/gmock_expected_support.h"
 #include "base/test/task_environment.h"

content/browser/mojo_binder_policy_map_impl.h

@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/containers/flat_map.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/mojo_binder_policy_map.h"
 

content/browser/preloading/preloading_config.h

@@ -8,7 +8,7 @@
 #include <base/no_destructor.h>
 #include "base/containers/flat_map.h"
 #include "base/feature_list.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "base/values.h"
 #include "content/public/browser/preloading.h"
 

content/browser/shared_storage/shared_storage_url_loader_factory_proxy.h

@@ -8,7 +8,7 @@
 #include <stdint.h>
 
 #include "base/functional/callback_forward.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "content/common/content_export.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"

content/browser/web_contents/web_contents_impl.cc

@@ -36,7 +36,7 @@
 #include "base/observer_list.h"
 #include "base/process/process.h"
 #include "base/ranges/algorithm.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"

content/browser/web_package/signed_exchange_certificate_chain.h

@@ -10,7 +10,7 @@
 #include "base/containers/span.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_refptr.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "content/browser/web_package/signed_exchange_consts.h"
 #include "content/common/content_export.h"
 #include "services/network/public/cpp/spki_hash_set.h"

content/public/browser/content_browser_client.h

@@ -17,7 +17,7 @@
 #include "base/containers/flat_set.h"
 #include "base/functional/callback_forward.h"
 #include "base/memory/scoped_refptr.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "base/time/time.h"
 #include "base/types/strong_alias.h"
 #include "base/values.h"

content/public/browser/mojo_binder_policy_map.h

@@ -6,7 +6,7 @@
 #define CONTENT_PUBLIC_BROWSER_MOJO_BINDER_POLICY_MAP_H_
 
 #include "base/check_op.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "content/common/content_export.h"
 
 namespace content {

content/shell/browser/shell_content_browser_client.cc

@@ -24,7 +24,7 @@
 #include "base/no_destructor.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/sequence_local_storage_slot.h"

device/bluetooth/bluetooth_device.h

@@ -21,7 +21,7 @@
 #include "base/gtest_prod_util.h"
 #include "base/memory/raw_ptr_exclusion.h"
 #include "base/memory/scoped_refptr.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "device/bluetooth/bluetooth_common.h"

device/bluetooth/bluetooth_pairing_winrt.h

@@ -12,7 +12,7 @@
 #include "base/memory/raw_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/sequence_checker.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "device/bluetooth/bluetooth_device.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 

device/bluetooth/public/cpp/bluetooth_address.h

@@ -11,7 +11,7 @@
 #include <string>
 
 #include "base/containers/span.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 
 namespace device {
 

device/bluetooth/public/cpp/bluetooth_uuid.h

@@ -14,7 +14,7 @@
 #include "build/build_config.h"
 
 #if BUILDFLAG(IS_WIN)
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "base/win/windows_types.h"
 #endif  // BUILDFLAG(IS_WIN)
 

device/bluetooth/test/fake_bluetooth_adapter_winrt.h

@@ -12,7 +12,7 @@
 
 #include <stdint.h>
 
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 
 namespace device {
 

device/bluetooth/test/fake_bluetooth_le_advertisement_received_event_args_winrt.h

@@ -10,7 +10,7 @@
 
 #include <stdint.h>
 
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 
 namespace device {
 

device/bluetooth/test/fake_device_information_pairing_winrt.h

@@ -11,7 +11,7 @@
 
 #include <string>
 
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 
 namespace device {
 

device/bluetooth/test/fake_gatt_characteristic_winrt.h

@@ -16,7 +16,7 @@
 
 #include "base/functional/callback.h"
 #include "base/memory/raw_ptr.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "device/bluetooth/bluetooth_gatt_service.h"
 
 namespace device {

device/bluetooth/test/fake_gatt_descriptor_winrt.h

@@ -15,7 +15,7 @@
 
 #include "base/functional/callback.h"
 #include "base/memory/raw_ptr.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "device/bluetooth/bluetooth_gatt_service.h"
 
 namespace device {

device/bluetooth/test/fake_gatt_device_service_winrt.h

@@ -14,7 +14,7 @@
 #include <vector>
 
 #include "base/memory/raw_ptr.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 
 namespace device {
 

device/fido/fido_request_handler_base.h

@@ -19,7 +19,7 @@
 #include "base/functional/callback.h"
 #include "base/memory/raw_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "build/build_config.h"
 #include "device/fido/fido_constants.h"
 #include "device/fido/fido_discovery_base.h"

device/fido/mac/authenticator.h

@@ -11,7 +11,7 @@
 #include "base/component_export.h"
 #include "base/functional/callback.h"
 #include "base/memory/weak_ptr.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "device/fido/ctap_make_credential_request.h"
 #include "device/fido/fido_authenticator.h"
 #include "device/fido/fido_transport_protocol.h"

device/fido/mac/credential_metadata.h

@@ -15,7 +15,7 @@
 #include "base/component_export.h"
 #include "base/containers/span.h"
 #include "base/feature_list.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "crypto/aead.h"
 #include "crypto/hmac.h"
 #include "crypto/symmetric_key.h"

device/fido/win/fake_webauthn_api.cc

@@ -13,7 +13,7 @@
 #include "base/containers/span.h"
 #include "base/memory/raw_ptr_exclusion.h"
 #include "base/notreached.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "base/strings/string_util_win.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/cbor/values.h"

device/fido/win/logging.cc

@@ -7,7 +7,7 @@
 #include <string>
 
 #include "base/strings/string_number_conversions.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "base/strings/string_util.h"
 #include "components/device_event_log/device_event_log.h"
 

device/gamepad/test_support/fake_igamepad_statics.cc

@@ -6,7 +6,7 @@
 
 #include "base/notreached.h"
 #include "base/run_loop.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "base/task/sequenced_task_runner.h"
 #include "base/task/thread_pool.h"
 #include "device/gamepad/test_support/fake_igamepad.h"

device/gamepad/test_support/fake_igamepad_statics.h

@@ -14,7 +14,7 @@
 
 #include "base/containers/flat_map.h"
 #include "base/functional/callback_forward.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "device/gamepad/test_support/fake_igamepad.h"
 #include "device/gamepad/test_support/fake_iraw_game_controller.h"
 

device/gamepad/test_support/fake_iraw_game_controller.cc

@@ -6,7 +6,6 @@
 
 #include "base/notreached.h"
 #include "base/strings/string_piece.h"
-#include "base/strings/string_piece_forward.h"
 #include "base/win/scoped_hstring.h"
 #include "device/gamepad/test_support/fake_winrt_wgi_environment.h"
 

docs/clangd.md

@@ -119,8 +119,7 @@ https://clangd.llvm.org/installation.html#editor-plugins).
     * Optional: You may want to add `--header-insertion=never` to the clangd
       flags, so that your editor doesn't automatically add incorrect #include
       lines. The feature doesn't correctly handle some common Chromium headers
-      like `base/strings/string_piece_forward.h` and
-      `base/functional/callback_forward.h`
+      like `base/functional/callback_forward.h`.
 
 ## Background Indexing
 

docs/wmax_tokens.md

@@ -46,9 +46,7 @@ There are two common scenarios for hitting the pragma:
    using techniques such as forward declarations to avoid increasing the header
    size. Even complex classes may have forward declarations available, see for
    example
-   [https://source.chromium.org/chromium/chromium/src/+/HEAD:base/functional/callback_forward.h](callback_forward.h)
-   and
-   [https://source.chromium.org/chromium/chromium/src/+/HEAD:base/strings/string_piece_forward.h](string_piece_forward.h).
+   [https://source.chromium.org/chromium/chromium/src/+/HEAD:base/functional/callback_forward.h](callback_forward.h).
    Many types defined in .mojom.h files have forward declarations in a
    corresponding .mojom-forward.h file. If the size increase is unavoidable,
    raise the limit.

extensions/browser/extension_prefs.h

@@ -12,7 +12,7 @@
 
 #include "base/memory/raw_ptr.h"
 #include "base/observer_list.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "components/keyed_service/core/keyed_service.h"

extensions/common/constants.h

@@ -9,7 +9,7 @@
 #include <cstdint>
 
 #include "base/files/file_path.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "build/chromeos_buildflags.h"
 #include "extensions/common/extensions_export.h"
 

extensions/common/csp_validator.h

@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "extensions/common/manifest.h"
 
 namespace extensions {

extensions/common/extensions_api_provider.h

@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 
 namespace extensions {
 class FeatureProvider;

extensions/common/manifest_handlers/csp_info.h

@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest_handler.h"
 

extensions/common/utils/content_script_utils.cc

@@ -11,7 +11,7 @@
 
 #include "base/files/file_util.h"
 #include "base/strings/string_number_conversions.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/common/url_constants.h"

fuchsia_web/common/init_logging.h

@@ -5,7 +5,7 @@
 #ifndef FUCHSIA_WEB_COMMON_INIT_LOGGING_H_
 #define FUCHSIA_WEB_COMMON_INIT_LOGGING_H_
 
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 
 namespace base {
 class CommandLine;

fuchsia_web/webengine/browser/fake_semantic_tree.h

@@ -11,7 +11,7 @@
 #include <unordered_map>
 
 #include "base/functional/callback.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 
 class FakeSemanticTree
     : public fuchsia::accessibility::semantics::testing::SemanticTree_TestBase {

fuchsia_web/webengine/common/cast_streaming.h

@@ -7,7 +7,7 @@
 
 #include <fuchsia/web/cpp/fidl.h>
 
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 
 // Returns true if Cast Streaming is enabled for this process.
 bool IsCastStreamingEnabled();

fuchsia_web/webengine/web_engine_integration_test_base.h

@@ -13,7 +13,7 @@
 
 #include "base/command_line.h"
 #include "base/fuchsia/filtered_service_directory.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "base/test/task_environment.h"
 #include "fuchsia_web/common/test/test_navigation_listener.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"

fuchsia_web/webinstance_host/web_instance_host.h

@@ -18,7 +18,7 @@
 #include "base/memory/raw_ptr.h"
 #include "base/memory/raw_ref.h"
 #include "base/sequence_checker.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "base/uuid.h"
 #include "fuchsia_web/webinstance_host/fuchsia_web_debug_proxy.h"
 

fuchsia_web/webinstance_host/web_instance_host_internal.h

@@ -11,7 +11,7 @@
 #include <string>
 #include <vector>
 
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 
 namespace base {
 class CommandLine;

google_apis/gaia/gaia_config.h

@@ -10,7 +10,7 @@
 
 #include "base/component_export.h"
 #include "base/gtest_prod_util.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "base/values.h"
 #include "google_apis/google_api_keys.h"
 

google_apis/tasks/tasks_api_task_status.cc

@@ -7,7 +7,7 @@
 #include <string>
 
 #include "base/notreached.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 
 namespace google_apis::tasks {
 namespace {

google_apis/tasks/tasks_api_task_status.h

@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 
 namespace google_apis::tasks {
 

gpu/vulkan/tests/basic_vulkan_test.cc

@@ -5,7 +5,7 @@
 #include "gpu/vulkan/tests/basic_vulkan_test.h"
 
 #include "base/command_line.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "build/build_config.h"
 #include "gpu/vulkan/init/vulkan_factory.h"
 #include "gpu/vulkan/tests/native_window.h"

media/base/mime_util.h

@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "media/base/audio_codecs.h"
 #include "media/base/media_export.h"
 #include "media/base/video_codecs.h"

media/base/mime_util_internal.h

@@ -10,7 +10,7 @@
 
 #include "base/containers/flat_map.h"
 #include "base/containers/flat_set.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "build/build_config.h"
 #include "media/base/media_export.h"
 #include "media/base/mime_util.h"

media/base/video_codecs.h

@@ -8,7 +8,7 @@
 #include <stdint.h>
 #include <string>
 
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "media/base/media_export.h"
 #include "media/media_buildflags.h"
 

media/filters/hls_data_source_provider.h

@@ -9,7 +9,7 @@
 #include <memory>
 
 #include "base/functional/callback.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "base/types/id_type.h"
 #include "media/base/media_export.h"
 #include "media/base/status.h"

media/filters/stream_parser_factory.h

@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "base/containers/span.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "media/base/media_export.h"
 #include "media/base/media_log.h"
 #include "media/base/mime_util.h"

media/formats/hls/media_playlist_fuzzer.cc

@@ -11,7 +11,6 @@
 #include "base/i18n/icu_util.h"
 #include "base/memory/scoped_refptr.h"
 #include "base/strings/string_piece.h"
-#include "base/strings/string_piece_forward.h"
 #include "media/formats/hls/media_playlist.h"
 #include "media/formats/hls/multivariant_playlist.h"
 #include "media/formats/hls/playlist.h"

media/formats/hls/playlist_unittest.cc

@@ -5,7 +5,7 @@
 #include "media/formats/hls/playlist.h"
 #include "base/location.h"
 #include "base/strings/string_number_conversions.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "media/formats/hls/parse_status.h"
 #include "media/formats/hls/tag_name.h"
 #include "media/formats/hls/types.h"

media/muxers/muxer_timestamp_adapter_unittest.cc

@@ -6,7 +6,7 @@
 #include <map>
 #include <memory>
 
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "base/test/task_environment.h"
 #include "base/time/time.h"
 #include "media/base/audio_parameters.h"

mojo/core/dispatcher.h

@@ -13,7 +13,7 @@
 #include <vector>
 
 #include "base/memory/ref_counted.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "mojo/core/handle_signals_state.h"
 #include "mojo/core/system_impl_export.h"
 #include "mojo/core/watch.h"

mojo/public/cpp/bindings/interface_endpoint_client.h

@@ -20,7 +20,7 @@
 #include "base/memory/scoped_refptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/sequence_checker.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "base/synchronization/lock.h"
 #include "base/task/sequenced_task_runner.h"
 #include "base/thread_annotations.h"

net/base/backoff_entry_serializer_fuzzer.cc

@@ -10,7 +10,7 @@
 
 #include "base/json/json_reader.h"
 #include "base/logging.h"
-#include "base/strings/string_piece_forward.h"
+#include "base/strings/string_piece.h"
 #include "base/time/tick_clock.h"
 #include "base/time/time.h"
 #include "net/base/backoff_entry.h"