0

Rename {absl => std}::optional in //components/

#cleanup

Automated patch. This is a no-op. Please avoid, to assign unrelated
bugs to this, as much as possible.

Context:
https://groups.google.com/a/chromium.org/g/cxx/c/nBD_1LaanTc/m/ghh-ZZhWAwAJ?utm_medium=email

As of https://crrev.com/1204351, absl::optional is now a type alias
for std::optional. We should migrate toward it.

Script:
```
function replace {
  echo "Replacing $1 by $2"
  git grep -l "$1" \
    | cut -f1 -d: \
    | grep \
      -e "^components/" \
    | grep \
      -e "\.h" \
      -e "\.cc" \
      -e "\.mm" \
    | grep -v \
      -e "components/cast_streaming/browser/public/receiver_config.*" \
      -e "components/power_metrics/*" \
      -e "components/zucchini/patch_reader.*" \
    | sort \
    | uniq \
    | xargs sed -i "s/$1/$2/g"
}
replace "absl::make_optional" "std::make_optional"
replace "absl::optional" "std::optional"
replace "absl::nullopt" "std::nullopt"
replace "absl::in_place" "std::in_place"
replace "absl::in_place_t" "std::in_place_t"
replace "\"third_party\/abseil-cpp\/absl\/types\/optional.h\"" "<optional>"

echo "Formatting:"

echo "IncludeBlocks: Regroup" >> ".clang-format"
echo "IncludeIsMainRegex: \"(_(android|apple|chromeos|freebsd|fuchsia|fuzzer|ios|linux|mac|nacl|openbsd|posix|stubs?|win))?(_(unit|browser|perf)?tests?)?$\"" >> ".clang-format"
git cl format
git restore ".clang-format"

git cl format
```

Bug: chromium:1500249
Change-Id: I34b45aba082a627d94fd9d3f9f994a60c64b40b1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5200092
Auto-Submit: Arthur Sonzogni <arthursonzogni@chromium.org>
Reviewed-by: danakj <danakj@chromium.org>
Commit-Queue: danakj <danakj@chromium.org>
Owners-Override: danakj <danakj@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1252820}
This commit is contained in:
Arthur Sonzogni
2024-01-26 20:26:18 +00:00
committed by Chromium LUCI CQ
parent f903b2778c
commit c571efbef3
2832 changed files with 13933 additions and 13834 deletions
components
access_code_cast
account_id
account_manager_core
aggregation_service
allocation_recorder
android_autofill
apdu
arc
attribution_reporting
autofill
background_sync
background_task_scheduler
blocked_content
blocklist
bookmarks
breadcrumbs
browser_sync
browser_ui
site_settings
browsing_data
browsing_topics
cast
cast_receiver
cast_streaming
cbor
cdm
chromeos_camera
client_hints
cloud_devices
commerce
component_updater
consent_auditor
content_capture
content_relationship_verification
content_settings
contextual_search
crash
cronet
crx_file
custom_handlers
desks_storage
device_reauth
device_signals
devtools
simple_devtools_protocol_client
discardable_memory
dom_distiller
domain_reliability
download
embedder_support
endpoint_fetcher
enterprise
error_page
exo
eye_dropper
favicon
feature_engagement
feed
feedback
fuchsia_component_support
fuchsia_legacymetrics
gcm_driver
global_media_controls
guest_view
gwp_asan
headless
heap_profiling
history
history_clusters
image_fetcher
invalidation
js_injection
language
lens
leveldb_proto
link_header_util
live_caption
local_state
lookalikes
manta
media_device_salt
media_message_center
media_router
memory_pressure
memory_system
metal_util
metrics
mirroring
ml
nacl
named_mojo_ipc_server
navigation_interception
net_log
network_hints
network_session_configurator
network_time
no_state_prefetch
ntp_tiles
offline_items_collection
offline_pages
omnibox
browser
actions
autocomplete_controller.ccautocomplete_controller.hautocomplete_controller_metrics_unittest.ccautocomplete_controller_unittest.ccautocomplete_grouper_sections.ccautocomplete_input.hautocomplete_match.ccautocomplete_match.hautocomplete_match_type_unittest.ccautocomplete_match_unittest.ccautocomplete_provider_unittest.ccautocomplete_result.ccautocomplete_result.hautocomplete_result_unittest.ccautocomplete_scoring_model_executor.ccautocomplete_scoring_model_executor.hautocomplete_scoring_model_executor_unittest.ccautocomplete_scoring_model_handler.ccautocomplete_scoring_model_handler.hautocomplete_scoring_model_handler_unittest.ccautocomplete_scoring_model_service.ccautocomplete_scoring_model_service.hbase_search_provider.ccbookmark_scoring_signals_annotator.ccclipboard_provider.ccclipboard_provider.hclipboard_provider_unittest.ccdocument_provider.ccdocument_provider_unittest.ccdocument_suggestions_service_unittest.cchistory_cluster_provider_unittest.cchistory_quick_provider.cchistory_quick_provider.hhistory_scoring_signals_annotator.cchistory_url_provider.ccomnibox_prefs.ccomnibox_triggered_feature_service_unittest.ccon_device_tail_model_service.ccon_device_tail_model_service_unittest.ccquery_tile_provider_unittest.ccscored_history_match.ccscored_history_match.hsearch_provider.ccsearch_suggestion_parser.ccsearch_suggestion_parser.hsearch_suggestion_parser_fuzzer.ccsearch_suggestion_parser_unittest.ccshortcuts_provider.ccshortcuts_provider_unittest.ccsuggestion_answer.ccsuggestion_answer.hsuggestion_answer_unittest.ccsuggestion_group_util.cctitled_url_match_utils.ccurl_scoring_signals_annotator.ccurl_scoring_signals_annotator_unittest.cczero_suggest_provider.cc
open_from_clipboard
openscreen_platform
optimization_guide
content
core
base_model_executor.hbase_model_executor_helpers.hbatch_entity_metadata_task.ccbatch_entity_metadata_task.hbatch_entity_metadata_task_unittest.ccbert_model_executor.ccbert_model_executor.hbert_model_executor_unittest.ccbert_model_handler.ccbert_model_handler.hcommand_line_top_host_provider.ccentity_annotator_native_library.ccentity_metadata_provider.hhint_cache_unittest.cchints_fetcher.cchints_fetcher.hhints_fetcher_unittest.cchints_manager.cchints_manager.hhints_manager_unittest.ccmediapipe_text_model_executor.ccmediapipe_text_model_executor.hmediapipe_text_model_executor_unittest.ccmemory_hint.ccmemory_hint.h
model_execution
model_executor.hmodel_handler.hmodel_handler_unittest.cc
model_quality
model_store_metadata_entry.ccmodel_store_metadata_entry.hmodel_util.ccmodel_util.hmodel_util_unittest.ccmodel_validator.ccmodel_validator.hmodel_validator_unittest.ccoptimization_guide_features.ccoptimization_guide_features.hoptimization_guide_features_unittest.ccoptimization_guide_model_provider.hoptimization_guide_navigation_data.ccoptimization_guide_navigation_data.hoptimization_guide_store.ccoptimization_guide_store.hoptimization_guide_store_unittest.ccoptimization_guide_switches.ccoptimization_guide_switches.hoptimization_guide_switches_unittest.ccoptimization_guide_util.hoptimization_guide_util_unittest.ccoptimization_hints_component_update_listener.ccoptimization_hints_component_update_listener.hoptimization_metadata.hoptimization_metadata_unittest.ccpage_content_annotation_job.ccpage_content_annotation_job.hpage_content_annotation_job_executor.hpage_content_annotation_job_executor_unittest.ccpage_content_annotation_job_unittest.ccpage_content_annotations_common.ccpage_content_annotations_common.hpage_entities_model_handler.ccpage_entities_model_handler.hpage_entities_model_handler_impl.ccpage_entities_model_handler_impl.hpage_entities_model_handler_impl_unittest.ccpage_visibility_model_executor.ccpage_visibility_model_executor.hpage_visibility_model_fuzzer.ccpage_visibility_model_handler.ccpage_visibility_model_handler.hpage_visibility_model_handler_unittest.ccprediction_manager.ccprediction_manager.hprediction_manager_unittest.ccprediction_model_download_manager.ccprediction_model_download_manager.hprediction_model_download_manager_unittest.ccprediction_model_fetch_timer_unittest.ccprediction_model_fetcher.hprediction_model_fetcher_impl.ccprediction_model_fetcher_impl.hprediction_model_fetcher_unittest.ccprediction_model_override.ccprediction_model_store.ccstore_update_data.ccstore_update_data.htest_model_executor.cctest_model_executor.htest_model_handler.htest_optimization_guide_model_provider.cctest_optimization_guide_model_provider.htest_tflite_model_executor.cctest_tflite_model_executor.htest_tflite_model_handler.htext_embedding_model_executor.cctext_embedding_model_executor.htext_embedding_model_executor_unittest.cctext_embedding_model_handler.cctext_embedding_model_handler.htext_embedding_model_handler_unittest.cctflite_model_executor.htflite_model_executor_unittest.cc
origin_trials
os_crypt
ownership
page_image_annotation
page_image_service
page_info
page_load_metrics
browser
common
renderer
paint_preview
password_manager
payments
pdf
performance_manager
decorators
execution_context_priority
freezing
graph
performance_manager_lifetime.cc
persistence
power
public
resource_attribution
test_support
user_tuning
v8_memory
permissions
android
bluetooth_delegate_impl.ccbluetooth_delegate_impl.h
contexts
notifications_engagement_service.ccnotifications_engagement_service.hobject_permission_context_base.ccobject_permission_context_base.horigin_keyed_permission_action_service.ccorigin_keyed_permission_action_service.hpepc_initiated_permission_request_unittest.ccpermission_actions_history.ccpermission_actions_history_unittest.ccpermission_auditing_database.ccpermission_auditing_database.hpermission_auditing_database_unittest.ccpermission_auditing_service.hpermission_auditing_service_unittest.ccpermission_context_base.ccpermission_context_base.hpermission_context_base_unittest.ccpermission_decision_auto_blocker.ccpermission_decision_auto_blocker.hpermission_decision_auto_blocker_unittest.ccpermission_manager.ccpermission_manager.hpermission_manager_unittest.ccpermission_prompt.hpermission_recovery_success_rate_tracker.hpermission_request.ccpermission_request.hpermission_request_data.hpermission_request_manager.ccpermission_request_manager.hpermission_request_manager_unittest.ccpermission_ui_selector.ccpermission_ui_selector.hpermission_uma_util.ccpermission_uma_util.hpermission_uma_util_unittest.ccpermission_util.ccpermission_util.hpermissions_client.ccpermissions_client.h
prediction_service
request_type.ccrequest_type.h
test
plugins
plus_addresses
policy
content
core
browser
common
test_support
power_bookmarks
prefs
printing
privacy_sandbox
proxy_config
qr_code_generator
query_tiles
quirks
reading_list
reduce_accept_language
remote_cocoa
renderer_context_menu
reporting
safe_browsing
android
content
core
safe_search_api
saved_tab_groups
schema_org
search
search_engines
search_provider_logos
security_interstitials
segmentation_platform
embedder
internal
config_parser.cc
data_collection
database
execution
metadata
metrics
migration
post_processor
scheduler
segment_id_convertor.ccsegment_id_convertor.hsegmentation_platform_service_impl.ccsegmentation_platform_service_impl.hsegmentation_ukm_helper.ccsegmentation_ukm_helper.hsegmentation_ukm_helper_unittest.cc
selection
service_proxy_impl.ccservice_proxy_impl.h
signals
stats.ccstats.hstats_unittest.ccukm_data_manager_impl.hukm_data_manager_impl_unittest.cc
public
send_tab_to_self
services
app_service
filesystem
font
heap_profiling
paint_preview_compositor
screen_ai
storage
dom_storage
indexed_db
partition_impl.ccpartition_impl.hpartition_impl_unittest.cc
public
service_worker
shared_storage
storage_service_impl.ccstorage_service_impl.hstorage_service_impl_unittest.cc
session_proto_db
sessions
shared_highlighting
signin
core
internal
ios
public
site_engagement
site_isolation
soda
spellcheck
sqlite_proto
startup_metric_utils
subresource_filter
supervised_user
sync
base
engine
invalidations
model
nigori
service
test
sync_bookmarks
sync_device_info
sync_preferences
sync_sessions
sync_user_events
system_cpu
system_media_controls
thin_webview
tpcd
metadata
tracing
translate
trusted_vault
ui_devtools
ukm
unexportable_keys
unified_consent
update_client
upload_list
url_pattern_index
url_rewrite
user_education
user_manager
user_notes
value_store
visitedlink
viz
client
common
demo
host
service
compositor_frame_fuzzer
debugger
display
aggregated_frame.hca_layer_overlay.hcopy_output_scaling_pixeltest.ccdc_layer_overlay.ccdelegated_ink_point_renderer_base.ccdelegated_ink_point_renderer_base.hdelegated_ink_trail_data.ccdelegated_ink_trail_data.hdirect_renderer.ccdirect_renderer.hdisplay.ccdisplay_damage_tracker.hdisplay_perftest.ccdisplay_resource_provider_skia_unittest.ccdisplay_scheduler.hdisplay_scheduler_base.hdisplay_unittest.ccexternal_use_client.ccexternal_use_client.hframe_rate_decider.ccframe_rate_decider_unittest.ccoutput_surface.houtput_surface_frame.hoverlay_ca_unittest.ccoverlay_candidate.hoverlay_candidate_factory.ccoverlay_candidate_factory.hoverlay_candidate_factory_unittest.ccoverlay_dc_unittest.ccoverlay_processor_delegated.ccoverlay_processor_delegated.hoverlay_processor_interface.hoverlay_processor_mac.ccoverlay_processor_mac.hoverlay_processor_stub.hoverlay_processor_surface_control.ccoverlay_processor_surface_control.hoverlay_processor_surface_control_unittest.ccoverlay_processor_using_strategy.ccoverlay_processor_using_strategy.hoverlay_processor_win.hoverlay_proposed_candidate_unittest.ccoverlay_unittest.ccpending_swap_params.hrenderer_perftest.ccrenderer_pixeltest.ccresolved_frame_data.ccresolved_frame_data.hresolved_frame_data_unittest.ccskia_readback_pixeltest.ccskia_renderer.ccskia_renderer.hsoftware_renderer.ccsoftware_renderer.hsoftware_renderer_unittest.ccsurface_aggregator.ccsurface_aggregator.hsurface_aggregator_perftest.ccsurface_aggregator_pixeltest.ccsurface_aggregator_unittest.ccviz_perftest.ccviz_perftest.h
display_embedder
frame_sinks
gl
hit_test
main
surfaces
transitions
test
web_cache
web_modal
web_package
webapps
webauthn
webcrypto
webrtc
webrtc_logging
wifi
winhttp
zoom
zucchini

@ -4,6 +4,7 @@
#include "components/safe_search_api/safe_search/safe_search_url_checker_client.h"
#include <optional>
#include <utility>
#include "base/functional/callback.h"
@ -20,7 +21,6 @@
#include "services/network/public/cpp/resource_request.h"
#include "services/network/public/cpp/shared_url_loader_factory.h"
#include "services/network/public/cpp/simple_url_loader.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
#include "url/url_constants.h"
namespace safe_search_api {
@ -41,7 +41,7 @@ std::string BuildRequestData(const std::string& api_key, const GURL& url) {
// Parses a SafeSearch API |response| and stores the result in |is_porn|,
// returns true on success. Otherwise, returns false and doesn't set |is_porn|.
bool ParseResponse(const std::string& response, bool* is_porn) {
absl::optional<base::Value> optional_value = base::JSONReader::Read(response);
std::optional<base::Value> optional_value = base::JSONReader::Read(response);
if (!optional_value || !optional_value.value().is_dict()) {
DLOG(WARNING) << "ParseResponse failed to parse global dictionary";
return false;
@ -63,8 +63,7 @@ bool ParseResponse(const std::string& response, bool* is_porn) {
return false;
}
const base::Value::Dict& classification_dict = classification_value.GetDict();
absl::optional<bool> is_porn_opt =
classification_dict.FindBool("pornography");
std::optional<bool> is_porn_opt = classification_dict.FindBool("pornography");
if (is_porn_opt.has_value())
*is_porn = is_porn_opt.value();
return true;