chromium/src
0
Fork 0
Code Activity

Migrate absl variant.h and utility.h in chromecast

Browse Source 
Since https://crrev.com/c/6330348, some utils in
third_party/abseil-cpp/absl/types/variant.h and
and third_party/abseil-cpp/absl/utility/utility.h are only aliases for
their std counterparts. This CL migrates code to use std:: directly.

Bug: 40242126
Change-Id: Ie1e4d9904a2e180b72348214a476ab094f3186d2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6343172
Reviewed-by: Shawn Quereshi <shawnq@google.com>
Commit-Queue: Shawn Quereshi <shawnq@google.com>
Commit-Queue: Victor Vianna <victorvianna@google.com>
Cr-Commit-Position: refs/heads/main@{#1434155}
This commit is contained in:
Victor Hugo Vianna Silva
2025-03-18 08:55:45 -07:00
committed by Chromium LUCI CQ
parent 66fef5bf57
commit f792af94cd
2 changed files with 6 additions and 5 deletions

8
chromecast/app/cast_main_delegate.cc

@ -7,6 +7,7 @@
#include <algorithm>
#include <string>
#include <tuple>
#include <variant>
#include <vector>
#include "base/command_line.h"
@ -36,7 +37,6 @@
#include "content/public/app/initialize_mojo_core.h"
#include "content/public/browser/browser_main_runner.h"
#include "content/public/common/content_switches.h"
#include "third_party/abseil-cpp/absl/types/variant.h"
#include "ui/base/resource/resource_bundle.h"
#if BUILDFLAG(IS_ANDROID)
@ -194,7 +194,7 @@ void CastMainDelegate::PreSandboxStartup() {
InitializeResourceBundle();
}
absl::variant<int, content::MainFunctionParams> CastMainDelegate::RunProcess(
std::variant<int, content::MainFunctionParams> CastMainDelegate::RunProcess(
const std::string& process_type,
content::MainFunctionParams main_function_params) {
#if BUILDFLAG(IS_ANDROID)
@ -229,7 +229,7 @@ void CastMainDelegate::ZygoteForked() {
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
bool CastMainDelegate::ShouldCreateFeatureList(InvokedIn invoked_in) {
return absl::holds_alternative<InvokedInChildProcess>(invoked_in);
return std::holds_alternative<InvokedInChildProcess>(invoked_in);
}
bool CastMainDelegate::ShouldInitializeMojo(InvokedIn invoked_in) {
@ -260,7 +260,7 @@ std::optional<int> CastMainDelegate::PostEarlyInitialization(
// The FieldTrialList is a dependency of the feature list. In tests, it is
// constructed as part of the test suite.
const auto* invoked_in_browser =
absl::get_if<InvokedInBrowserProcess>(&invoked_in);
std::get_if<InvokedInBrowserProcess>(&invoked_in);
if (invoked_in_browser && invoked_in_browser->is_running_test) {
DCHECK(base::FieldTrialList::GetInstance());
} else {

3
chromecast/app/cast_main_delegate.h

@ -7,6 +7,7 @@
#include <memory>
#include <optional>
#include <variant>
#include "build/build_config.h"
#include "chromecast/common/cast_content_client.h"
@ -39,7 +40,7 @@ class CastMainDelegate : public content::ContentMainDelegate {
// content::ContentMainDelegate implementation:
std::optional<int> BasicStartupComplete() override;
void PreSandboxStartup() override;
absl::variant<int, content::MainFunctionParams> RunProcess(
std::variant<int, content::MainFunctionParams> RunProcess(
const std::string& process_type,
content::MainFunctionParams main_function_params) override;
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)