Rename {absl => std}::optional in //content/
Automated patch, intended to be effectively a no-op.
Context:
https://groups.google.com/a/chromium.org/g/cxx/c/nBD_1LaanTc/m/ghh-ZZhWAwAJ?utm_medium=email&utm_source=footer
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 "^content" \
| sort \
| uniq \
| grep \
-e "\.h" \
-e "\.cc" \
-e "\.mm" \
-e "\.py" \
| 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>"
git cl format
```
# Skipping unrelated "check_network_annotation" errors.
NOTRY=True
Bug: chromium:1500249
Change-Id: Icfd31a71d8faf63a2e8d5401127e7ee74cc1c413
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5185537
Auto-Submit: Arthur Sonzogni <[email protected]>
Commit-Queue: Arthur Sonzogni <[email protected]>
Owners-Override: Avi Drissman <[email protected]>
Reviewed-by: Avi Drissman <[email protected]>
Reviewed-by: danakj <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1245739}
diff --git a/content/browser/renderer_host/navigation_controller_impl.cc b/content/browser/renderer_host/navigation_controller_impl.cc
index d4a7120..6df1aa7 100644
--- a/content/browser/renderer_host/navigation_controller_impl.cc
+++ b/content/browser/renderer_host/navigation_controller_impl.cc
@@ -252,7 +252,7 @@
return true;
}
-absl::optional<url::Origin> GetCommittedOriginForFrameEntry(
+std::optional<url::Origin> GetCommittedOriginForFrameEntry(
const mojom::DidCommitProvisionalLoadParams& params,
NavigationRequest* request) {
// Error pages commit in an opaque origin, yet have the real URL that resulted
@@ -260,9 +260,9 @@
// should commit in the correct origin, setting the opaque origin on the
// FrameNavigationEntry will be incorrect.
if (request && request->DidEncounterError())
- return absl::nullopt;
+ return std::nullopt;
- return absl::make_optional(params.origin);
+ return std::make_optional(params.origin);
}
bool IsValidURLForNavigation(FrameTreeNode* node,
@@ -541,8 +541,8 @@
std::unique_ptr<NavigationEntry> NavigationController::CreateNavigationEntry(
const GURL& url,
Referrer referrer,
- absl::optional<url::Origin> initiator_origin,
- absl::optional<GURL> initiator_base_url,
+ std::optional<url::Origin> initiator_origin,
+ std::optional<GURL> initiator_base_url,
ui::PageTransition transition,
bool is_renderer_initiated,
const std::string& extra_headers,
@@ -550,7 +550,7 @@
scoped_refptr<network::SharedURLLoaderFactory> blob_url_loader_factory) {
return NavigationControllerImpl::CreateNavigationEntry(
url, referrer, std::move(initiator_origin), std::move(initiator_base_url),
- absl::nullopt /* source_process_site_url */, transition,
+ std::nullopt /* source_process_site_url */, transition,
is_renderer_initiated, extra_headers, browser_context,
std::move(blob_url_loader_factory), true /* rewrite_virtual_urls */);
}
@@ -560,9 +560,9 @@
NavigationControllerImpl::CreateNavigationEntry(
const GURL& url,
Referrer referrer,
- absl::optional<url::Origin> initiator_origin,
- absl::optional<GURL> initiator_base_url,
- absl::optional<GURL> source_process_site_url,
+ std::optional<url::Origin> initiator_origin,
+ std::optional<GURL> initiator_base_url,
+ std::optional<GURL> source_process_site_url,
ui::PageTransition transition,
bool is_renderer_initiated,
const std::string& extra_headers,
@@ -914,7 +914,7 @@
NavigateToExistingPendingEntry(
reload_type,
/*initiator_rfh=*/nullptr,
- /*soft_navigation_heuristics_task_id=*/absl::nullopt,
+ /*soft_navigation_heuristics_task_id=*/std::nullopt,
/*navigation_api_key=*/nullptr);
}
@@ -1067,26 +1067,26 @@
return GetCurrentEntryIndex() + offset;
}
-absl::optional<int> NavigationControllerImpl::GetIndexForGoBack() {
+std::optional<int> NavigationControllerImpl::GetIndexForGoBack() {
for (int index = GetIndexForOffset(-1); index >= 0; index--) {
if (!GetEntryAtIndex(index)->should_skip_on_back_forward_ui()) {
return index;
}
}
- return absl::nullopt;
+ return std::nullopt;
}
bool NavigationControllerImpl::CanGoBack() {
return GetIndexForGoBack().has_value();
}
-absl::optional<int> NavigationControllerImpl::GetIndexForGoForward() {
+std::optional<int> NavigationControllerImpl::GetIndexForGoForward() {
for (int index = GetIndexForOffset(1); index < GetEntryCount(); index++) {
if (!GetEntryAtIndex(index)->should_skip_on_back_forward_ui()) {
return index;
}
}
- return absl::nullopt;
+ return std::nullopt;
}
bool NavigationControllerImpl::CanGoForward() {
@@ -1117,7 +1117,7 @@
#endif
void NavigationControllerImpl::GoBack() {
- const absl::optional<int> target_index = GetIndexForGoBack();
+ const std::optional<int> target_index = GetIndexForGoBack();
CHECK(target_index.has_value());
@@ -1128,7 +1128,7 @@
// Note that at least one entry (the last one) will be non-skippable since
// entries are marked skippable only when they add another entry because of
// redirect or pushState.
- const absl::optional<int> target_index = GetIndexForGoForward();
+ const std::optional<int> target_index = GetIndexForGoForward();
CHECK(target_index.has_value());
@@ -1137,14 +1137,14 @@
void NavigationControllerImpl::GoToIndex(int index) {
GoToIndex(index, /*initiator_rfh=*/nullptr,
- /*soft_navigation_heuristics_task_id=*/absl::nullopt,
+ /*soft_navigation_heuristics_task_id=*/std::nullopt,
/*navigation_api_key=*/nullptr);
}
void NavigationControllerImpl::GoToIndex(
int index,
RenderFrameHostImpl* initiator_rfh,
- absl::optional<blink::scheduler::TaskAttributionId>
+ std::optional<blink::scheduler::TaskAttributionId>
soft_navigation_heuristics_task_id,
const std::string* navigation_api_key) {
TRACE_EVENT0("browser,navigation,benchmark",
@@ -1191,7 +1191,7 @@
void NavigationControllerImpl::GoToOffsetFromRenderer(
int offset,
RenderFrameHostImpl* initiator_rfh,
- absl::optional<blink::scheduler::TaskAttributionId>
+ std::optional<blink::scheduler::TaskAttributionId>
soft_navigation_heuristics_task_id) {
// Note: This is actually reached in unit tests.
if (!CanGoToOffset(offset))
@@ -1807,7 +1807,7 @@
GetCommittedOriginForFrameEntry(params, request),
Referrer(*params.referrer),
request ? request->common_params().initiator_origin : params.origin,
- request ? request->common_params().initiator_base_url : absl::nullopt,
+ request ? request->common_params().initiator_base_url : std::nullopt,
request ? request->GetRedirectChain() : redirects, params.page_state,
params.method, params.post_id, nullptr /* blob_url_loader_factory */,
ComputePolicyContainerPoliciesForFrameEntry(
@@ -1923,9 +1923,9 @@
NavigationRequest* request,
LoadCommittedDetails* commit_details) {
std::unique_ptr<NavigationEntryImpl> new_entry;
- const absl::optional<url::Origin>& initiator_origin =
+ const std::optional<url::Origin>& initiator_origin =
request->common_params().initiator_origin;
- absl::optional<GURL> initiator_base_url;
+ std::optional<GURL> initiator_base_url;
if (params.url.IsAboutBlank() || params.url.IsAboutSrcdoc()) {
initiator_base_url = request->common_params().initiator_base_url;
}
@@ -2251,9 +2251,9 @@
// This FrameNavigationEntry might not end up being used in the
// CloneAndReplace() call below, if a spot can't be found for it in the tree.
- const absl::optional<url::Origin>& initiator_origin =
+ const std::optional<url::Origin>& initiator_origin =
request->common_params().initiator_origin;
- absl::optional<GURL> initiator_base_url;
+ std::optional<GURL> initiator_base_url;
if (params.url.IsAboutBlank() || params.url.IsAboutSrcdoc()) {
initiator_base_url = request->common_params().initiator_base_url;
}
@@ -2698,7 +2698,7 @@
frame_tree_node, entry, frame_entry, reload_type,
false /* is_same_document_history_load */,
false /* is_history_navigation_in_new_child */,
- absl::nullopt /* initiator_frame_token */,
+ std::nullopt /* initiator_frame_token */,
ChildProcessHost::kInvalidUniqueID /* initiator_process_id */);
if (!request)
return false;
@@ -2711,8 +2711,8 @@
const GURL& url,
const blink::LocalFrameToken* initiator_frame_token,
int initiator_process_id,
- const absl::optional<url::Origin>& initiator_origin,
- const absl::optional<GURL>& initiator_base_url,
+ const std::optional<url::Origin>& initiator_origin,
+ const std::optional<GURL>& initiator_base_url,
bool is_renderer_initiated,
SiteInstance* source_site_instance,
const Referrer& referrer,
@@ -2725,7 +2725,7 @@
network::mojom::SourceLocationPtr source_location,
scoped_refptr<network::SharedURLLoaderFactory> blob_url_loader_factory,
bool is_form_submission,
- const absl::optional<blink::Impression>& impression,
+ const std::optional<blink::Impression>& impression,
blink::mojom::NavigationInitiatorActivationAndAdStatus
initiator_activation_and_ad_status,
base::TimeTicks navigation_start_time,
@@ -2733,7 +2733,7 @@
bool is_unfenced_top_navigation,
bool force_new_browsing_instance,
bool is_container_initiated,
- absl::optional<std::u16string> embedder_shared_storage_context) {
+ std::optional<std::u16string> embedder_shared_storage_context) {
if (is_renderer_initiated)
DCHECK(initiator_origin.has_value());
@@ -2770,7 +2770,7 @@
entry->AddOrUpdateFrameEntry(
node, NavigationEntryImpl::UpdatePolicy::kReplace, -1, -1, "", nullptr,
static_cast<SiteInstanceImpl*>(source_site_instance), url,
- absl::nullopt /* commit_origin */, referrer, initiator_origin,
+ std::nullopt /* commit_origin */, referrer, initiator_origin,
initiator_base_url, std::vector<GURL>(), blink::PageState(), method, -1,
blob_url_loader_factory, nullptr /* policy_container_policies */);
} else {
@@ -2780,7 +2780,7 @@
// fenced frames or subframes, they don't rewrite urls as the urls are not
// input urls by users.
bool rewrite_virtual_urls = node->IsOutermostMainFrame();
- absl::optional<GURL> source_process_site_url = absl::nullopt;
+ std::optional<GURL> source_process_site_url = std::nullopt;
if (source_site_instance && source_site_instance->HasProcess()) {
source_process_site_url =
source_site_instance->GetProcess()->GetProcessLock().site_url();
@@ -2812,7 +2812,7 @@
frame_entry = base::MakeRefCounted<FrameNavigationEntry>(
node->unique_name(), -1, -1, "", nullptr,
static_cast<SiteInstanceImpl*>(source_site_instance), url,
- absl::nullopt /* origin */, referrer, initiator_origin,
+ std::nullopt /* origin */, referrer, initiator_origin,
initiator_base_url, std::vector<GURL>(), blink::PageState(), method, -1,
blob_url_loader_factory, nullptr /* policy_container_policies */,
false /* protect_url_in_navigation_api */);
@@ -3079,7 +3079,7 @@
void NavigationControllerImpl::NavigateToExistingPendingEntry(
ReloadType reload_type,
RenderFrameHostImpl* initiator_rfh,
- absl::optional<blink::scheduler::TaskAttributionId>
+ std::optional<blink::scheduler::TaskAttributionId>
soft_navigation_heuristics_task_id,
const std::string* navigation_api_key) {
TRACE_EVENT0("navigation",
@@ -3100,7 +3100,7 @@
// Only pass down the soft_navigation_heuristics_task_id when the initiator is
// the same as the top level frame being navigated.
if (root->current_frame_host() != initiator_rfh) {
- soft_navigation_heuristics_task_id = absl::nullopt;
+ soft_navigation_heuristics_task_id = std::nullopt;
}
// If we were navigating to a slow-to-commit page, and the user performs
@@ -3118,7 +3118,7 @@
return;
}
- absl::optional<blink::LocalFrameToken> initiator_frame_token;
+ std::optional<blink::LocalFrameToken> initiator_frame_token;
int initiator_process_id = ChildProcessHost::kInvalidUniqueID;
if (initiator_rfh) {
initiator_frame_token = initiator_rfh->GetFrameToken();
@@ -3464,9 +3464,9 @@
void NavigationControllerImpl::FindFramesToNavigate(
FrameTreeNode* frame,
ReloadType reload_type,
- const absl::optional<blink::LocalFrameToken>& initiator_frame_token,
+ const std::optional<blink::LocalFrameToken>& initiator_frame_token,
int initiator_process_id,
- absl::optional<blink::scheduler::TaskAttributionId>
+ std::optional<blink::scheduler::TaskAttributionId>
soft_navigation_heuristics_task_id,
std::vector<std::unique_ptr<NavigationRequest>>* same_document_loads,
std::vector<std::unique_ptr<NavigationRequest>>* different_document_loads) {
@@ -3513,7 +3513,7 @@
for (size_t i = 0; i < frame->child_count(); i++) {
FindFramesToNavigate(frame->child_at(i), reload_type, initiator_frame_token,
initiator_process_id,
- /*soft_navigation_heuristics_task_id=*/absl::nullopt,
+ /*soft_navigation_heuristics_task_id=*/std::nullopt,
same_document_loads, different_document_loads);
}
}
@@ -3737,7 +3737,7 @@
entry->AddOrUpdateFrameEntry(
node, NavigationEntryImpl::UpdatePolicy::kReplace, -1, -1, "", nullptr,
static_cast<SiteInstanceImpl*>(params.source_site_instance.get()),
- params.url, absl::nullopt, params.referrer, params.initiator_origin,
+ params.url, std::nullopt, params.referrer, params.initiator_origin,
params.initiator_base_url, params.redirect_chain, blink::PageState(),
"GET", -1, blob_url_loader_factory,
// If in NavigateWithoutEntry we later determine that this navigation is
@@ -3753,7 +3753,7 @@
bool rewrite_virtual_urls = node->IsOutermostMainFrame();
scoped_refptr<SiteInstance> source_site_instance =
params.source_site_instance;
- absl::optional<GURL> source_process_site_url = absl::nullopt;
+ std::optional<GURL> source_process_site_url = std::nullopt;
if (source_site_instance && source_site_instance->HasProcess()) {
source_process_site_url =
source_site_instance->GetProcess()->GetProcessLock().site_url();
@@ -3817,7 +3817,7 @@
bool is_embedder_initiated_fenced_frame_navigation,
bool is_unfenced_top_navigation,
bool is_container_initiated,
- absl::optional<std::u16string> embedder_shared_storage_context) {
+ std::optional<std::u16string> embedder_shared_storage_context) {
DCHECK_EQ(-1, GetIndexOfEntry(entry));
DCHECK(frame_entry);
// All renderer-initiated navigations must have an initiator_origin.
@@ -3916,7 +3916,7 @@
blink::mojom::CommitNavigationParamsPtr commit_params =
blink::mojom::CommitNavigationParams::New(
- absl::nullopt,
+ std::nullopt,
// The correct storage key and session storage key will be computed
// before committing the navigation.
blink::StorageKey(), blink::StorageKey(), override_user_agent,
@@ -3959,16 +3959,16 @@
/*reduced_accept_language=*/std::string(),
/*navigation_delivery_type=*/
network::mojom::NavigationDeliveryType::kDefault,
- /*view_transition_state=*/absl::nullopt,
- /*soft_navigation_heuristics_task_id=*/absl::nullopt,
+ /*view_transition_state=*/std::nullopt,
+ /*soft_navigation_heuristics_task_id=*/std::nullopt,
/*modified_runtime_features=*/
base::flat_map<::blink::mojom::RuntimeFeature, bool>(),
- /*fenced_frame_properties=*/absl::nullopt,
+ /*fenced_frame_properties=*/std::nullopt,
/*not_restored_reasons=*/nullptr,
/*load_with_storage_access=*/false,
- /*browsing_context_group_info=*/absl::nullopt,
+ /*browsing_context_group_info=*/std::nullopt,
/*lcpp_hint=*/nullptr, blink::CreateDefaultRendererContentSettings(),
- /*cookie_deprecation_label=*/absl::nullopt);
+ /*cookie_deprecation_label=*/std::nullopt);
#if BUILDFLAG(IS_ANDROID)
if (ValidateDataURLAsString(params.data_url_as_string)) {
commit_params->data_url_as_string = params.data_url_as_string->data();
@@ -4008,9 +4008,9 @@
ReloadType reload_type,
bool is_same_document_history_load,
bool is_history_navigation_in_new_child_frame,
- const absl::optional<blink::LocalFrameToken>& initiator_frame_token,
+ const std::optional<blink::LocalFrameToken>& initiator_frame_token,
int initiator_process_id,
- absl::optional<blink::scheduler::TaskAttributionId>
+ std::optional<blink::scheduler::TaskAttributionId>
soft_navigation_heuristics_task_id) {
DCHECK(frame_entry);
GURL dest_url = frame_entry->url();
@@ -4117,7 +4117,7 @@
is_browser_initiated, false /* was_opener_suppressed */,
initiator_frame_token, initiator_process_id, entry->extra_headers(),
frame_entry, entry, is_form_submission, nullptr /* navigation_ui_data */,
- absl::nullopt /* impression */,
+ std::nullopt /* impression */,
blink::mojom::NavigationInitiatorActivationAndAdStatus::
kDidNotStartWithTransientActivation,
false /* is_pdf */);
@@ -4171,7 +4171,7 @@
NavigateToExistingPendingEntry(
ReloadType::NONE,
/*initiator_rfh=*/nullptr,
- /*soft_navigation_heuristics_task_id=*/absl::nullopt,
+ /*soft_navigation_heuristics_task_id=*/std::nullopt,
/*navigation_api_key=*/nullptr);
} else if (!GetLastCommittedEntry()
->IsInitialEntryNotForSynchronousAboutBlank()) {
@@ -4180,7 +4180,7 @@
NavigateToExistingPendingEntry(
ReloadType::NONE,
/*initiator_rfh=*/nullptr,
- /*soft_navigation_heuristics_task_id=*/absl::nullopt,
+ /*soft_navigation_heuristics_task_id=*/std::nullopt,
/*navigation_api_key=*/nullptr);
} else {
// We should never navigate to an existing initial NavigationEntry that is
@@ -4244,7 +4244,7 @@
false /* was_opener_suppressed */, "" /* extra_headers */,
nullptr /* frame_entry */, nullptr /* entry */,
false /* is_form_submission */, nullptr /* navigation_ui_data */,
- absl::nullopt /* impression */, false /* is_pdf */);
+ std::nullopt /* impression */, false /* is_pdf */);
navigation_request->set_post_commit_error_page_html(error_page_html);
navigation_request->set_net_error(net::ERR_BLOCKED_BY_CLIENT);
node->TakeNavigationRequest(std::move(navigation_request));
@@ -4741,7 +4741,7 @@
void NavigationControllerImpl::NavigateToNavigationApiKey(
RenderFrameHostImpl* initiator_rfh,
- absl::optional<blink::scheduler::TaskAttributionId>
+ std::optional<blink::scheduler::TaskAttributionId>
soft_navigation_heuristics_task_id,
const std::string& key) {
FrameTreeNode* node = initiator_rfh->frame_tree_node();
