diff --git a/app/brave_main_delegate.cc b/app/brave_main_delegate.cc index 69037a6534d..ce03c8c275c 100644 --- a/app/brave_main_delegate.cc +++ b/app/brave_main_delegate.cc @@ -6,6 +6,7 @@ #include "brave/app/brave_main_delegate.h" #include +#include #include #include @@ -154,7 +155,7 @@ void BraveMainDelegate::PreSandboxStartup() { } } -absl::optional BraveMainDelegate::PostEarlyInitialization( +std::optional BraveMainDelegate::PostEarlyInitialization( ChromeMainDelegate::InvokedIn invoked_in) { auto result = ChromeMainDelegate::PostEarlyInitialization(invoked_in); if (result.has_value()) { diff --git a/app/brave_main_delegate.h b/app/brave_main_delegate.h index 0adc8fe4b8e..69ffa30741b 100644 --- a/app/brave_main_delegate.h +++ b/app/brave_main_delegate.h @@ -6,6 +6,8 @@ #ifndef BRAVE_APP_BRAVE_MAIN_DELEGATE_H_ #define BRAVE_APP_BRAVE_MAIN_DELEGATE_H_ +#include + #include "build/build_config.h" #include "chrome/app/chrome_main_delegate.h" @@ -27,7 +29,7 @@ class BraveMainDelegate : public ChromeMainDelegate { content::ContentRendererClient* CreateContentRendererClient() override; content::ContentUtilityClient* CreateContentUtilityClient() override; void PreSandboxStartup() override; - absl::optional PostEarlyInitialization( + std::optional PostEarlyInitialization( ChromeMainDelegate::InvokedIn invoked_in) override; }; diff --git a/base/process/process_launcher.h b/base/process/process_launcher.h index 5901c5c83ab..05266e91011 100644 --- a/base/process/process_launcher.h +++ b/base/process/process_launcher.h @@ -6,11 +6,11 @@ #ifndef BRAVE_BASE_PROCESS_PROCESS_LAUNCHER_H_ #define BRAVE_BASE_PROCESS_PROCESS_LAUNCHER_H_ +#include #include #include "base/process/launch.h" #include "base/process/process.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave { class ProcessLauncher { @@ -22,9 +22,9 @@ class ProcessLauncher { * Launches process in this thread and reads the output. * This works like GetAppOutput, but respects provided LaunchOptions. */ - static absl::optional ReadAppOutput(base::CommandLine cmdline, - base::LaunchOptions options, - int timeout_sec); + static std::optional ReadAppOutput(base::CommandLine cmdline, + base::LaunchOptions options, + int timeout_sec); }; } // namespace brave diff --git a/base/process/process_launcher_posix.cc b/base/process/process_launcher_posix.cc index b035d89778c..fe84f3cdb10 100644 --- a/base/process/process_launcher_posix.cc +++ b/base/process/process_launcher_posix.cc @@ -5,6 +5,7 @@ #include "brave/base/process/process_launcher.h" +#include #include #include @@ -17,13 +18,13 @@ ProcessLauncher::ProcessLauncher() = default; ProcessLauncher::~ProcessLauncher() = default; // static -absl::optional ProcessLauncher::ReadAppOutput( +std::optional ProcessLauncher::ReadAppOutput( base::CommandLine cmdline, base::LaunchOptions options, int timeout_sec) { int pipe_fd[2]; if (pipe(pipe_fd) < 0) { - return absl::nullopt; + return std::nullopt; } options.fds_to_remap.emplace_back(pipe_fd[1], STDOUT_FILENO); @@ -33,7 +34,7 @@ absl::optional ProcessLauncher::ReadAppOutput( if (!process.IsValid()) { close(pipe_fd[0]); close(pipe_fd[1]); - return absl::nullopt; + return std::nullopt; } bool exited = false; @@ -53,7 +54,7 @@ absl::optional ProcessLauncher::ReadAppOutput( if (exited && !exit_code && read_result) { return result; } else { - return absl::nullopt; + return std::nullopt; } } diff --git a/base/process/process_launcher_win.cc b/base/process/process_launcher_win.cc index 550d0baa146..baf0ce86edc 100644 --- a/base/process/process_launcher_win.cc +++ b/base/process/process_launcher_win.cc @@ -5,6 +5,7 @@ #include "brave/base/process/process_launcher.h" +#include #include #include @@ -19,7 +20,7 @@ ProcessLauncher::ProcessLauncher() = default; ProcessLauncher::~ProcessLauncher() = default; // static -absl::optional ProcessLauncher::ReadAppOutput( +std::optional ProcessLauncher::ReadAppOutput( base::CommandLine cmdline, base::LaunchOptions options, int timeout_sec) { @@ -35,7 +36,7 @@ absl::optional ProcessLauncher::ReadAppOutput( // Create the pipe for the child process's STDOUT. if (!CreatePipe(&out_read, &out_write, &sa_attr, 0)) { NOTREACHED() << "Failed to create pipe"; - return absl::nullopt; + return std::nullopt; } // Ensure we don't leak the handles. @@ -45,7 +46,7 @@ absl::optional ProcessLauncher::ReadAppOutput( // Ensure the read handles to the pipes are not inherited. if (!SetHandleInformation(out_read, HANDLE_FLAG_INHERIT, 0)) { NOTREACHED() << "Failed to disabled pipe inheritance"; - return absl::nullopt; + return std::nullopt; } options.stdin_handle = out_read; @@ -55,7 +56,7 @@ absl::optional ProcessLauncher::ReadAppOutput( base::Process process = base::LaunchProcess(cmdline, options); if (!process.IsValid()) { - return absl::nullopt; + return std::nullopt; } bool exited = false; @@ -75,7 +76,7 @@ absl::optional ProcessLauncher::ReadAppOutput( if (exited && !exit_code && read_result) { return result; } else { - return absl::nullopt; + return std::nullopt; } } diff --git a/browser/brave_content_browser_client.cc b/browser/brave_content_browser_client.cc index 1ad2d8c2e05..5fad33c9641 100644 --- a/browser/brave_content_browser_client.cc +++ b/browser/brave_content_browser_client.cc @@ -6,6 +6,7 @@ #include "brave/browser/brave_content_browser_client.h" #include +#include #include #include #include @@ -776,10 +777,9 @@ bool BraveContentBrowserClient::HandleExternalProtocol( network::mojom::WebSandboxFlags sandbox_flags, ui::PageTransition page_transition, bool has_user_gesture, - const absl::optional& initiating_origin, + const std::optional& initiating_origin, content::RenderFrameHost* initiator_document, mojo::PendingRemote* out_factory) { - return ChromeContentBrowserClient::HandleExternalProtocol( url, web_contents_getter, frame_tree_node_id, navigation_data, is_primary_main_frame, is_in_fenced_frame_tree, sandbox_flags, @@ -887,7 +887,7 @@ bool BraveContentBrowserClient::WillCreateURLLoaderFactory( int render_process_id, URLLoaderFactoryType type, const url::Origin& request_initiator, - absl::optional navigation_id, + std::optional navigation_id, ukm::SourceIdObj ukm_source_id, mojo::PendingReceiver* factory_receiver, mojo::PendingRemote* @@ -922,7 +922,7 @@ void BraveContentBrowserClient::CreateWebSocket( content::ContentBrowserClient::WebSocketFactory factory, const GURL& url, const net::SiteForCookies& site_for_cookies, - const absl::optional& user_agent, + const std::optional& user_agent, mojo::PendingRemote handshake_client) { auto* proxy = BraveProxyingWebSocket::ProxyWebSocket( diff --git a/browser/brave_content_browser_client.h b/browser/brave_content_browser_client.h index 067d868600e..bf5b913fe6e 100644 --- a/browser/brave_content_browser_client.h +++ b/browser/brave_content_browser_client.h @@ -7,6 +7,7 @@ #define BRAVE_BROWSER_BRAVE_CONTENT_BROWSER_CLIENT_H_ #include +#include #include #include @@ -15,7 +16,6 @@ #include "content/public/browser/content_browser_client.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "services/metrics/public/cpp/ukm_source_id.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/blink/public/mojom/loader/referrer.mojom.h" class PrefChangeRegistrar; @@ -62,7 +62,7 @@ class BraveContentBrowserClient : public ChromeContentBrowserClient { network::mojom::WebSandboxFlags sandbox_flags, ui::PageTransition page_transition, bool has_user_gesture, - const absl::optional& initiating_origin, + const std::optional& initiating_origin, content::RenderFrameHost* initiator_document, mojo::PendingRemote* out_factory) override; @@ -101,7 +101,7 @@ class BraveContentBrowserClient : public ChromeContentBrowserClient { int render_process_id, URLLoaderFactoryType type, const url::Origin& request_initiator, - absl::optional navigation_id, + std::optional navigation_id, ukm::SourceIdObj ukm_source_id, mojo::PendingReceiver* factory_receiver, mojo::PendingRemote* @@ -118,7 +118,7 @@ class BraveContentBrowserClient : public ChromeContentBrowserClient { content::ContentBrowserClient::WebSocketFactory factory, const GURL& url, const net::SiteForCookies& site_for_cookies, - const absl::optional& user_agent, + const std::optional& user_agent, mojo::PendingRemote handshake_client) override; diff --git a/browser/brave_news/brave_news_tab_helper_browsertest.cc b/browser/brave_news/brave_news_tab_helper_browsertest.cc index 7603e58a207..20b8941b032 100644 --- a/browser/brave_news/brave_news_tab_helper_browsertest.cc +++ b/browser/brave_news/brave_news_tab_helper_browsertest.cc @@ -3,6 +3,9 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this file, // you can obtain one at http://mozilla.org/MPL/2.0/. +#include "brave/browser/brave_news/brave_news_tab_helper.h" + +#include #include #include "base/command_line.h" @@ -11,7 +14,6 @@ #include "base/run_loop.h" #include "base/scoped_observation.h" #include "base/test/scoped_feature_list.h" -#include "brave/browser/brave_news/brave_news_tab_helper.h" #include "brave/components/brave_news/common/pref_names.h" #include "brave/components/constants/brave_paths.h" #include "chrome/browser/profiles/profile.h" @@ -29,7 +31,6 @@ #include "content/public/test/test_navigation_observer.h" #include "content/public/test/test_utils.h" #include "net/dns/mock_host_resolver.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/base/page_transition_types.h" #include "ui/base/window_open_disposition.h" @@ -65,7 +66,7 @@ class WaitForFeedsChanged : public BraveNewsTabHelper::PageFeedsObserver { base::RunLoop loop_; raw_ptr tab_helper_; - absl::optional> last_feeds_ = absl::nullopt; + std::optional> last_feeds_ = std::nullopt; base::ScopedObservation diff --git a/browser/brave_shell_integration_win.cc b/browser/brave_shell_integration_win.cc index 6ba97c6f7e2..157cb6ddfba 100644 --- a/browser/brave_shell_integration_win.cc +++ b/browser/brave_shell_integration_win.cc @@ -6,6 +6,7 @@ #include "brave/browser/brave_shell_integration_win.h" #include +#include #include #include #include @@ -28,7 +29,6 @@ #include "chrome/installer/util/shell_util.h" #include "chrome/installer/util/taskbar_util.h" #include "content/public/browser/browser_thread.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace { @@ -92,15 +92,15 @@ bool CreateShortcut(const ShellUtil::ShortcutProperties& properties, base::win::ShortcutOperation::kCreateAlways); } -absl::optional GetShortcutPath( +std::optional GetShortcutPath( const std::wstring& shortcut_name) { base::FilePath shortcut_path; if (!base::PathService::Get(base::DIR_TEMP, &shortcut_path) || shortcut_path.empty()) - return absl::nullopt; + return std::nullopt; shortcut_path = shortcut_path.Append(shortcut_name); - return absl::optional(shortcut_path); + return std::optional(shortcut_path); } // All args could be empty when we want to pin default profile's shortcut. @@ -129,7 +129,7 @@ bool PinToTaskbarImpl(const base::FilePath& profile_path, } // Generate shortcut file to use for pin to taskbar. - absl::optional shortcut_path = + std::optional shortcut_path = GetShortcutPath(ExtractShortcutNameFromProperties(properties)); if (!shortcut_path) { LOG(ERROR) << __func__ << " failed to get shortcut path"; diff --git a/browser/brave_shields/ad_block_service_browsertest.cc b/browser/brave_shields/ad_block_service_browsertest.cc index 30cd52b3cc1..2a01100acd8 100644 --- a/browser/brave_shields/ad_block_service_browsertest.cc +++ b/browser/brave_shields/ad_block_service_browsertest.cc @@ -6,6 +6,7 @@ #include "brave/browser/brave_shields/ad_block_service_browsertest.h" #include +#include #include #include #include @@ -848,9 +849,9 @@ IN_PROC_BROWSER_TEST_F(AdBlockServiceTest, SubscribeToCustomSubscription) { ASSERT_EQ(subscriptions[0].last_update_attempt, base::Time()); ASSERT_EQ(subscriptions[0].last_successful_update_attempt, base::Time()); ASSERT_EQ(subscriptions[0].enabled, true); - ASSERT_EQ(subscriptions[0].homepage, absl::nullopt); + ASSERT_EQ(subscriptions[0].homepage, std::nullopt); ASSERT_EQ(subscriptions[0].expires, 7 * 24); - ASSERT_EQ(subscriptions[0].title, absl::nullopt); + ASSERT_EQ(subscriptions[0].title, std::nullopt); } // Ensure that the subscription gets update attempts, and ultimately is diff --git a/browser/brave_vpn/dns/brave_vpn_dns_observer_service_win.h b/browser/brave_vpn/dns/brave_vpn_dns_observer_service_win.h index 1636e7d26c2..215b1ce84b8 100644 --- a/browser/brave_vpn/dns/brave_vpn_dns_observer_service_win.h +++ b/browser/brave_vpn/dns/brave_vpn_dns_observer_service_win.h @@ -7,6 +7,7 @@ #define BRAVE_BROWSER_BRAVE_VPN_DNS_BRAVE_VPN_DNS_OBSERVER_SERVICE_WIN_H_ #include +#include #include #include @@ -14,7 +15,6 @@ #include "brave/components/brave_vpn/browser/brave_vpn_service_observer.h" #include "brave/components/brave_vpn/common/win/brave_windows_service_watcher.h" #include "components/keyed_service/core/keyed_service.h" -#include "third_party/abseil-cpp/absl/types/optional.h" class PrefService; @@ -61,9 +61,9 @@ class BraveVpnDnsObserverService : public brave_vpn::BraveVPNServiceObserver, void OnCheckIfServiceStarted(); - absl::optional connection_state_; + std::optional connection_state_; std::unique_ptr service_watcher_; - absl::optional dns_helper_live_for_testing_; + std::optional dns_helper_live_for_testing_; base::OnceClosure policy_callback_; base::RepeatingClosure dialog_callback_; bool skip_notification_dialog_for_testing_ = false; diff --git a/browser/brave_vpn/win/brave_vpn_wireguard_observer_service_win.h b/browser/brave_vpn/win/brave_vpn_wireguard_observer_service_win.h index a40f0c13d6f..b2e638f7884 100644 --- a/browser/brave_vpn/win/brave_vpn_wireguard_observer_service_win.h +++ b/browser/brave_vpn/win/brave_vpn_wireguard_observer_service_win.h @@ -6,11 +6,11 @@ #ifndef BRAVE_BROWSER_BRAVE_VPN_WIN_BRAVE_VPN_WIREGUARD_OBSERVER_SERVICE_WIN_H_ #define BRAVE_BROWSER_BRAVE_VPN_WIN_BRAVE_VPN_WIREGUARD_OBSERVER_SERVICE_WIN_H_ +#include #include #include "brave/components/brave_vpn/browser/brave_vpn_service_observer.h" #include "components/keyed_service/core/keyed_service.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_vpn { @@ -43,7 +43,7 @@ class BraveVpnWireguardObserverService void ShowFallbackDialog(); bool ShouldShowFallbackDialog() const; - absl::optional should_fallback_for_testing_; + std::optional should_fallback_for_testing_; base::RepeatingClosure dialog_callback_; }; diff --git a/browser/brave_vpn/win/brave_vpn_wireguard_service/main.cc b/browser/brave_vpn/win/brave_vpn_wireguard_service/main.cc index 1be13271952..b51e74dd604 100644 --- a/browser/brave_vpn/win/brave_vpn_wireguard_service/main.cc +++ b/browser/brave_vpn/win/brave_vpn_wireguard_service/main.cc @@ -3,6 +3,8 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this file, // You can obtain one at https://mozilla.org/MPL/2.0/. +#include + #include "base/at_exit.h" #include "base/command_line.h" #include "base/files/file_path.h" @@ -27,7 +29,6 @@ #include "components/crash/core/app/fallback_crash_handling_win.h" #include "components/crash/core/app/run_as_crashpad_handler_win.h" #include "components/grit/brave_components_strings.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/base/l10n/l10n_util.h" namespace { @@ -37,7 +38,7 @@ const char kLogFile[] = "log-file"; } // namespace // List of commands executed on user level and interacting with users. -absl::optional ProcessUserLevelCommands( +std::optional ProcessUserLevelCommands( const base::CommandLine& command_line) { brave_vpn::LoadLocaleResources(); // User level command line. In this mode creates an invisible window and sets @@ -68,7 +69,7 @@ absl::optional ProcessUserLevelCommands( IDS_BRAVE_VPN_WIREGUARD_TRAY_NOTIFICATION_DISCONNECTED))); return 0; } - return absl::nullopt; + return std::nullopt; } int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE prev, wchar_t*, int) { diff --git a/browser/brave_vpn/win/brave_vpn_wireguard_service/service/wireguard_tunnel_service.cc b/browser/brave_vpn/win/brave_vpn_wireguard_service/service/wireguard_tunnel_service.cc index 0d909f871d7..82ad5d0884c 100644 --- a/browser/brave_vpn/win/brave_vpn_wireguard_service/service/wireguard_tunnel_service.cc +++ b/browser/brave_vpn/win/brave_vpn_wireguard_service/service/wireguard_tunnel_service.cc @@ -5,6 +5,7 @@ #include "brave/browser/brave_vpn/win/brave_vpn_wireguard_service/service/wireguard_tunnel_service.h" +#include #include #include @@ -29,7 +30,6 @@ #include "brave/components/brave_vpn/common/wireguard/win/service_constants.h" #include "brave/components/brave_vpn/common/wireguard/win/service_details.h" #include "brave/components/brave_vpn/common/wireguard/win/storage_utils.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_vpn { @@ -104,17 +104,17 @@ bool ConfigureConfigPermissions(const base::FilePath& config_path) { 0, /*recursive=*/false); } -absl::optional WriteConfigToFile(const std::string& config) { +std::optional WriteConfigToFile(const std::string& config) { base::FilePath temp_dir_path; // Intentionally using base::GetTempDir to reuse same directory between // launches. if (!base::GetTempDir(&temp_dir_path) || temp_dir_path.empty()) { VLOG(1) << "Unable to get temporary directory"; - return absl::nullopt; + return std::nullopt; } base::ScopedTempDir scoped_temp_dir; if (!scoped_temp_dir.Set(temp_dir_path.Append(base::FilePath(L"BraveVpn")))) { - return absl::nullopt; + return std::nullopt; } base::FilePath temp_file_path(scoped_temp_dir.GetPath().Append( @@ -122,7 +122,7 @@ absl::optional WriteConfigToFile(const std::string& config) { if (!base::WriteFile(temp_file_path, config)) { VLOG(1) << "Failed to write config to file:" << temp_file_path; - return absl::nullopt; + return std::nullopt; } if (!ConfigureConfigPermissions(temp_file_path)) { VLOG(1) << "Failed to set permissions to file:" << temp_file_path; @@ -141,7 +141,7 @@ bool IsServiceRunning(SC_HANDLE service) { return service_status.dwCurrentState == SERVICE_RUNNING; } -absl::optional GetConfigFilePath( +std::optional GetConfigFilePath( const std::wstring& encoded_config) { if (encoded_config.empty()) { return wireguard::GetLastUsedConfigPath(); @@ -151,7 +151,7 @@ absl::optional GetConfigFilePath( if (!base::Base64Decode(base::WideToUTF8(encoded_config), &decoded_config) || decoded_config.empty()) { VLOG(1) << "Unable to decode wireguard config"; - return absl::nullopt; + return std::nullopt; } return WriteConfigToFile(decoded_config); } diff --git a/browser/brave_vpn/win/brave_vpn_wireguard_service/status_tray/status_tray_runner.cc b/browser/brave_vpn/win/brave_vpn_wireguard_service/status_tray/status_tray_runner.cc index 6794529831d..42538fc15ab 100644 --- a/browser/brave_vpn/win/brave_vpn_wireguard_service/status_tray/status_tray_runner.cc +++ b/browser/brave_vpn/win/brave_vpn_wireguard_service/status_tray/status_tray_runner.cc @@ -30,7 +30,6 @@ #include "brave/components/brave_vpn/common/wireguard/win/storage_utils.h" #include "brave/components/brave_vpn/common/wireguard/win/wireguard_utils_win.h" #include "components/grit/brave_components_strings.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/simple_menu_model.h" #include "ui/native_theme/native_theme.h" diff --git a/browser/brave_vpn/win/brave_vpn_wireguard_service/status_tray/status_tray_runner.h b/browser/brave_vpn/win/brave_vpn_wireguard_service/status_tray/status_tray_runner.h index 31e173afd29..1855e08b712 100644 --- a/browser/brave_vpn/win/brave_vpn_wireguard_service/status_tray/status_tray_runner.h +++ b/browser/brave_vpn/win/brave_vpn_wireguard_service/status_tray/status_tray_runner.h @@ -7,6 +7,7 @@ #define BRAVE_BROWSER_BRAVE_VPN_WIN_BRAVE_VPN_WIREGUARD_SERVICE_STATUS_TRAY_STATUS_TRAY_RUNNER_H_ #include +#include #include #include @@ -18,7 +19,6 @@ #include "brave/browser/brave_vpn/win/brave_vpn_wireguard_service/status_tray/wireguard/wireguard_service_observer.h" #include "brave/components/brave_vpn/common/mojom/brave_vpn.mojom.h" #include "brave/components/brave_vpn/common/win/ras/ras_connection_observer.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace ui { class SimpleMenuModel; @@ -51,7 +51,7 @@ class StatusTrayRunner : public TrayMenuModel::Delegate, } void SetCurrentStateForTesting( - absl::optional state) { + std::optional state) { current_state_ = std::move(state); } @@ -92,9 +92,9 @@ class StatusTrayRunner : public TrayMenuModel::Delegate, void ExecuteCommand(int command_id, int event_flags) override; void OnMenuWillShow(ui::SimpleMenuModel* source) override; - absl::optional current_state_; + std::optional current_state_; SetIconStateCallback callback_for_testing_; - absl::optional vpn_connected_for_testing_; + std::optional vpn_connected_for_testing_; base::win::RegKey storage_; std::unique_ptr status_tray_; base::OnceClosure quit_; diff --git a/browser/brave_wallet/android/blockchain_registry_factory_android.cc b/browser/brave_wallet/android/blockchain_registry_factory_android.cc index 9ce8f8d3a5e..be6c7962eda 100644 --- a/browser/brave_wallet/android/blockchain_registry_factory_android.cc +++ b/browser/brave_wallet/android/blockchain_registry_factory_android.cc @@ -3,6 +3,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include + #include "base/android/jni_android.h" #include "base/android/jni_string.h" #include "base/version.h" @@ -13,7 +15,6 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_android.h" #include "mojo/public/cpp/bindings/pending_receiver.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace chrome { namespace android { @@ -30,7 +31,7 @@ JNI_BlockchainRegistryFactory_GetTokensIconsLocation( const base::android::JavaParamRef& profile_android) { auto* profile = ProfileAndroid::FromProfileAndroid(profile_android); - absl::optional version = + std::optional version = brave_wallet::GetLastInstalledWalletVersion(); if (version) { base::FilePath path = profile->GetPath().DirName(); diff --git a/browser/brave_wallet/asset_discovery_task_unittest.cc b/browser/brave_wallet/asset_discovery_task_unittest.cc index 5ecc5c8db19..7480cf84921 100644 --- a/browser/brave_wallet/asset_discovery_task_unittest.cc +++ b/browser/brave_wallet/asset_discovery_task_unittest.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/asset_discovery_task.h" +#include #include #include "base/base64.h" @@ -742,14 +743,14 @@ TEST_F(AssetDiscoveryTaskUnitTest, DiscoverERC20sFromRegistry) { TEST_F(AssetDiscoveryTaskUnitTest, DecodeMintAddress) { // Invalid (data too short) - absl::optional> data_short = base::Base64Decode("YQ=="); + std::optional> data_short = base::Base64Decode("YQ=="); ASSERT_TRUE(data_short); - absl::optional mint_address = + std::optional mint_address = asset_discovery_task_->DecodeMintAddress(*data_short); ASSERT_FALSE(mint_address); // Valid - absl::optional> data = base::Base64Decode( + std::optional> data = base::Base64Decode( "afxiYbRCtH5HgLYFzytARQOXmFT6HhvNzk2Baxua+" "lM2kEWUG3BArj8SJRSnd1faFt2Tm0Ey/" "qtGnPdOOlQlugEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" diff --git a/browser/brave_wallet/blockchain_images_source.cc b/browser/brave_wallet/blockchain_images_source.cc index 1ec2a5959bb..1856d5024c4 100644 --- a/browser/brave_wallet/blockchain_images_source.cc +++ b/browser/brave_wallet/blockchain_images_source.cc @@ -5,6 +5,7 @@ #include "brave/browser/brave_wallet/blockchain_images_source.h" +#include #include #include "base/files/file_path.h" @@ -21,10 +22,10 @@ namespace brave_wallet { namespace { -absl::optional ReadFileToString(const base::FilePath& path) { +std::optional ReadFileToString(const base::FilePath& path) { std::string contents; if (!base::ReadFileToString(path, &contents)) { - return absl::optional(); + return std::optional(); } return contents; } @@ -48,7 +49,7 @@ void BlockchainImagesSource::StartDataRequest( const std::string path = URLDataSource::URLToRequestPath(url); - absl::optional version = + std::optional version = brave_wallet::GetLastInstalledWalletVersion(); if (!version) { scoped_refptr bytes; @@ -68,7 +69,7 @@ void BlockchainImagesSource::StartDataRequest( } void BlockchainImagesSource::OnGotImageFile(GotDataCallback callback, - absl::optional input) { + std::optional input) { scoped_refptr bytes; if (!input) { std::move(callback).Run(std::move(bytes)); diff --git a/browser/brave_wallet/blockchain_images_source.h b/browser/brave_wallet/blockchain_images_source.h index b0cc6292f95..b27845d7005 100644 --- a/browser/brave_wallet/blockchain_images_source.h +++ b/browser/brave_wallet/blockchain_images_source.h @@ -6,12 +6,12 @@ #ifndef BRAVE_BROWSER_BRAVE_WALLET_BLOCKCHAIN_IMAGES_SOURCE_H_ #define BRAVE_BROWSER_BRAVE_WALLET_BLOCKCHAIN_IMAGES_SOURCE_H_ +#include #include #include "base/gtest_prod_util.h" #include "base/memory/weak_ptr.h" #include "content/public/browser/url_data_source.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace base { class FilePath; @@ -43,7 +43,7 @@ class BlockchainImagesSource : public content::URLDataSource { bool AllowCaching() override; void OnGotImageFile(GotDataCallback callback, - absl::optional input); + std::optional input); base::FilePath base_path_; base::WeakPtrFactory weak_factory_; diff --git a/browser/brave_wallet/brave_wallet_ethereum_chain_browsertest.cc b/browser/brave_wallet/brave_wallet_ethereum_chain_browsertest.cc index 512d576f4e2..e6b158fd56c 100644 --- a/browser/brave_wallet/brave_wallet_ethereum_chain_browsertest.cc +++ b/browser/brave_wallet/brave_wallet_ethereum_chain_browsertest.cc @@ -4,6 +4,7 @@ * You can obtain one at https://mozilla.org/MPL/2.0/. */ #include +#include #include "base/path_service.h" #include "base/test/bind.h" @@ -128,7 +129,7 @@ class TestJsonRpcServiceObserver void ChainChangedEvent(const std::string& chain_id, brave_wallet::mojom::CoinType coin, - const absl::optional<::url::Origin>& origin) override { + const std::optional<::url::Origin>& origin) override { chain_changed_called_ = true; EXPECT_EQ(chain_id, expected_chain_id_); EXPECT_EQ(coin, expected_coin_); diff --git a/browser/brave_wallet/brave_wallet_event_emitter_browsertest.cc b/browser/brave_wallet/brave_wallet_event_emitter_browsertest.cc index 96c863de6f4..795c31b2f71 100644 --- a/browser/brave_wallet/brave_wallet_event_emitter_browsertest.cc +++ b/browser/brave_wallet/brave_wallet_event_emitter_browsertest.cc @@ -4,6 +4,7 @@ * You can obtain one at https://mozilla.org/MPL/2.0/. */ #include +#include #include "base/path_service.h" #include "base/test/bind.h" @@ -169,7 +170,7 @@ IN_PROC_BROWSER_TEST_F(BraveWalletEventEmitterTest, browser()->tab_strip_model()->GetActiveWebContents(); auto service = GetJsonRpcService(); service->SetNetwork(brave_wallet::mojom::kGoerliChainId, - brave_wallet::mojom::CoinType::ETH, absl::nullopt, + brave_wallet::mojom::CoinType::ETH, std::nullopt, base::DoNothing()); auto result_first = diff --git a/browser/brave_wallet/brave_wallet_provider_delegate_impl.cc b/browser/brave_wallet/brave_wallet_provider_delegate_impl.cc index 6b3caf30006..9af1a27e1a7 100644 --- a/browser/brave_wallet/brave_wallet_provider_delegate_impl.cc +++ b/browser/brave_wallet/brave_wallet_provider_delegate_impl.cc @@ -5,6 +5,7 @@ #include "brave/browser/brave_wallet/brave_wallet_provider_delegate_impl.h" +#include #include #include #include @@ -50,7 +51,7 @@ void OnRequestPermissions( // The responses array will be empty if operation failed. if (responses.empty()) { std::move(callback).Run(mojom::RequestPermissionsError::kInternal, - absl::nullopt); + std::nullopt); } else { std::move(callback).Run(mojom::RequestPermissionsError::kNone, granted_accounts); @@ -97,7 +98,7 @@ void BraveWalletProviderDelegateImpl::ShowAccountCreation( ::brave_wallet::ShowAccountCreation(web_contents_, type); } -absl::optional> +std::optional> BraveWalletProviderDelegateImpl::GetAllowedAccounts( mojom::CoinType type, const std::vector& accounts) { @@ -107,7 +108,7 @@ BraveWalletProviderDelegateImpl::GetAllowedAccounts( auto permission = CoinTypeToPermissionType(type); if (!permission) { - return absl::nullopt; + return std::nullopt; } return permissions::BraveWalletPermissionContext::GetAllowedAccounts( @@ -127,7 +128,7 @@ void BraveWalletProviderDelegateImpl::RequestPermissions( auto permission = CoinTypeToPermissionType(type); if (!request_type || !permission) { std::move(callback).Run(mojom::RequestPermissionsError::kInternal, - absl::nullopt); + std::nullopt); return; } // Check if there's already a permission request in progress @@ -135,7 +136,7 @@ void BraveWalletProviderDelegateImpl::RequestPermissions( if (rfh && permissions::BraveWalletPermissionContext::HasRequestsInProgress( rfh, *request_type)) { std::move(callback).Run(mojom::RequestPermissionsError::kRequestInProgress, - absl::nullopt); + std::nullopt); return; } diff --git a/browser/brave_wallet/brave_wallet_provider_delegate_impl.h b/browser/brave_wallet/brave_wallet_provider_delegate_impl.h index 27eeca6c2f9..044a52e939f 100644 --- a/browser/brave_wallet/brave_wallet_provider_delegate_impl.h +++ b/browser/brave_wallet/brave_wallet_provider_delegate_impl.h @@ -6,6 +6,7 @@ #ifndef BRAVE_BROWSER_BRAVE_WALLET_BRAVE_WALLET_PROVIDER_DELEGATE_IMPL_H_ #define BRAVE_BROWSER_BRAVE_WALLET_BRAVE_WALLET_PROVIDER_DELEGATE_IMPL_H_ +#include #include #include @@ -42,7 +43,7 @@ class BraveWalletProviderDelegateImpl : public BraveWalletProviderDelegate, void ShowWalletOnboarding() override; void ShowAccountCreation(mojom::CoinType type) override; url::Origin GetOrigin() const override; - absl::optional> GetAllowedAccounts( + std::optional> GetAllowedAccounts( mojom::CoinType type, const std::vector& accounts) override; void RequestPermissions(mojom::CoinType type, diff --git a/browser/brave_wallet/brave_wallet_service_delegate_impl.cc b/browser/brave_wallet/brave_wallet_service_delegate_impl.cc index 40db3877396..3ebb44bd619 100644 --- a/browser/brave_wallet/brave_wallet_service_delegate_impl.cc +++ b/browser/brave_wallet/brave_wallet_service_delegate_impl.cc @@ -5,6 +5,7 @@ #include "brave/browser/brave_wallet/brave_wallet_service_delegate_impl.h" +#include #include #include "brave/components/brave_wallet/browser/brave_wallet_utils.h" @@ -175,14 +176,14 @@ void BraveWalletServiceDelegateImpl::FireActiveOriginChanged() { } } -absl::optional +std::optional BraveWalletServiceDelegateImpl::GetActiveOriginInternal() { content::WebContents* contents = GetActiveWebContents(); return contents ? contents->GetPrimaryMainFrame()->GetLastCommittedOrigin() - : absl::optional(); + : std::optional(); } -absl::optional BraveWalletServiceDelegateImpl::GetActiveOrigin() { +std::optional BraveWalletServiceDelegateImpl::GetActiveOrigin() { return GetActiveOriginInternal(); } diff --git a/browser/brave_wallet/brave_wallet_service_delegate_impl.h b/browser/brave_wallet/brave_wallet_service_delegate_impl.h index 37972ff0ebb..538e4c4e065 100644 --- a/browser/brave_wallet/brave_wallet_service_delegate_impl.h +++ b/browser/brave_wallet/brave_wallet_service_delegate_impl.h @@ -7,6 +7,7 @@ #define BRAVE_BROWSER_BRAVE_WALLET_BRAVE_WALLET_SERVICE_DELEGATE_IMPL_H_ #include +#include #include #include "base/containers/flat_map.h" @@ -51,7 +52,7 @@ class BraveWalletServiceDelegateImpl : public BraveWalletServiceDelegateBase, const std::string& password, GetImportInfoCallback callback) override; - absl::optional GetActiveOrigin() override; + std::optional GetActiveOrigin() override; void ClearWalletUIStoragePartition() override; @@ -81,7 +82,7 @@ class BraveWalletServiceDelegateImpl : public BraveWalletServiceDelegateBase, GetImportInfoCallback callback, bool init_success); - absl::optional GetActiveOriginInternal(); + std::optional GetActiveOriginInternal(); void FireActiveOriginChanged(); base::flat_map #include #include @@ -85,11 +86,11 @@ void BraveWalletServiceDelegateImpl::ResetWebSitePermission( *type, context_, formed_website)); } -absl::optional BraveWalletServiceDelegateImpl::GetActiveOrigin() { +std::optional BraveWalletServiceDelegateImpl::GetActiveOrigin() { content::WebContents* contents = GetActiveWebContents(context_); auto origin = contents ? contents->GetPrimaryMainFrame()->GetLastCommittedOrigin() - : absl::optional(); + : std::optional(); return origin; } diff --git a/browser/brave_wallet/brave_wallet_service_delegate_impl_android.h b/browser/brave_wallet/brave_wallet_service_delegate_impl_android.h index 34aaca98872..4c17e16da70 100644 --- a/browser/brave_wallet/brave_wallet_service_delegate_impl_android.h +++ b/browser/brave_wallet/brave_wallet_service_delegate_impl_android.h @@ -7,12 +7,12 @@ #define BRAVE_BROWSER_BRAVE_WALLET_BRAVE_WALLET_SERVICE_DELEGATE_IMPL_ANDROID_H_ #include +#include #include #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" - #include "brave/browser/brave_wallet/brave_wallet_service_delegate_base.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" @@ -42,7 +42,7 @@ class BraveWalletServiceDelegateImpl : public BraveWalletServiceDelegateBase { void ResetWebSitePermission(mojom::CoinType coin, const std::string& formed_website, ResetWebSitePermissionCallback callback) override; - absl::optional GetActiveOrigin() override; + std::optional GetActiveOrigin() override; private: base::ObserverList observer_list_; diff --git a/browser/brave_wallet/brave_wallet_service_unittest.cc b/browser/brave_wallet/brave_wallet_service_unittest.cc index 402c6e77cd8..07e6a9d0c1f 100644 --- a/browser/brave_wallet/brave_wallet_service_unittest.cc +++ b/browser/brave_wallet/brave_wallet_service_unittest.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_wallet/browser/brave_wallet_service.h" #include +#include #include #include @@ -667,8 +668,7 @@ class BraveWalletServiceUnitTest : public testing::Test { service_->OnGetImportInfo( new_password, base::BindLambdaForTesting( - [&](bool success, - const absl::optional& error_message) { + [&](bool success, const std::optional& error_message) { *success_out = success; if (error_message) { *error_message_out = *error_message; @@ -765,7 +765,7 @@ class BraveWalletServiceUnitTest : public testing::Test { if (run_switch_network) { json_rpc_service_->SetNetwork(mojom::kGoerliChainId, mojom::CoinType::ETH, - absl::nullopt); + std::nullopt); } else { service_->NotifyAddSuggestTokenRequestsProcessed( approve, {suggested_token->contract_address}); @@ -805,15 +805,15 @@ class BraveWalletServiceUnitTest : public testing::Test { const std::string& account_address, const std::vector& chain_ids, mojom::CoinType coin, - absl::optional cursor, + std::optional cursor, const std::vector& expected_nfts, - absl::optional expected_cursor) { + std::optional expected_cursor) { base::RunLoop run_loop; service_->GetSimpleHashSpamNFTs( account_address, chain_ids, coin, cursor, base::BindLambdaForTesting( [&](std::vector nfts, - const absl::optional& returned_cursor) { + const std::optional& returned_cursor) { ASSERT_EQ(nfts.size(), expected_nfts.size()); EXPECT_EQ(returned_cursor, expected_cursor); EXPECT_EQ(nfts, expected_nfts); @@ -1391,7 +1391,7 @@ TEST_F(BraveWalletServiceUnitTest, SetAssetSpamStatus) { } TEST_F(BraveWalletServiceUnitTest, GetChecksumAddress) { - absl::optional addr = service_->GetChecksumAddress( + std::optional addr = service_->GetChecksumAddress( "0x06012c8cf97bead5deae237070f9587f8e7a266d", "0x1"); EXPECT_EQ(addr.value(), "0x06012c8cf97BEaD5deAe237070F9587f8E7A266d"); @@ -2426,7 +2426,7 @@ TEST_F(BraveWalletServiceUnitTest, SignMessageHardware) { std::move(request1), base::BindLambdaForTesting([&](bool approved, mojom::ByteArrayStringUnionPtr signature, - const absl::optional& error) { + const std::optional& error) { ASSERT_TRUE(approved); ASSERT_TRUE(signature->is_str()); EXPECT_EQ(signature->get_str(), expected_signature); @@ -2436,12 +2436,12 @@ TEST_F(BraveWalletServiceUnitTest, SignMessageHardware) { EXPECT_EQ(GetPendingSignMessageRequests().size(), 1u); service_->NotifySignMessageRequestProcessed( true, 1, mojom::ByteArrayStringUnion::NewStr(expected_signature), - absl::nullopt); + std::nullopt); ASSERT_TRUE(callback_is_called); ASSERT_TRUE(GetPendingSignMessageRequests().empty()); service_->NotifySignMessageRequestProcessed( true, 1, mojom::ByteArrayStringUnion::NewStr(expected_signature), - absl::nullopt); + std::nullopt); ASSERT_TRUE(GetPendingSignMessageRequests().empty()); callback_is_called = false; std::string expected_error = "error"; @@ -2454,7 +2454,7 @@ TEST_F(BraveWalletServiceUnitTest, SignMessageHardware) { std::move(request2), base::BindLambdaForTesting([&](bool approved, mojom::ByteArrayStringUnionPtr signature, - const absl::optional& error) { + const std::optional& error) { ASSERT_FALSE(approved); ASSERT_TRUE(signature->is_str()); EXPECT_EQ(signature->get_str(), expected_signature); @@ -2489,17 +2489,17 @@ TEST_F(BraveWalletServiceUnitTest, SignMessage) { std::move(request1), base::BindLambdaForTesting([&](bool approved, mojom::ByteArrayStringUnionPtr signature, - const absl::optional& error) { + const std::optional& error) { ASSERT_TRUE(approved); EXPECT_FALSE(signature); EXPECT_FALSE(error); callback_is_called = true; })); EXPECT_EQ(GetPendingSignMessageRequests().size(), 1u); - service_->NotifySignMessageRequestProcessed(true, 1, nullptr, absl::nullopt); + service_->NotifySignMessageRequestProcessed(true, 1, nullptr, std::nullopt); ASSERT_TRUE(callback_is_called); ASSERT_TRUE(GetPendingSignMessageRequests().empty()); - service_->NotifySignMessageRequestProcessed(true, 1, nullptr, absl::nullopt); + service_->NotifySignMessageRequestProcessed(true, 1, nullptr, std::nullopt); ASSERT_TRUE(GetPendingSignMessageRequests().empty()); callback_is_called = false; std::string expected_error = "error"; @@ -2512,14 +2512,14 @@ TEST_F(BraveWalletServiceUnitTest, SignMessage) { std::move(request2), base::BindLambdaForTesting([&](bool approved, mojom::ByteArrayStringUnionPtr signature, - const absl::optional& error) { + const std::optional& error) { ASSERT_FALSE(approved); EXPECT_FALSE(signature); EXPECT_FALSE(error); callback_is_called = true; })); EXPECT_EQ(GetPendingSignMessageRequests().size(), 1u); - service_->NotifySignMessageRequestProcessed(false, 2, nullptr, absl::nullopt); + service_->NotifySignMessageRequestProcessed(false, 2, nullptr, std::nullopt); ASSERT_TRUE(callback_is_called); ASSERT_TRUE(GetPendingSignMessageRequests().empty()); } @@ -2528,8 +2528,7 @@ TEST_F(BraveWalletServiceUnitTest, AddSuggestToken) { std::vector chain_ids = {mojom::kMainnetChainId, mojom::kGoerliChainId}; for (const std::string& chain_id : chain_ids) { - json_rpc_service_->SetNetwork(chain_id, mojom::CoinType::ETH, - absl::nullopt); + json_rpc_service_->SetNetwork(chain_id, mojom::CoinType::ETH, std::nullopt); mojom::BlockchainTokenPtr usdc_from_blockchain_registry = mojom::BlockchainToken::New( "0x6B175474E89094C44Da98b954EedeAC495271d0F", "USD Coin", @@ -2729,7 +2728,7 @@ TEST_F(BraveWalletServiceUnitTest, Reset) { service_->AddSignMessageRequest( std::move(request1), base::BindLambdaForTesting([](bool, mojom::ByteArrayStringUnionPtr, - const absl::optional&) {})); + const std::optional&) {})); mojom::BlockchainTokenPtr custom_token = mojom::BlockchainToken::New( "0x6b175474e89094C44Da98b954eEdeAC495271d1e", "COLOR", "", true, false, false, false, false, "COLOR", 18, true, "", "", "0x1", @@ -2820,13 +2819,13 @@ TEST_F(BraveWalletServiceUnitTest, GetUserAssetAddress) { EXPECT_EQ(BraveWalletService::GetUserAssetAddress("not_base58_encoded_string", mojom::CoinType::SOL, mojom::kSolanaMainnet), - absl::nullopt); + std::nullopt); // FIL EXPECT_EQ(BraveWalletService::GetUserAssetAddress( "f1h4n7rphclbmwyjcp6jrdiwlfcuwbroxy3jvg33q", mojom::CoinType::FIL, "f"), - absl::nullopt); + std::nullopt); } TEST_F(BraveWalletServiceUnitTest, NewUserReturningMetric) { @@ -3016,7 +3015,7 @@ TEST_F(BraveWalletServiceUnitTest, GetSimpleHashSpamNFTs) { // no NFTs should be discovered GetSimpleHashSpamNFTs("0x0000000000000000000000000000000000000000", {mojom::kMainnetChainId}, mojom::CoinType::ETH, - absl::nullopt, expected_nfts, absl::nullopt); + std::nullopt, expected_nfts, std::nullopt); // Enable NFT discovery then try again, only the spam NFT should be discovered SetInterceptors(responses); @@ -3034,7 +3033,7 @@ TEST_F(BraveWalletServiceUnitTest, GetSimpleHashSpamNFTs) { expected_nfts.push_back(std::move(nft1)); GetSimpleHashSpamNFTs("0x0000000000000000000000000000000000000000", {mojom::kMainnetChainId}, mojom::CoinType::ETH, - absl::nullopt, expected_nfts, absl::nullopt); + std::nullopt, expected_nfts, std::nullopt); } TEST_F(BraveWalletServiceUnitTest, EnsureSelectedAccountForChain) { @@ -3154,8 +3153,8 @@ TEST_F(BraveWalletServiceUnitTest, GenerateReceiveAddress_EthFilSol) { base::MockCallback callback; - auto expected_address = absl::optional(acc->address); - EXPECT_CALL(callback, Run(expected_address, absl::optional())) + auto expected_address = std::optional(acc->address); + EXPECT_CALL(callback, Run(expected_address, std::optional())) .Times(2); service_->GenerateReceiveAddress(acc->account_id.Clone(), callback.Get()); service_->GenerateReceiveAddress(acc->account_id.Clone(), callback.Get()); @@ -3172,19 +3171,19 @@ TEST_F(BraveWalletServiceUnitTest, GenerateReceiveAddress_Btc) { base::MockCallback callback; - absl::optional expected_address = + std::optional expected_address = keyring_service_ ->GetBitcoinAddress(btc_account->account_id, mojom::BitcoinKeyId::New(0, 1)) ->address_string; - EXPECT_CALL(callback, Run(expected_address, absl::optional())); + EXPECT_CALL(callback, Run(expected_address, std::optional())); service_->GenerateReceiveAddress(btc_account->account_id.Clone(), callback.Get()); base::RunLoop().RunUntilIdle(); testing::Mock::VerifyAndClearExpectations(&callback); - EXPECT_CALL(callback, Run(expected_address, absl::optional())); + EXPECT_CALL(callback, Run(expected_address, std::optional())); service_->GenerateReceiveAddress(btc_account->account_id.Clone(), callback.Get()); base::RunLoop().RunUntilIdle(); @@ -3197,7 +3196,7 @@ TEST_F(BraveWalletServiceUnitTest, GenerateReceiveAddress_Btc) { ->GetBitcoinAddress(btc_account->account_id, mojom::BitcoinKeyId::New(0, 2)) ->address_string; - EXPECT_CALL(callback, Run(expected_address, absl::optional())); + EXPECT_CALL(callback, Run(expected_address, std::optional())); service_->GenerateReceiveAddress(btc_account->account_id.Clone(), callback.Get()); base::RunLoop().RunUntilIdle(); diff --git a/browser/brave_wallet/brave_wallet_sign_message_browsertest.cc b/browser/brave_wallet/brave_wallet_sign_message_browsertest.cc index 60cf2207328..9d4abe40183 100644 --- a/browser/brave_wallet/brave_wallet_sign_message_browsertest.cc +++ b/browser/brave_wallet/brave_wallet_sign_message_browsertest.cc @@ -3,6 +3,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include + #include "base/command_line.h" #include "base/feature_list.h" #include "base/memory/raw_ptr.h" @@ -173,7 +175,7 @@ IN_PROC_BROWSER_TEST_F(BraveWalletSignMessageBrowserTest, UserApprovedRequest) { base::RunLoop().RunUntilIdle(); EXPECT_TRUE(WaitForWalletBubble(web_contents())); brave_wallet_service_->NotifySignMessageRequestProcessed( - true, request_index++, nullptr, absl::nullopt); + true, request_index++, nullptr, std::nullopt); EXPECT_EQ(EvalJs(web_contents(), "getSignMessageResult()").ExtractString(), "0x670651c072cac2a3f93cb862a17378f6849c66b4516e5d5a30210868a2840e" "2a6a345a" @@ -201,7 +203,7 @@ IN_PROC_BROWSER_TEST_F(BraveWalletSignMessageBrowserTest, UserRejectedRequest) { base::RunLoop().RunUntilIdle(); EXPECT_TRUE(WaitForWalletBubble(web_contents())); brave_wallet_service_->NotifySignMessageRequestProcessed( - false, request_index++, nullptr, absl::nullopt); + false, request_index++, nullptr, std::nullopt); EXPECT_EQ(EvalJs(web_contents(), "getSignMessageResult()").ExtractString(), l10n_util::GetStringUTF8(IDS_WALLET_USER_REJECTED_REQUEST)); } @@ -334,7 +336,7 @@ IN_PROC_BROWSER_TEST_F(BraveWalletSignMessageBrowserTest, SIWE) { base::RunLoop().RunUntilIdle(); EXPECT_TRUE(WaitForWalletBubble(web_contents())); brave_wallet_service_->NotifySignMessageRequestProcessed( - true, request_index++, nullptr, absl::nullopt); + true, request_index++, nullptr, std::nullopt); // port is dynamic EXPECT_TRUE(base::StartsWith( EvalJs(web_contents(), "getSignMessageResult()").ExtractString(), diff --git a/browser/brave_wallet/eth_allowance_manager_unittest.cc b/browser/brave_wallet/eth_allowance_manager_unittest.cc index 6a7356d075d..1f3678b0259 100644 --- a/browser/brave_wallet/eth_allowance_manager_unittest.cc +++ b/browser/brave_wallet/eth_allowance_manager_unittest.cc @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -164,7 +165,7 @@ using OnDiscoverEthAllowancesCompletedValidation = base::RepeatingCallback&)>; base::Value::Dict ParseTestJson(const std::string_view json) { - absl::optional potential_response_dict_val = + std::optional potential_response_dict_val = base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS | base::JSONParserOptions::JSON_PARSE_RFC); return std::move(potential_response_dict_val.value().GetDict()); @@ -246,7 +247,7 @@ class EthAllowanceManagerUnitTest : public testing::Test { } void CreateCachedAllowancesPrefs(const std::string& json) { - absl::optional allowance_chache_json_value = + std::optional allowance_chache_json_value = base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS | base::JSONParserOptions::JSON_PARSE_RFC); @@ -333,7 +334,7 @@ class EthAllowanceManagerUnitTest : public testing::Test { get_block_response_str); } else if (request.url.spec() == url.spec() && header_value == "eth_getLogs") { - absl::optional request_dict_val = + std::optional request_dict_val = base::JSONReader::Read( request.request_body->elements() ->at(0) @@ -363,7 +364,7 @@ class EthAllowanceManagerUnitTest : public testing::Test { const auto request_approver_address = (*topics_ptr)[1].GetString(); - absl::optional potential_response_dict_val = + std::optional potential_response_dict_val = base::JSONReader::Read( potential_response, base::JSON_PARSE_CHROMIUM_EXTENSIONS | diff --git a/browser/brave_wallet/ethereum_provider_impl_unittest.cc b/browser/brave_wallet/ethereum_provider_impl_unittest.cc index 142bf062850..35322a99819 100644 --- a/browser/brave_wallet/ethereum_provider_impl_unittest.cc +++ b/browser/brave_wallet/ethereum_provider_impl_unittest.cc @@ -7,6 +7,7 @@ #include #include +#include #include #include #include @@ -64,7 +65,6 @@ #include "services/network/test/test_url_loader_factory.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/base/l10n/l10n_util.h" #include "url/origin.h" @@ -122,7 +122,7 @@ std::vector DecodeHexHash(const std::string& hash_hex) { return hash; } -absl::optional ToValue(const network::ResourceRequest& request) { +std::optional ToValue(const network::ResourceRequest& request) { std::string_view request_string(request.request_body->elements() ->at(0) .As() @@ -226,7 +226,7 @@ class EthereumProviderImplUnitTest : public testing::Test { JsonRpcServiceFactory::GetServiceForContext(browser_context()); json_rpc_service_->SetAPIRequestHelperForTesting( shared_url_loader_factory_); - SetNetwork(mojom::kMainnetChainId, absl::nullopt); + SetNetwork(mojom::kMainnetChainId, std::nullopt); keyring_service_ = KeyringServiceFactory::GetServiceForContext(browser_context()); asset_ratio_service_ = @@ -270,7 +270,7 @@ class EthereumProviderImplUnitTest : public testing::Test { } void SetNetwork(const std::string& chain_id, - const absl::optional<::url::Origin>& origin) { + const std::optional<::url::Origin>& origin) { EXPECT_TRUE( json_rpc_service_->SetNetwork(chain_id, mojom::CoinType::ETH, origin)); } @@ -545,7 +545,7 @@ class EthereumProviderImplUnitTest : public testing::Test { run_loop.Run(); } - void SignMessage(absl::optional user_approved, + void SignMessage(std::optional user_approved, const std::string& address, const std::string& message, std::string* signature_out, @@ -576,7 +576,7 @@ class EthereumProviderImplUnitTest : public testing::Test { if (user_approved) { brave_wallet_service_->NotifySignMessageRequestProcessed( *user_approved, brave_wallet_service_->sign_message_id_ - 1, nullptr, - absl::nullopt); + std::nullopt); } run_loop.Run(); } @@ -609,7 +609,7 @@ class EthereumProviderImplUnitTest : public testing::Test { run_loop.Run(); } - void SignTypedMessage(absl::optional user_approved, + void SignTypedMessage(std::optional user_approved, const std::string& address, const std::string& message, const std::vector& domain_hash, @@ -645,7 +645,7 @@ class EthereumProviderImplUnitTest : public testing::Test { if (user_approved) { brave_wallet_service_->NotifySignMessageRequestProcessed( *user_approved, brave_wallet_service_->sign_message_id_ - 1, nullptr, - absl::nullopt); + std::nullopt); } run_loop.Run(); } @@ -786,7 +786,7 @@ class EthereumProviderImplUnitTest : public testing::Test { } void SwitchEthereumChain(const std::string& chain_id, - absl::optional user_approved, + std::optional user_approved, mojom::ProviderError* error_out, std::string* error_message_out) { base::RunLoop run_loop; @@ -1086,7 +1086,7 @@ TEST_F(EthereumProviderImplUnitTest, AddAndApproveTransaction) { "\"gas\":\"0x0974\",\"to\":" "\"0xbe862ad9abfe6f22bcb087716c7d89a26051f74c\"," "\"value\":\"0x016345785d8a0000\"}]}"; - absl::optional response = base::JSONReader::Read( + std::optional response = base::JSONReader::Read( normalized_json_request, base::JSON_PARSE_CHROMIUM_EXTENSIONS | base::JSONParserOptions::JSON_PARSE_RFC); provider()->Request( @@ -1163,7 +1163,7 @@ TEST_F(EthereumProviderImplUnitTest, AddAndApproveTransactionError) { "\",\"gasPrice\":\"0x09184e72a000\"," "\"gas\":\"0x0974\",\"to\":\"0xbe8\"," "\"value\":\"0x016345785d8a0000\"}]}"; - absl::optional response = base::JSONReader::Read( + std::optional response = base::JSONReader::Read( normalized_json_request, base::JSON_PARSE_CHROMIUM_EXTENSIONS | base::JSONParserOptions::JSON_PARSE_RFC); provider()->Request( @@ -1202,7 +1202,7 @@ TEST_F(EthereumProviderImplUnitTest, AddAndApproveTransactionNoPermission) { "\"gas\":\"0x0974\",\"to\":" "\"0xbe862ad9abfe6f22bcb087716c7d89a26051f74c\"," "\"value\":\"0x016345785d8a0000\"}]}"; - absl::optional response = base::JSONReader::Read( + std::optional response = base::JSONReader::Read( normalized_json_request, base::JSON_PARSE_CHROMIUM_EXTENSIONS | base::JSONParserOptions::JSON_PARSE_RFC); provider()->Request( @@ -1244,7 +1244,7 @@ TEST_F(EthereumProviderImplUnitTest, AddAndApprove1559Transaction) { "\",\"maxFeePerGas\":\"0x1\",\"maxPriorityFeePerGas\":\"0x1\"," "\"gas\":\"0x1\",\"to\":\"0xbe862ad9abfe6f22bcb087716c7d89a26051f74c\"," "\"value\":\"0x00\"}]}"; - absl::optional response = base::JSONReader::Read( + std::optional response = base::JSONReader::Read( normalized_json_request, base::JSON_PARSE_CHROMIUM_EXTENSIONS | base::JSONParserOptions::JSON_PARSE_RFC); provider()->Request( @@ -1319,7 +1319,7 @@ TEST_F(EthereumProviderImplUnitTest, AddAndApprove1559TransactionNoChainId) { "\",\"maxFeePerGas\":\"0x1\",\"maxPriorityFeePerGas\":\"0x1\"," "\"gas\":\"0x1\",\"to\":\"0xbe862ad9abfe6f22bcb087716c7d89a26051f74c\"," "\"value\":\"0x00\"}]}"; - absl::optional response = base::JSONReader::Read( + std::optional response = base::JSONReader::Read( normalized_json_request, base::JSON_PARSE_CHROMIUM_EXTENSIONS | base::JSONParserOptions::JSON_PARSE_RFC); provider()->Request( @@ -1389,7 +1389,7 @@ TEST_F(EthereumProviderImplUnitTest, AddAndApprove1559TransactionError) { "\"gasPrice\":\"0x01\", " "\"gas\":\"0x00\",\"to\":\"0xbe862ad9abfe6f22bcb087716c7d89a26051f74c\"," "\"value\":\"0x00\"}]}"; - absl::optional response = base::JSONReader::Read( + std::optional response = base::JSONReader::Read( normalized_json_request, base::JSON_PARSE_CHROMIUM_EXTENSIONS | base::JSONParserOptions::JSON_PARSE_RFC); provider()->Request( @@ -1427,7 +1427,7 @@ TEST_F(EthereumProviderImplUnitTest, AddAndApprove1559TransactionNoPermission) { "\",\"maxFeePerGas\":\"0x0\",\"maxPriorityFeePerGas\":\"0x0\"," "\"gas\":\"0x00\",\"to\":\"0xbe862ad9abfe6f22bcb087716c7d89a26051f74c\"," "\"value\":\"0x00\"}]}"; - absl::optional response = base::JSONReader::Read( + std::optional response = base::JSONReader::Read( normalized_json_request, base::JSON_PARSE_CHROMIUM_EXTENSIONS | base::JSONParserOptions::JSON_PARSE_RFC); provider()->Request( @@ -1661,28 +1661,28 @@ TEST_F(EthereumProviderImplUnitTest, SignMessage) { std::string signature; mojom::ProviderError error = mojom::ProviderError::kUnknown; std::string error_message; - SignMessage(absl::nullopt, "1234", message, &signature, &error, + SignMessage(std::nullopt, "1234", message, &signature, &error, &error_message); EXPECT_TRUE(signature.empty()); EXPECT_EQ(error, mojom::ProviderError::kInvalidParams); EXPECT_EQ(error_message, l10n_util::GetStringUTF8(IDS_WALLET_INVALID_PARAMETERS)); - SignMessage(absl::nullopt, "0x12345678", message, &signature, &error, + SignMessage(std::nullopt, "0x12345678", message, &signature, &error, &error_message); EXPECT_TRUE(signature.empty()); EXPECT_EQ(error, mojom::ProviderError::kInvalidParams); EXPECT_EQ(error_message, l10n_util::GetStringUTF8(IDS_WALLET_INVALID_PARAMETERS)); - SignMessage(absl::nullopt, GetAccountUtils().EthUnkownAccount()->address, + SignMessage(std::nullopt, GetAccountUtils().EthUnkownAccount()->address, message, &signature, &error, &error_message); EXPECT_TRUE(signature.empty()); EXPECT_EQ(error, mojom::ProviderError::kUnauthorized); EXPECT_EQ(error_message, l10n_util::GetStringUTF8(IDS_WALLET_NOT_AUTHED)); // No permission - SignMessage(absl::nullopt, account_0->address, message, &signature, &error, + SignMessage(std::nullopt, account_0->address, message, &signature, &error, &error_message); EXPECT_TRUE(signature.empty()); EXPECT_EQ(error, mojom::ProviderError::kUnauthorized); @@ -1707,7 +1707,7 @@ TEST_F(EthereumProviderImplUnitTest, SignMessage) { // nullopt for the first param here because we don't AddSignMessageRequest // whent here are no accounts returned. - SignMessage(absl::nullopt, account_0->address, message, &signature, &error, + SignMessage(std::nullopt, account_0->address, message, &signature, &error, &error_message); EXPECT_TRUE(signature.empty()); EXPECT_EQ(error, mojom::ProviderError::kUnauthorized); @@ -1737,7 +1737,7 @@ TEST_F(EthereumProviderImplUnitTest, SigninWithEthereumError) { std::string network; mojom::SignMessageErrorType siwe_err_type; std::string siwe_err_msg; - absl::optional chain_id; + std::optional chain_id; mojom::ProviderError provider_err; std::string provider_err_msg; } cases[]{ @@ -1757,7 +1757,7 @@ TEST_F(EthereumProviderImplUnitTest, SigninWithEthereumError) { IDS_BRAVE_WALLET_SIGN_MESSAGE_MISMATCH_ERR, l10n_util::GetStringUTF16(IDS_BRAVE_WALLET_ACCOUNT), base::ASCIIToUTF16(account_1->address)), - absl::nullopt, mojom::ProviderError::kInternalError, + std::nullopt, mojom::ProviderError::kInternalError, l10n_util::GetStringFUTF8(IDS_BRAVE_WALLET_SIGN_MESSAGE_ACCOUNT_MISMATCH, base::ASCIIToUTF16(account_1->address))}, {"https://example.com", account_0->address, "https://brave.com/login", @@ -1766,7 +1766,7 @@ TEST_F(EthereumProviderImplUnitTest, SigninWithEthereumError) { IDS_BRAVE_WALLET_SIGN_MESSAGE_MISMATCH_ERR, l10n_util::GetStringUTF16(IDS_BRAVE_WALLET_DOMAIN), u"https://example.com"), - absl::nullopt, mojom::ProviderError::kInternalError, + std::nullopt, mojom::ProviderError::kInternalError, l10n_util::GetStringFUTF8(IDS_BRAVE_WALLET_SIGN_MESSAGE_DOMAIN_MISMATCH, u"https://example.com")}, {"https://brave.com", account_0->address, "https://example.com/login", @@ -1775,7 +1775,7 @@ TEST_F(EthereumProviderImplUnitTest, SigninWithEthereumError) { IDS_BRAVE_WALLET_SIGN_MESSAGE_MISMATCH_ERR, l10n_util::GetStringUTF16(IDS_BRAVE_WALLET_DOMAIN), u"https://example.com/login"), - absl::nullopt, mojom::ProviderError::kInternalError, + std::nullopt, mojom::ProviderError::kInternalError, l10n_util::GetStringFUTF8(IDS_BRAVE_WALLET_SIGN_MESSAGE_DOMAIN_MISMATCH, u"https://example.com/login")}, }; @@ -1860,7 +1860,7 @@ TEST_F(EthereumProviderImplUnitTest, RecoverAddress) { TEST_F(EthereumProviderImplUnitTest, SignTypedMessage) { EXPECT_EQ( - json_rpc_service()->GetChainIdSync(mojom::CoinType::ETH, absl::nullopt), + json_rpc_service()->GetChainIdSync(mojom::CoinType::ETH, std::nullopt), "0x1"); CreateWallet(); auto account_0 = GetAccountUtils().EnsureEthAccount(0); @@ -1873,14 +1873,14 @@ TEST_F(EthereumProviderImplUnitTest, SignTypedMessage) { std::vector primary_hash = DecodeHexHash( "c52c0ee5d84264471806290a3f2c4cecfc5490626bf912d01f240d7a274b371e"); domain.Set("chainId", 1); - SignTypedMessage(absl::nullopt, "1234", "{...}", domain_hash, primary_hash, + SignTypedMessage(std::nullopt, "1234", "{...}", domain_hash, primary_hash, domain.Clone(), nullptr, &signature, &error, &error_message); EXPECT_TRUE(signature.empty()); EXPECT_EQ(error, mojom::ProviderError::kInvalidParams); EXPECT_EQ(error_message, l10n_util::GetStringUTF8(IDS_WALLET_INVALID_PARAMETERS)); - SignTypedMessage(absl::nullopt, "0x12345678", "{...}", domain_hash, + SignTypedMessage(std::nullopt, "0x12345678", "{...}", domain_hash, primary_hash, domain.Clone(), nullptr, &signature, &error, &error_message); EXPECT_TRUE(signature.empty()); @@ -1891,7 +1891,7 @@ TEST_F(EthereumProviderImplUnitTest, SignTypedMessage) { const std::string address_0 = account_0->address; // not valid domain hash - SignTypedMessage(absl::nullopt, address_0, "{...}", {}, primary_hash, + SignTypedMessage(std::nullopt, address_0, "{...}", {}, primary_hash, domain.Clone(), nullptr, &signature, &error, &error_message); EXPECT_TRUE(signature.empty()); EXPECT_EQ(error, mojom::ProviderError::kInvalidParams); @@ -1899,7 +1899,7 @@ TEST_F(EthereumProviderImplUnitTest, SignTypedMessage) { l10n_util::GetStringUTF8(IDS_WALLET_INVALID_PARAMETERS)); // not valid primary hash - SignTypedMessage(absl::nullopt, address_0, "{...}", domain_hash, {}, + SignTypedMessage(std::nullopt, address_0, "{...}", domain_hash, {}, domain.Clone(), nullptr, &signature, &error, &error_message); EXPECT_TRUE(signature.empty()); EXPECT_EQ(error, mojom::ProviderError::kInvalidParams); @@ -1909,7 +1909,7 @@ TEST_F(EthereumProviderImplUnitTest, SignTypedMessage) { domain.Set("chainId", 11155111); std::string chain_id = "0xaa36a7"; // not active network - SignTypedMessage(absl::nullopt, address_0, "{...}", domain_hash, primary_hash, + SignTypedMessage(std::nullopt, address_0, "{...}", domain_hash, primary_hash, domain.Clone(), nullptr, &signature, &error, &error_message); EXPECT_TRUE(signature.empty()); EXPECT_EQ(error, mojom::ProviderError::kInternalError); @@ -1918,7 +1918,7 @@ TEST_F(EthereumProviderImplUnitTest, SignTypedMessage) { base::ASCIIToUTF16(chain_id))); domain.Set("chainId", 1); - SignTypedMessage(absl::nullopt, address_0, "{...}", domain_hash, primary_hash, + SignTypedMessage(std::nullopt, address_0, "{...}", domain_hash, primary_hash, domain.Clone(), nullptr, &signature, &error, &error_message); EXPECT_TRUE(signature.empty()); EXPECT_EQ(error, mojom::ProviderError::kUnauthorized); @@ -1926,7 +1926,7 @@ TEST_F(EthereumProviderImplUnitTest, SignTypedMessage) { // No permission ASSERT_FALSE(address_0.empty()); - SignTypedMessage(absl::nullopt, address_0, "{...}", domain_hash, primary_hash, + SignTypedMessage(std::nullopt, address_0, "{...}", domain_hash, primary_hash, domain.Clone(), nullptr, &signature, &error, &error_message); EXPECT_TRUE(signature.empty()); EXPECT_EQ(error, mojom::ProviderError::kUnauthorized); @@ -1949,7 +1949,7 @@ TEST_F(EthereumProviderImplUnitTest, SignTypedMessage) { EXPECT_EQ(error_message, l10n_util::GetStringUTF8(IDS_WALLET_USER_REJECTED_REQUEST)); // not valid eip712 domain hash - SignTypedMessage(absl::nullopt, address_0, "{...}", DecodeHexHash("brave"), + SignTypedMessage(std::nullopt, address_0, "{...}", DecodeHexHash("brave"), primary_hash, domain.Clone(), nullptr, &signature, &error, &error_message); EXPECT_TRUE(signature.empty()); @@ -1957,7 +1957,7 @@ TEST_F(EthereumProviderImplUnitTest, SignTypedMessage) { EXPECT_EQ(error_message, l10n_util::GetStringUTF8(IDS_WALLET_INVALID_PARAMETERS)); // not valid eip712 primary hash - SignTypedMessage(absl::nullopt, address_0, "{...}", domain_hash, + SignTypedMessage(std::nullopt, address_0, "{...}", domain_hash, DecodeHexHash("primary"), domain.Clone(), nullptr, &signature, &error, &error_message); EXPECT_TRUE(signature.empty()); @@ -1968,7 +1968,7 @@ TEST_F(EthereumProviderImplUnitTest, SignTypedMessage) { // nullopt for the first param here because we don't AddSignMessageRequest // whent here are no accounts returned. - SignTypedMessage(absl::nullopt, address_0, "{...}", domain_hash, primary_hash, + SignTypedMessage(std::nullopt, address_0, "{...}", domain_hash, primary_hash, domain.Clone(), nullptr, &signature, &error, &error_message); EXPECT_TRUE(signature.empty()); EXPECT_EQ(error, mojom::ProviderError::kUnauthorized); @@ -2033,7 +2033,7 @@ TEST_F(EthereumProviderImplUnitTest, SignMessageRequestQueue) { // wrong order brave_wallet_service_->NotifySignMessageRequestProcessed(true, id2, nullptr, - absl::nullopt); + std::nullopt); EXPECT_EQ(GetSignMessageQueueSize(), 3u); EXPECT_EQ(GetSignMessageQueueFront()->id, id1); EXPECT_EQ(GetSignMessageQueueFront() @@ -2042,7 +2042,7 @@ TEST_F(EthereumProviderImplUnitTest, SignMessageRequestQueue) { message1_in_queue); brave_wallet_service_->NotifySignMessageRequestProcessed(true, id3, nullptr, - absl::nullopt); + std::nullopt); EXPECT_EQ(GetSignMessageQueueSize(), 3u); EXPECT_EQ(GetSignMessageQueueFront()->id, id1); EXPECT_EQ(GetSignMessageQueueFront() @@ -2051,7 +2051,7 @@ TEST_F(EthereumProviderImplUnitTest, SignMessageRequestQueue) { message1_in_queue); brave_wallet_service_->NotifySignMessageRequestProcessed(true, id1, nullptr, - absl::nullopt); + std::nullopt); EXPECT_EQ(GetSignMessageQueueSize(), 2u); EXPECT_EQ(GetSignMessageQueueFront()->id, id2); EXPECT_EQ(GetSignMessageQueueFront() @@ -2071,7 +2071,7 @@ TEST_F(EthereumProviderImplUnitTest, SignMessageRequestQueue) { // old id brave_wallet_service_->NotifySignMessageRequestProcessed(true, id1, nullptr, - absl::nullopt); + std::nullopt); EXPECT_EQ(GetSignMessageQueueSize(), 2u); EXPECT_EQ(GetSignMessageQueueFront()->id, id2); EXPECT_EQ(GetSignMessageQueueFront() @@ -2080,7 +2080,7 @@ TEST_F(EthereumProviderImplUnitTest, SignMessageRequestQueue) { message2_in_queue); brave_wallet_service_->NotifySignMessageRequestProcessed(true, id2, nullptr, - absl::nullopt); + std::nullopt); EXPECT_EQ(GetSignMessageQueueSize(), 1u); EXPECT_EQ(GetSignMessageQueueFront()->id, id3); EXPECT_EQ(GetSignMessageQueueFront() @@ -2096,7 +2096,7 @@ TEST_F(EthereumProviderImplUnitTest, SignMessageRequestQueue) { } brave_wallet_service_->NotifySignMessageRequestProcessed(true, id3, nullptr, - absl::nullopt); + std::nullopt); EXPECT_EQ(GetSignMessageQueueSize(), 0u); EXPECT_EQ(GetPendingSignMessageRequests().size(), 0u); } @@ -2106,13 +2106,13 @@ TEST_F(EthereumProviderImplUnitTest, ChainChangedEvent) { Navigate(url); EXPECT_CALL(*observer_, ChainChangedEvent(mojom::kGoerliChainId)).Times(1); - SetNetwork(mojom::kGoerliChainId, absl::nullopt); + SetNetwork(mojom::kGoerliChainId, std::nullopt); base::RunLoop().RunUntilIdle(); EXPECT_TRUE(testing::Mock::VerifyAndClearExpectations(observer_.get())); // Works a second time EXPECT_CALL(*observer_, ChainChangedEvent(mojom::kMainnetChainId)).Times(1); - SetNetwork(mojom::kMainnetChainId, absl::nullopt); + SetNetwork(mojom::kMainnetChainId, std::nullopt); base::RunLoop().RunUntilIdle(); EXPECT_TRUE(testing::Mock::VerifyAndClearExpectations(observer_.get())); @@ -2169,7 +2169,7 @@ TEST_F(EthereumProviderImplUnitTest, EthSubscribe) { std::string request_payload_json = R"({"id":1,"jsonrpc:": "2.0","method":"eth_subscribe", "params": ["foo"]})"; - absl::optional request_payload = base::JSONReader::Read( + std::optional request_payload = base::JSONReader::Read( request_payload_json, base::JSON_PARSE_CHROMIUM_EXTENSIONS | base::JSONParserOptions::JSON_PARSE_RFC); auto response = CommonRequestOrSendAsync(request_payload.value()); @@ -2264,7 +2264,7 @@ TEST_F(EthereumProviderImplUnitTest, EthSubscribeLogs) { std::string request_payload_json = R"({"id":1,"jsonrpc:": "2.0","method":"eth_subscribe", "params": ["foo"]})"; - absl::optional request_payload = base::JSONReader::Read( + std::optional request_payload = base::JSONReader::Read( request_payload_json, base::JSON_PARSE_CHROMIUM_EXTENSIONS | base::JSONParserOptions::JSON_PARSE_RFC); auto response = CommonRequestOrSendAsync(request_payload.value()); @@ -2361,7 +2361,7 @@ TEST_F(EthereumProviderImplUnitTest, EthSubscribeLogsFiltered) { EXPECT_TRUE(request.headers.GetHeader("X-Eth-Method", &header_value)); if (header_value == "eth_getLogs") { - const absl::optional req_body_payload = + const std::optional req_body_payload = base::JSONReader::Read( R"({"id":1,"jsonrpc":"2.0","method":"eth_getLogs","params": [{"address":["0x1111", "0x1112"],"fromBlock":"0x2211","toBlock":"0xab65", @@ -2386,7 +2386,7 @@ TEST_F(EthereumProviderImplUnitTest, EthSubscribeLogsFiltered) { R"({"id":1,"jsonrpc:": "2.0","method":"eth_subscribe", "params": ["logs", {"address": ["0x1111", "0x1112"], "fromBlock": "0x2211", "toBlock": "0xab65", "topics": ["0x2edc", "0xb832", "0x8dc8"]}]})"; - absl::optional request_payload = base::JSONReader::Read( + std::optional request_payload = base::JSONReader::Read( request_payload_json, base::JSON_PARSE_CHROMIUM_EXTENSIONS | base::JSONParserOptions::JSON_PARSE_RFC); std::string error_message; @@ -2586,7 +2586,7 @@ TEST_F(EthereumProviderImplUnitTest, SwitchEthereumChain) { // chain doesn't exist yet std::string chain_id = "0x111"; - SwitchEthereumChain(chain_id, absl::nullopt, &error, &error_message); + SwitchEthereumChain(chain_id, std::nullopt, &error, &error_message); EXPECT_EQ(error, mojom::ProviderError::kUnknownChain); EXPECT_EQ(error_message, l10n_util::GetStringFUTF8(IDS_WALLET_UNKNOWN_CHAIN, @@ -2594,7 +2594,7 @@ TEST_F(EthereumProviderImplUnitTest, SwitchEthereumChain) { EXPECT_FALSE(brave_wallet_tab_helper()->IsShowingBubble()); // already on this chain - SwitchEthereumChain("0x1", absl::nullopt, &error, &error_message); + SwitchEthereumChain("0x1", std::nullopt, &error, &error_message); EXPECT_EQ(error, mojom::ProviderError::kSuccess); EXPECT_TRUE(error_message.empty()); EXPECT_FALSE(brave_wallet_tab_helper()->IsShowingBubble()); @@ -2632,7 +2632,7 @@ TEST_F(EthereumProviderImplUnitTest, SwitchEthereumChain) { run_loop.Quit(); }), base::Value()); - SwitchEthereumChain("0x1", absl::nullopt, &error, &error_message); + SwitchEthereumChain("0x1", std::nullopt, &error, &error_message); EXPECT_EQ(error, mojom::ProviderError::kUserRejectedRequest); EXPECT_EQ(error_message, l10n_util::GetStringUTF8(IDS_WALLET_ALREADY_IN_PROGRESS_ERROR)); @@ -2877,7 +2877,7 @@ TEST_F(EthereumProviderImplUnitTest, RequestEthCoinbase) { // Wallet that is not created should return empty base::Value for eth_coinbase std::string request_payload_json = R"({"id":1,"jsonrpc:": "2.0","method":"eth_coinbase"})"; - absl::optional request_payload = base::JSONReader::Read( + std::optional request_payload = base::JSONReader::Read( request_payload_json, base::JSON_PARSE_CHROMIUM_EXTENSIONS | base::JSONParserOptions::JSON_PARSE_RFC); auto response = CommonRequestOrSendAsync(request_payload.value()); diff --git a/browser/brave_wallet/external_wallets_importer.cc b/browser/brave_wallet/external_wallets_importer.cc index c7dceb173cd..55e656175cf 100644 --- a/browser/brave_wallet/external_wallets_importer.cc +++ b/browser/brave_wallet/external_wallets_importer.cc @@ -5,6 +5,7 @@ #include "brave/browser/brave_wallet/external_wallets_importer.h" +#include #include #include @@ -398,8 +399,8 @@ void ExternalWalletsImporter::GetMnemonic(bool is_legacy_crypto_wallets, return; } - absl::optional mnemonic = absl::nullopt; - absl::optional number_of_accounts = absl::nullopt; + std::optional mnemonic = std::nullopt; + std::optional number_of_accounts = std::nullopt; for (const auto& keyring_listed : keyrings->GetList()) { DCHECK(keyring_listed.is_dict()); const auto& keyring = *keyring_listed.GetIfDict(); diff --git a/browser/brave_wallet/external_wallets_importer.h b/browser/brave_wallet/external_wallets_importer.h index 95b7f2a9929..a061998cc35 100644 --- a/browser/brave_wallet/external_wallets_importer.h +++ b/browser/brave_wallet/external_wallets_importer.h @@ -7,6 +7,7 @@ #define BRAVE_BROWSER_BRAVE_WALLET_EXTERNAL_WALLETS_IMPORTER_H_ #include +#include #include #include "base/functional/callback.h" @@ -70,7 +71,7 @@ class ExternalWalletsImporter { bool is_external_wallet_installed_for_testing_ = false; mojom::ExternalWalletType type_; raw_ptr context_ = nullptr; - absl::optional storage_data_; + std::optional storage_data_; scoped_refptr extension_; SEQUENCE_CHECKER(sequence_checker_); diff --git a/browser/brave_wallet/keyring_service_unittest.cc b/browser/brave_wallet/keyring_service_unittest.cc index 1cbc252a200..9a6f04156e3 100644 --- a/browser/brave_wallet/keyring_service_unittest.cc +++ b/browser/brave_wallet/keyring_service_unittest.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/keyring_service.h" +#include #include #include @@ -282,11 +283,11 @@ class KeyringServiceUnitTest : public testing::Test { return success; } - static absl::optional EncodePrivateKeyForExport( + static std::optional EncodePrivateKeyForExport( KeyringService* service, mojom::AccountIdPtr account_id, const std::string& password = kPasswordBrave) { - absl::optional private_key; + std::optional private_key; base::RunLoop run_loop; service->EncodePrivateKeyForExport( std::move(account_id), password, @@ -350,8 +351,8 @@ class KeyringServiceUnitTest : public testing::Test { return result; } - static absl::optional CreateWallet(KeyringService* service, - const std::string& password) { + static std::optional CreateWallet(KeyringService* service, + const std::string& password) { std::string mnemonic; base::RunLoop run_loop; service->CreateWallet(password, @@ -475,7 +476,7 @@ class KeyringServiceUnitTest : public testing::Test { } bool SetNetwork(const std::string& chain_id, mojom::CoinType coin) { - return json_rpc_service_->SetNetwork(chain_id, coin, absl::nullopt); + return json_rpc_service_->SetNetwork(chain_id, coin, std::nullopt); } static bool Lock(KeyringService* service) { @@ -871,7 +872,7 @@ TEST_F(KeyringServiceUnitTest, CreateDefaultKeyring) { TEST_F(KeyringServiceUnitTest, RestoreDefaultKeyring) { KeyringService service(json_rpc_service(), GetPrefs(), GetLocalState()); - absl::optional mnemonic = CreateWallet(&service, "brave"); + std::optional mnemonic = CreateWallet(&service, "brave"); ASSERT_TRUE(mnemonic.has_value()); std::string salt = @@ -1435,7 +1436,7 @@ TEST_F(KeyringServiceUnitTest, CreateAndRestoreWallet) { EXPECT_CALL(observer, WalletRestored()).Times(0); EXPECT_CALL(observer, WalletCreated()); - absl::optional mnemonic_to_be_restored = + std::optional mnemonic_to_be_restored = CreateWallet(&service, "brave"); ASSERT_TRUE(mnemonic_to_be_restored.has_value()); observer.WaitAndVerify(); @@ -1506,7 +1507,7 @@ TEST_F(KeyringServiceUnitTest, CreateAndRestoreWallet) { TEST_F(KeyringServiceUnitTest, DefaultSolanaAccountCreated) { KeyringService service(json_rpc_service(), GetPrefs(), GetLocalState()); - ASSERT_NE(CreateWallet(&service, "brave"), absl::nullopt); + ASSERT_NE(CreateWallet(&service, "brave"), std::nullopt); std::vector account_infos = service.GetAccountInfosForKeyring(mojom::kSolanaKeyringId); @@ -1528,7 +1529,7 @@ TEST_F(KeyringServiceUnitTest, DefaultSolanaAccountRestored) { TEST_F(KeyringServiceUnitTest, AddAccount) { KeyringService service(json_rpc_service(), GetPrefs(), GetLocalState()); - ASSERT_NE(CreateWallet(&service, "brave"), absl::nullopt); + ASSERT_NE(CreateWallet(&service, "brave"), std::nullopt); EXPECT_TRUE(AddAccount(&service, mojom::CoinType::ETH, mojom::kDefaultKeyringId, "Account5566")); @@ -1817,7 +1818,7 @@ TEST_F(KeyringServiceUnitTest, EncodePrivateKeyForExport) { "0xf81229FE54D8a20fBc1e1e2a3451D1c7489437Db"), kPasswordBrave123)); - absl::optional private_key = EncodePrivateKeyForExport( + std::optional private_key = EncodePrivateKeyForExport( &service, MakeAccountId(mojom::CoinType::ETH, mojom::kDefaultKeyringId, mojom::AccountKind::kDerived, "0xf81229FE54D8a20fBc1e1e2a3451D1c7489437Db")); @@ -2341,7 +2342,7 @@ TEST_F(KeyringServiceUnitTest, HardwareAccounts) { TEST_F(KeyringServiceUnitTest, AutoLock) { KeyringService service(json_rpc_service(), GetPrefs(), GetLocalState()); - absl::optional mnemonic = CreateWallet(&service, "brave"); + std::optional mnemonic = CreateWallet(&service, "brave"); ASSERT_TRUE(mnemonic.has_value()); ASSERT_FALSE(service.IsLocked(mojom::kDefaultKeyringId)); @@ -2805,21 +2806,21 @@ TEST_F(KeyringServiceUnitTest, SignMessageByDefaultKeyring) { const std::vector message = {0xde, 0xad, 0xbe, 0xef}; auto sig_with_err = service.SignMessageByDefaultKeyring(account1, message); - EXPECT_NE(sig_with_err.signature, absl::nullopt); + EXPECT_NE(sig_with_err.signature, std::nullopt); EXPECT_FALSE(sig_with_err.signature->empty()); EXPECT_TRUE(sig_with_err.error_message.empty()); // message is 0x sig_with_err = service.SignMessageByDefaultKeyring(account1, std::vector()); - EXPECT_NE(sig_with_err.signature, absl::nullopt); + EXPECT_NE(sig_with_err.signature, std::nullopt); EXPECT_FALSE(sig_with_err.signature->empty()); EXPECT_TRUE(sig_with_err.error_message.empty()); // not a valid account in this wallet auto invalid_account = GetAccountUtils(&service).EthUnkownAccountId(); sig_with_err = service.SignMessageByDefaultKeyring(invalid_account, message); - EXPECT_EQ(sig_with_err.signature, absl::nullopt); + EXPECT_EQ(sig_with_err.signature, std::nullopt); EXPECT_EQ( sig_with_err.error_message, l10n_util::GetStringFUTF8(IDS_BRAVE_WALLET_SIGN_MESSAGE_INVALID_ADDRESS, @@ -2828,7 +2829,7 @@ TEST_F(KeyringServiceUnitTest, SignMessageByDefaultKeyring) { // Cannot sign message when locked service.Lock(); sig_with_err = service.SignMessageByDefaultKeyring(account1, message); - EXPECT_EQ(sig_with_err.signature, absl::nullopt); + EXPECT_EQ(sig_with_err.signature, std::nullopt); EXPECT_EQ( sig_with_err.error_message, l10n_util::GetStringUTF8(IDS_BRAVE_WALLET_SIGN_MESSAGE_UNLOCK_FIRST)); @@ -3346,7 +3347,7 @@ TEST_F(KeyringServiceUnitTest, PreCreateEncryptors) { { // Create default wallet and restore KeyringService service(json_rpc_service(), GetPrefs(), GetLocalState()); - absl::optional mnemonic_to_be_restored = + std::optional mnemonic_to_be_restored = CreateWallet(&service, "brave"); ASSERT_TRUE(mnemonic_to_be_restored.has_value()); @@ -4070,7 +4071,7 @@ class KeyringServiceEncryptionKeysMigrationUnitTest EXPECT_FALSE(service->IsLocked(mojom::kFilecoinTestnetKeyringId)); // Imported accounts are missing. - EXPECT_EQ(absl::nullopt, + EXPECT_EQ(std::nullopt, EncodePrivateKeyForExport( service, MakeAccountId(mojom::CoinType::ETH, mojom::kDefaultKeyringId, @@ -4078,14 +4079,14 @@ class KeyringServiceEncryptionKeysMigrationUnitTest "0xDc06aE500aD5ebc5972A0D8Ada4733006E905976"))); EXPECT_EQ( - absl::nullopt, + std::nullopt, EncodePrivateKeyForExport( service, MakeAccountId(mojom::CoinType::SOL, mojom::kSolanaKeyringId, mojom::AccountKind::kImported, "C5ukMV73nk32h52MjxtnZXTrrr7rupD9CTDDRnYYDRYQ"))); - EXPECT_EQ(absl::nullopt, + EXPECT_EQ(std::nullopt, EncodePrivateKeyForExport( service, MakeAccountId(mojom::CoinType::FIL, mojom::kFilecoinKeyringId, @@ -4093,7 +4094,7 @@ class KeyringServiceEncryptionKeysMigrationUnitTest "f1syhomjrwhjmavadwmrofjpiocb6r72h4qoy7ucq"))); EXPECT_EQ( - absl::nullopt, + std::nullopt, EncodePrivateKeyForExport( service, MakeAccountId( mojom::CoinType::FIL, mojom::kFilecoinTestnetKeyringId, @@ -4123,7 +4124,7 @@ TEST_F(KeyringServiceEncryptionKeysMigrationUnitTest, MigrateWithUnlock) { // Setup prefs with legacy iterations count value. KeyringService::GetPbkdf2IterationsForTesting() = 100000; SetupKeyring(); - KeyringService::GetPbkdf2IterationsForTesting() = absl::nullopt; + KeyringService::GetPbkdf2IterationsForTesting() = std::nullopt; // Reset migration pref so migration runs on next unlock. EXPECT_TRUE( @@ -4143,7 +4144,7 @@ TEST_F(KeyringServiceEncryptionKeysMigrationUnitTest, MigrateWithUnlock) { KeyringService::GetPbkdf2IterationsForTesting() = 100000; // Unlock with legacy iterations fails. EXPECT_FALSE(Unlock(&service, "brave")); - KeyringService::GetPbkdf2IterationsForTesting() = absl::nullopt; + KeyringService::GetPbkdf2IterationsForTesting() = std::nullopt; // Unlocking again works. EXPECT_TRUE(Unlock(&service, "brave")); @@ -4158,7 +4159,7 @@ TEST_F(KeyringServiceEncryptionKeysMigrationUnitTest, // Setup prefs with legacy iterations count value. KeyringService::GetPbkdf2IterationsForTesting() = 100000; SetupKeyring(); - KeyringService::GetPbkdf2IterationsForTesting() = absl::nullopt; + KeyringService::GetPbkdf2IterationsForTesting() = std::nullopt; // Reset migration pref so migration runs on next restore. EXPECT_TRUE( @@ -4182,7 +4183,7 @@ TEST_F(KeyringServiceEncryptionKeysMigrationUnitTest, // Setup prefs with legacy iterations count value. KeyringService::GetPbkdf2IterationsForTesting() = 100000; SetupKeyring(); - KeyringService::GetPbkdf2IterationsForTesting() = absl::nullopt; + KeyringService::GetPbkdf2IterationsForTesting() = std::nullopt; // Reset migration pref so migration runs on next restore. EXPECT_TRUE( @@ -4221,7 +4222,7 @@ TEST_F(KeyringServiceEncryptionKeysMigrationUnitTest, // Setup prefs with legacy iterations count value. KeyringService::GetPbkdf2IterationsForTesting() = 100000; SetupKeyring(); - KeyringService::GetPbkdf2IterationsForTesting() = absl::nullopt; + KeyringService::GetPbkdf2IterationsForTesting() = std::nullopt; // Reset migration pref so migration runs on next unlock. EXPECT_TRUE( @@ -4412,7 +4413,7 @@ TEST_F(KeyringServiceUnitTest, GetBitcoinAddresses) { ASSERT_EQ(addresses->size(), 0u); // No addresses for fresh account. service.UpdateNextUnusedAddressForBitcoinAccount(btc_acc->account_id, 1, - absl::nullopt); + std::nullopt); addresses = service.GetBitcoinAddresses(btc_acc->account_id); ASSERT_EQ(addresses->size(), 1u); // 1 receive . EXPECT_EQ(addresses->at(0), mojom::BitcoinAddress::New( @@ -4420,7 +4421,7 @@ TEST_F(KeyringServiceUnitTest, GetBitcoinAddresses) { mojom::BitcoinKeyId::New(0, 0))); service.UpdateNextUnusedAddressForBitcoinAccount(btc_acc->account_id, - absl::nullopt, 1); + std::nullopt, 1); addresses = service.GetBitcoinAddresses(btc_acc->account_id); ASSERT_EQ(addresses->size(), 2u); // 1 receive + 1 change. EXPECT_EQ(addresses->at(0), mojom::BitcoinAddress::New( @@ -4455,7 +4456,7 @@ TEST_F(KeyringServiceUnitTest, UpdateNextUnusedAddressForBitcoinAccount) { NiceMock observer(service); EXPECT_CALL(observer, AccountsChanged()); service.UpdateNextUnusedAddressForBitcoinAccount(btc_acc->account_id, 7, - absl::nullopt); + std::nullopt); observer.WaitAndVerify(); EXPECT_EQ(mojom::BitcoinKeyId::New(0, 7), service.GetBitcoinAccountInfo(btc_acc->account_id) @@ -4465,7 +4466,7 @@ TEST_F(KeyringServiceUnitTest, UpdateNextUnusedAddressForBitcoinAccount) { ->next_change_address->key_id); EXPECT_CALL(observer, AccountsChanged()); service.UpdateNextUnusedAddressForBitcoinAccount(btc_acc->account_id, - absl::nullopt, 9); + std::nullopt, 9); observer.WaitAndVerify(); EXPECT_EQ(mojom::BitcoinKeyId::New(0, 7), service.GetBitcoinAccountInfo(btc_acc->account_id) diff --git a/browser/brave_wallet/notifications/wallet_notification_service_unittest.cc b/browser/brave_wallet/notifications/wallet_notification_service_unittest.cc index 526d9fc46f0..ae7914365a7 100644 --- a/browser/brave_wallet/notifications/wallet_notification_service_unittest.cc +++ b/browser/brave_wallet/notifications/wallet_notification_service_unittest.cc @@ -6,6 +6,7 @@ #include "brave/browser/brave_wallet/notifications/wallet_notification_service.h" #include +#include #include #include @@ -26,7 +27,6 @@ #include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h" #include "services/network/test/test_url_loader_factory.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_wallet { @@ -77,7 +77,7 @@ class WalletNotificationServiceUnitTest : public testing::Test { *EthTransaction::FromTxData(mojom::TxData::New( "0x01", "0x4a817c800", "0x5208", "0x3535353535353535353535353535353535353535", "0x0de0b6b3a7640000", - std::vector(), false, absl::nullopt))); + std::vector(), false, std::nullopt))); EthTxMeta meta(EthAccount(0), std::move(tx)); meta.set_status(status); notification_service_->OnTransactionStatusChanged(meta.ToTransactionInfo()); diff --git a/browser/brave_wallet/send_or_sign_transaction_browsertest.cc b/browser/brave_wallet/send_or_sign_transaction_browsertest.cc index 30631681de8..575d7ef9a3f 100644 --- a/browser/brave_wallet/send_or_sign_transaction_browsertest.cc +++ b/browser/brave_wallet/send_or_sign_transaction_browsertest.cc @@ -3,6 +3,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include + #include "base/command_line.h" #include "base/feature_list.h" #include "base/memory/raw_ptr.h" @@ -46,7 +48,6 @@ #include "mojo/public/cpp/bindings/self_owned_receiver.h" #include "net/dns/mock_host_resolver.h" #include "net/test/embedded_test_server/embedded_test_server.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/base/l10n/l10n_util.h" #include "url/gurl.h" #include "url/origin.h" @@ -135,8 +136,7 @@ class TestJsonRpcServiceObserver : public mojom::JsonRpcServiceObserver { void ChainChangedEvent(const std::string& chain_id, brave_wallet::mojom::CoinType coin, - const absl::optional<::url::Origin>& origin) override { - } + const std::optional<::url::Origin>& origin) override {} void OnIsEip1559Changed(const std::string& chain_id, bool is_eip1559) override {} @@ -206,7 +206,7 @@ class SendOrSignTransactionBrowserTest : public InProcessBrowserTest { https_server_for_rpc()->SetSSLConfig(net::EmbeddedTestServer::CERT_OK); https_server_for_rpc()->RegisterRequestHandler(callback); ASSERT_TRUE(https_server_for_rpc()->Start()); - SetNetworkForTesting(mojom::kLocalhostChainId, absl::nullopt); + SetNetworkForTesting(mojom::kLocalhostChainId, std::nullopt); } content::WebContents* web_contents() { @@ -376,7 +376,7 @@ class SendOrSignTransactionBrowserTest : public InProcessBrowserTest { } void TestUserApproved( - absl::optional expected_signed_tx, + std::optional expected_signed_tx, const std::string& test_method, const std::string& data = "", bool skip_restore = false, @@ -549,7 +549,7 @@ class SendOrSignTransactionBrowserTest : public InProcessBrowserTest { } void SetNetworkForTesting(const std::string& chain_id, - const absl::optional<::url::Origin>& origin, + const std::optional<::url::Origin>& origin, bool skip_rpc_url_override = false) { mojom::NetworkInfoPtr chain; ASSERT_TRUE( @@ -583,7 +583,7 @@ class SendOrSignTransactionBrowserTest : public InProcessBrowserTest { base::RunLoop().RunUntilIdle(); } - std::string chain_id(const absl::optional<::url::Origin>& origin) { + std::string chain_id(const std::optional<::url::Origin>& origin) { return json_rpc_service_->GetChainIdSync(mojom::CoinType::ETH, origin); } @@ -603,40 +603,40 @@ class SendOrSignTransactionBrowserTest : public InProcessBrowserTest { IN_PROC_BROWSER_TEST_F(SendOrSignTransactionBrowserTest, UserApprovedRequestSend) { - TestUserApproved(absl::nullopt, "request"); + TestUserApproved(std::nullopt, "request"); } IN_PROC_BROWSER_TEST_F(SendOrSignTransactionBrowserTest, UserApprovedSend1) { - TestUserApproved(absl::nullopt, "send1"); + TestUserApproved(std::nullopt, "send1"); } IN_PROC_BROWSER_TEST_F(SendOrSignTransactionBrowserTest, UserApprovedSend2) { - TestUserApproved(absl::nullopt, "send2"); + TestUserApproved(std::nullopt, "send2"); } IN_PROC_BROWSER_TEST_F(SendOrSignTransactionBrowserTest, UserApprovedSendAsync) { - TestUserApproved(absl::nullopt, "sendAsync"); + TestUserApproved(std::nullopt, "sendAsync"); } IN_PROC_BROWSER_TEST_F(SendOrSignTransactionBrowserTest, UserApprovedRequestData0x) { - TestUserApproved(absl::nullopt, "request", "0x"); + TestUserApproved(std::nullopt, "request", "0x"); } IN_PROC_BROWSER_TEST_F(SendOrSignTransactionBrowserTest, UserApprovedSend1Data0x) { - TestUserApproved(absl::nullopt, "send1", "0x1"); + TestUserApproved(std::nullopt, "send1", "0x1"); } IN_PROC_BROWSER_TEST_F(SendOrSignTransactionBrowserTest, UserApprovedSend2Data0x) { - TestUserApproved(absl::nullopt, "send2", "0x11"); + TestUserApproved(std::nullopt, "send2", "0x11"); } IN_PROC_BROWSER_TEST_F(SendOrSignTransactionBrowserTest, UserApprovedSendAsyncData0x) { - TestUserApproved(absl::nullopt, "sendAsync", "0x"); + TestUserApproved(std::nullopt, "sendAsync", "0x"); } IN_PROC_BROWSER_TEST_F(SendOrSignTransactionBrowserTest, UserRejectedRequest) { @@ -929,16 +929,16 @@ IN_PROC_BROWSER_TEST_F(SendOrSignTransactionBrowserTest, CallViaProxy) { IN_PROC_BROWSER_TEST_F(SendOrSignTransactionBrowserTest, EthSendTransactionEIP1559Tx) { - SetNetworkForTesting(mojom::kMainnetChainId, absl::nullopt); + SetNetworkForTesting(mojom::kMainnetChainId, std::nullopt); observer()->SetExpectEip1559Tx(true); - TestUserApproved(absl::nullopt, "request", "", false, mojom::kMainnetChainId); + TestUserApproved(std::nullopt, "request", "", false, mojom::kMainnetChainId); } IN_PROC_BROWSER_TEST_F(SendOrSignTransactionBrowserTest, EthSendTransactionLegacyTx) { - SetNetworkForTesting(mojom::kLocalhostChainId, absl::nullopt); + SetNetworkForTesting(mojom::kLocalhostChainId, std::nullopt); observer()->SetExpectEip1559Tx(false); - TestUserApproved(absl::nullopt, "request"); + TestUserApproved(std::nullopt, "request"); } IN_PROC_BROWSER_TEST_F(SendOrSignTransactionBrowserTest, @@ -948,16 +948,16 @@ IN_PROC_BROWSER_TEST_F(SendOrSignTransactionBrowserTest, mojom::NetworkInfo chain = GetTestNetworkInfo1("0x5566"); AddCustomNetwork(browser()->profile()->GetPrefs(), chain); - SetNetworkForTesting("0x5566", absl::nullopt); + SetNetworkForTesting("0x5566", std::nullopt); observer()->SetExpectEip1559Tx(false); - TestUserApproved(absl::nullopt, "request", "", true /* skip_restore */, + TestUserApproved(std::nullopt, "request", "", true /* skip_restore */, "0x5566"); } IN_PROC_BROWSER_TEST_F(SendOrSignTransactionBrowserTest, EthSignTransactionEIP1559Tx) { - SetNetworkForTesting(mojom::kMainnetChainId, absl::nullopt); + SetNetworkForTesting(mojom::kMainnetChainId, std::nullopt); observer()->SetExpectEip1559Tx(true); TestUserApproved( "0x02f86d0182960484f38e9e008525f38e9e0082960494084dcb94038af1715963f14907" @@ -969,7 +969,7 @@ IN_PROC_BROWSER_TEST_F(SendOrSignTransactionBrowserTest, IN_PROC_BROWSER_TEST_F(SendOrSignTransactionBrowserTest, EthSignTransactionLegacyTx) { - SetNetworkForTesting(mojom::kLocalhostChainId, absl::nullopt); // localhost + SetNetworkForTesting(mojom::kLocalhostChainId, std::nullopt); // localhost observer()->SetExpectEip1559Tx(false); TestUserApproved(kSignedTransaction, "request"); } @@ -981,7 +981,7 @@ IN_PROC_BROWSER_TEST_F(SendOrSignTransactionBrowserTest, mojom::NetworkInfo chain = GetTestNetworkInfo1("0x5566"); AddCustomNetwork(browser()->profile()->GetPrefs(), chain); - SetNetworkForTesting("0x5566", absl::nullopt); + SetNetworkForTesting("0x5566", std::nullopt); observer()->SetExpectEip1559Tx(false); TestUserApproved( diff --git a/browser/brave_wallet/solana_provider_browsertest.cc b/browser/brave_wallet/solana_provider_browsertest.cc index 9635927b941..6ec2c25a5ff 100644 --- a/browser/brave_wallet/solana_provider_browsertest.cc +++ b/browser/brave_wallet/solana_provider_browsertest.cc @@ -3,6 +3,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include + #include "base/command_line.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h" @@ -413,10 +415,10 @@ class SolanaProviderTest : public InProcessBrowserTest { // Update rpc url for kLocalhostChainId mojom::NetworkInfoPtr chain; json_rpc_service_->SetNetwork(mojom::kLocalhostChainId, - mojom::CoinType::SOL, absl::nullopt); + mojom::CoinType::SOL, std::nullopt); base::RunLoop run_loop; json_rpc_service_->GetNetwork( - mojom::CoinType::SOL, absl::nullopt, + mojom::CoinType::SOL, std::nullopt, base::BindLambdaForTesting([&](mojom::NetworkInfoPtr info) { chain = info.Clone(); run_loop.Quit(); @@ -946,7 +948,7 @@ IN_PROC_BROWSER_TEST_F(SolanaProviderTest, SignMessage) { EXPECT_TRUE(WaitForWalletBubble(web_contents())); // user rejected request brave_wallet_service_->NotifySignMessageRequestProcessed( - false, request_index++, nullptr, absl::nullopt); + false, request_index++, nullptr, std::nullopt); WaitForResultReady(); EXPECT_EQ(GetSignMessageResult(), l10n_util::GetStringUTF8(IDS_WALLET_USER_REJECTED_REQUEST)); @@ -956,7 +958,7 @@ IN_PROC_BROWSER_TEST_F(SolanaProviderTest, SignMessage) { EXPECT_TRUE(WaitForWalletBubble(web_contents())); // user approved request brave_wallet_service_->NotifySignMessageRequestProcessed( - true, request_index++, nullptr, absl::nullopt); + true, request_index++, nullptr, std::nullopt); WaitForResultReady(); EXPECT_EQ(GetSignMessageResult(), kExpectedSignature); } @@ -1121,7 +1123,7 @@ IN_PROC_BROWSER_TEST_F(SolanaProviderTest, SignAndSendTransaction) { std::vector signatures; signatures.push_back( - mojom::SignaturePubkeyPair::New(absl::nullopt, account_0->address)); + mojom::SignaturePubkeyPair::New(std::nullopt, account_0->address)); signatures.push_back(mojom::SignaturePubkeyPair::New( std::vector(std::begin(kSecondAccountSignature), std::end(kSecondAccountSignature)), @@ -1256,7 +1258,7 @@ IN_PROC_BROWSER_TEST_F(SolanaProviderTest, SignTransaction) { EXPECT_TRUE(WaitForWalletBubble(web_contents())); // user rejected request brave_wallet_service_->NotifySignTransactionRequestProcessed( - false, request_index++, nullptr, absl::nullopt); + false, request_index++, nullptr, std::nullopt); WaitForResultReady(); EXPECT_EQ(GetSignTransactionResult(), l10n_util::GetStringUTF8(IDS_WALLET_USER_REJECTED_REQUEST)); @@ -1265,7 +1267,7 @@ IN_PROC_BROWSER_TEST_F(SolanaProviderTest, SignTransaction) { EXPECT_TRUE(WaitForWalletBubble(web_contents())); // user approved request brave_wallet_service_->NotifySignTransactionRequestProcessed( - true, request_index++, nullptr, absl::nullopt); + true, request_index++, nullptr, std::nullopt); WaitForResultReady(); EXPECT_EQ(GetSignTransactionResult(), kSignedTxArrayStr); @@ -1274,7 +1276,7 @@ IN_PROC_BROWSER_TEST_F(SolanaProviderTest, SignTransaction) { EXPECT_TRUE(WaitForWalletBubble(web_contents())); // user approved request brave_wallet_service_->NotifySignTransactionRequestProcessed( - true, request_index++, nullptr, absl::nullopt); + true, request_index++, nullptr, std::nullopt); WaitForResultReady(); EXPECT_EQ(GetSignTransactionResult(), kSignedTxArrayStr2); @@ -1285,7 +1287,7 @@ IN_PROC_BROWSER_TEST_F(SolanaProviderTest, SignTransaction) { EXPECT_TRUE(WaitForWalletBubble(web_contents())); // user approved request brave_wallet_service_->NotifySignTransactionRequestProcessed( - true, request_index++, nullptr, absl::nullopt); + true, request_index++, nullptr, std::nullopt); WaitForResultReady(); EXPECT_EQ(GetSignTransactionResult(), kSignedTxArrayStr3); @@ -1294,7 +1296,7 @@ IN_PROC_BROWSER_TEST_F(SolanaProviderTest, SignTransaction) { EXPECT_TRUE(WaitForWalletBubble(web_contents())); // user approved request brave_wallet_service_->NotifySignTransactionRequestProcessed( - true, request_index++, nullptr, absl::nullopt); + true, request_index++, nullptr, std::nullopt); WaitForResultReady(); EXPECT_EQ(GetSignTransactionResult(), kSignedTxArrayStrV0); @@ -1326,7 +1328,7 @@ IN_PROC_BROWSER_TEST_F(SolanaProviderTest, SignAllTransactions) { EXPECT_TRUE(WaitForWalletBubble(web_contents())); // user rejected request brave_wallet_service_->NotifySignAllTransactionsRequestProcessed( - false, request_index++, absl::nullopt, absl::nullopt); + false, request_index++, std::nullopt, std::nullopt); WaitForResultReady(); EXPECT_EQ(GetSignAllTransactionsResult(), l10n_util::GetStringUTF8(IDS_WALLET_USER_REJECTED_REQUEST)); @@ -1335,7 +1337,7 @@ IN_PROC_BROWSER_TEST_F(SolanaProviderTest, SignAllTransactions) { EXPECT_TRUE(WaitForWalletBubble(web_contents())); // user approved request brave_wallet_service_->NotifySignAllTransactionsRequestProcessed( - true, request_index++, absl::nullopt, absl::nullopt); + true, request_index++, std::nullopt, std::nullopt); WaitForResultReady(); EXPECT_EQ(GetSignAllTransactionsResult(), "success"); @@ -1345,7 +1347,7 @@ IN_PROC_BROWSER_TEST_F(SolanaProviderTest, SignAllTransactions) { EXPECT_TRUE(WaitForWalletBubble(web_contents())); // user approved request brave_wallet_service_->NotifySignAllTransactionsRequestProcessed( - true, request_index++, absl::nullopt, absl::nullopt); + true, request_index++, std::nullopt, std::nullopt); WaitForResultReady(); EXPECT_EQ(GetSignAllTransactionsResult(), "success"); @@ -1355,7 +1357,7 @@ IN_PROC_BROWSER_TEST_F(SolanaProviderTest, SignAllTransactions) { EXPECT_TRUE(WaitForWalletBubble(web_contents())); // user approved request brave_wallet_service_->NotifySignAllTransactionsRequestProcessed( - true, request_index++, absl::nullopt, absl::nullopt); + true, request_index++, std::nullopt, std::nullopt); WaitForResultReady(); EXPECT_EQ(GetSignAllTransactionsResult(), "success"); @@ -1408,7 +1410,7 @@ IN_PROC_BROWSER_TEST_F(SolanaProviderTest, Request) { EXPECT_TRUE(WaitForWalletBubble(web_contents())); brave_wallet_service_->NotifySignMessageRequestProcessed(true, 0, nullptr, - absl::nullopt); + std::nullopt); WaitForResultReady(); EXPECT_EQ(GetRequestResult(), kExpectedEncodedSignature); @@ -1418,7 +1420,7 @@ IN_PROC_BROWSER_TEST_F(SolanaProviderTest, Request) { kEncodedUnsignedTxArrayStr)); EXPECT_TRUE(WaitForWalletBubble(web_contents())); brave_wallet_service_->NotifySignTransactionRequestProcessed(true, 0, nullptr, - absl::nullopt); + std::nullopt); WaitForResultReady(); EXPECT_EQ(GetRequestResult(), kEncodedSignature); @@ -1450,7 +1452,7 @@ IN_PROC_BROWSER_TEST_F(SolanaProviderTest, Request) { kEncodedUnsignedTxArrayStr)); EXPECT_TRUE(WaitForWalletBubble(web_contents())); brave_wallet_service_->NotifySignAllTransactionsRequestProcessed( - true, 0, absl::nullopt, absl::nullopt); + true, 0, std::nullopt, std::nullopt); WaitForResultReady(); EXPECT_EQ(GetRequestResult(), base::StrCat({kEncodedSignature, ",", kEncodedSignature})); diff --git a/browser/brave_wallet/solana_provider_impl_unittest.cc b/browser/brave_wallet/solana_provider_impl_unittest.cc index 8e80f97db34..6294961597f 100644 --- a/browser/brave_wallet/solana_provider_impl_unittest.cc +++ b/browser/brave_wallet/solana_provider_impl_unittest.cc @@ -3,12 +3,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include "brave/components/brave_wallet/browser/solana_provider_impl.h" + #include +#include #include #include "base/containers/cxx20_erase_vector.h" -#include "brave/components/brave_wallet/browser/solana_provider_impl.h" - #include "base/json/json_reader.h" #include "base/memory/raw_ptr.h" #include "base/test/bind.h" @@ -70,7 +71,7 @@ class MockEventsListener : public mojom::SolanaEventsListener { MOCK_METHOD(void, AccountChangedEvent, - (const absl::optional&), + (const std::optional&), (override)); MOCK_METHOD(void, DisconnectEvent, (), (override)); @@ -272,7 +273,7 @@ class SolanaProviderImplUnitTest : public testing::Test { account_id->address)); } - std::string Connect(absl::optional arg, + std::string Connect(std::optional arg, mojom::SolanaProviderError* error_out, std::string* error_message_out) { std::string account; @@ -297,13 +298,13 @@ class SolanaProviderImplUnitTest : public testing::Test { std::string SignMessage( const std::vector& blob_msg, - const absl::optional& display_encoding, + const std::optional& display_encoding, mojom::SolanaProviderError* error_out, std::string* error_message_out, bool run_notify = false, bool approve = true, mojom::ByteArrayStringUnionPtr hw_sig = nullptr, - const absl::optional& err_in = absl::nullopt) { + const std::optional& err_in = std::nullopt) { std::string signature_out; base::RunLoop run_loop; provider_->SignMessage( @@ -344,7 +345,7 @@ class SolanaProviderImplUnitTest : public testing::Test { mojom::SolanaSignTransactionParam::New( encoded_serialized_message, std::vector()), - absl::nullopt, + std::nullopt, base::BindLambdaForTesting([&](mojom::SolanaProviderError error, const std::string& error_message, base::Value::Dict result) { @@ -364,7 +365,7 @@ class SolanaProviderImplUnitTest : public testing::Test { bool run_notify = false, bool approve = true, mojom::ByteArrayStringUnionPtr hw_sig = nullptr, - const absl::optional& err_in = absl::nullopt) { + const std::optional& err_in = std::nullopt) { std::vector result_out; base::RunLoop run_loop; provider_->SignTransaction( @@ -400,9 +401,9 @@ class SolanaProviderImplUnitTest : public testing::Test { const std::string& expected_error_message, bool run_notify = false, bool approve = true, - absl::optional> hw_sigs = - absl::nullopt, - const absl::optional& err_in = absl::nullopt) { + std::optional> hw_sigs = + std::nullopt, + const std::optional& err_in = std::nullopt) { std::vector> result_out; base::RunLoop run_loop; std::vector params; @@ -505,7 +506,7 @@ TEST_F(SolanaProviderImplUnitTest, Connect) { std::string error_message; // no permission, trigger // permissions::BraveWalletPermissionContext::RequestPermissions failed - std::string account = Connect(absl::nullopt, &error, &error_message); + std::string account = Connect(std::nullopt, &error, &error_message); EXPECT_TRUE(account.empty()); EXPECT_EQ(error, mojom::SolanaProviderError::kInternalError); EXPECT_FALSE(IsConnected()); @@ -513,7 +514,7 @@ TEST_F(SolanaProviderImplUnitTest, Connect) { GURL url("https://brave.com"); Navigate(url); AddSolanaPermission(added_account->account_id); - account = Connect(absl::nullopt, &error, &error_message); + account = Connect(std::nullopt, &error, &error_message); EXPECT_EQ(account, added_account->address); EXPECT_EQ(error, mojom::SolanaProviderError::kSuccess); EXPECT_TRUE(error_message.empty()); @@ -525,19 +526,19 @@ TEST_F(SolanaProviderImplUnitTest, Connect) { std::string pending_connect_account; LockWallet(); base::RunLoop run_loop; - provider_->Connect(absl::nullopt, base::BindLambdaForTesting( - [&pending_error, &pending_error_message, - &pending_connect_account, &run_loop]( - mojom::SolanaProviderError error, - const std::string& error_message, - const std::string& public_key) { - pending_error = error; - pending_error_message = error_message; - pending_connect_account = public_key; - run_loop.Quit(); - })); + provider_->Connect(std::nullopt, base::BindLambdaForTesting( + [&pending_error, &pending_error_message, + &pending_connect_account, &run_loop]( + mojom::SolanaProviderError error, + const std::string& error_message, + const std::string& public_key) { + pending_error = error; + pending_error_message = error_message; + pending_connect_account = public_key; + run_loop.Quit(); + })); // Request will be rejected because it is still waiting for wallet unlock. - account = Connect(absl::nullopt, &error, &error_message); + account = Connect(std::nullopt, &error, &error_message); EXPECT_TRUE(account.empty()); EXPECT_EQ(error, mojom::SolanaProviderError::kUserRejectedRequest); EXPECT_EQ(error_message, @@ -560,7 +561,7 @@ TEST_F(SolanaProviderImplUnitTest, Connect) { ASSERT_TRUE(map); map->SetContentSettingDefaultScope( url, url, ContentSettingsType::BRAVE_SOLANA, CONTENT_SETTING_BLOCK); - account = Connect(absl::nullopt, &error, &error_message); + account = Connect(std::nullopt, &error, &error_message); EXPECT_TRUE(account.empty()); EXPECT_EQ(error, mojom::SolanaProviderError::kUserRejectedRequest); EXPECT_EQ(error_message, @@ -569,7 +570,7 @@ TEST_F(SolanaProviderImplUnitTest, Connect) { // again. map->SetContentSettingDefaultScope( url, url, ContentSettingsType::BRAVE_SOLANA, CONTENT_SETTING_DEFAULT); - account = Connect(absl::nullopt, &error, &error_message); + account = Connect(std::nullopt, &error, &error_message); EXPECT_EQ(account, added_account->address); EXPECT_EQ(error, mojom::SolanaProviderError::kSuccess); EXPECT_TRUE(error_message.empty()); @@ -632,7 +633,7 @@ TEST_F(SolanaProviderImplUnitTest, ConnectWithNoSolanaAccount) { mojom::SolanaProviderError error; std::string error_message; // No wallet setup - std::string account = Connect(absl::nullopt, &error, &error_message); + std::string account = Connect(std::nullopt, &error, &error_message); EXPECT_TRUE(account.empty()); EXPECT_EQ(error, mojom::SolanaProviderError::kInternalError); EXPECT_FALSE(IsConnected()); @@ -646,7 +647,7 @@ TEST_F(SolanaProviderImplUnitTest, ConnectWithNoSolanaAccount) { // No solana account CreateWallet(); keyring_service_->SetSelectedDappAccountInternal(mojom::CoinType::SOL, {}); - account = Connect(absl::nullopt, &error, &error_message); + account = Connect(std::nullopt, &error, &error_message); EXPECT_TRUE(account.empty()); EXPECT_EQ(error, mojom::SolanaProviderError::kInternalError); EXPECT_FALSE(IsConnected()); @@ -657,7 +658,7 @@ TEST_F(SolanaProviderImplUnitTest, ConnectWithNoSolanaAccount) { account_creation_callback_called = false; SetCallbackForAccountCreationForTesting(base::BindLambdaForTesting( [&]() { account_creation_callback_called = true; })); - account = Connect(absl::nullopt, &error, &error_message); + account = Connect(std::nullopt, &error, &error_message); EXPECT_TRUE(account.empty()); EXPECT_EQ(error, mojom::SolanaProviderError::kInternalError); EXPECT_FALSE(IsConnected()); @@ -675,7 +676,7 @@ TEST_F(SolanaProviderImplUnitTest, Disconnect) { Navigate(GURL("https://brave.com")); AddSolanaPermission(added_account->account_id); - std::string account = Connect(absl::nullopt, nullptr, nullptr); + std::string account = Connect(std::nullopt, nullptr, nullptr); ASSERT_TRUE(!account.empty()); ASSERT_TRUE(IsConnected()); @@ -687,12 +688,12 @@ TEST_F(SolanaProviderImplUnitTest, Disconnect) { TEST_F(SolanaProviderImplUnitTest, AccountChangedEvent_RemoveSelectedHardwareAccount) { - EXPECT_CALL(*observer_, AccountChangedEvent(absl::optional())); + EXPECT_CALL(*observer_, AccountChangedEvent(std::optional())); CreateWallet(); observer_->WaitAndVerify(); auto added_hw_account = AddHardwareAccount(kHardwareAccountAddr); - EXPECT_CALL(*observer_, AccountChangedEvent(absl::optional())); + EXPECT_CALL(*observer_, AccountChangedEvent(std::optional())); observer_->WaitAndVerify(); EXPECT_CALL(*observer_, AccountChangedEvent(_)).Times(0); @@ -702,24 +703,24 @@ TEST_F(SolanaProviderImplUnitTest, // Connect the account. Navigate(GURL("https://brave.com")); AddSolanaPermission(added_hw_account->account_id); - std::string account = Connect(absl::nullopt, nullptr, nullptr); + std::string account = Connect(std::nullopt, nullptr, nullptr); ASSERT_TRUE(!account.empty()); ASSERT_TRUE(IsConnected()); - // Account is empty because GetSelectedAccount returns absl::nullopt. - EXPECT_CALL(*observer_, AccountChangedEvent(absl::optional())); + // Account is empty because GetSelectedAccount returns std::nullopt. + EXPECT_CALL(*observer_, AccountChangedEvent(std::optional())); // Remove selected hardware account. EXPECT_TRUE(RemoveHardwareAccount(added_hw_account->account_id)); observer_->WaitAndVerify(); } TEST_F(SolanaProviderImplUnitTest, AccountChangedEvent) { - EXPECT_CALL(*observer_, AccountChangedEvent(absl::optional())); + EXPECT_CALL(*observer_, AccountChangedEvent(std::optional())); CreateWallet(); observer_->WaitAndVerify(); // since it is not connected, account is empty - EXPECT_CALL(*observer_, AccountChangedEvent(absl::optional())); + EXPECT_CALL(*observer_, AccountChangedEvent(std::optional())); auto added_account = AddAccount(); observer_->WaitAndVerify(); @@ -731,12 +732,12 @@ TEST_F(SolanaProviderImplUnitTest, AccountChangedEvent) { // connect the account Navigate(GURL("https://brave.com")); AddSolanaPermission(added_account->account_id); - std::string account = Connect(absl::nullopt, nullptr, nullptr); + std::string account = Connect(std::nullopt, nullptr, nullptr); ASSERT_TRUE(!account.empty()); ASSERT_TRUE(IsConnected()); // add another account selects it, since it is not connected, account is empty - EXPECT_CALL(*observer_, AccountChangedEvent(absl::optional())); + EXPECT_CALL(*observer_, AccountChangedEvent(std::optional())); auto added_another_account = AddAccount(); observer_->WaitAndVerify(); @@ -745,7 +746,7 @@ TEST_F(SolanaProviderImplUnitTest, AccountChangedEvent) { SetSelectedAccount(added_another_account->account_id); observer_->WaitAndVerify(); - EXPECT_CALL(*observer_, AccountChangedEvent(absl::optional( + EXPECT_CALL(*observer_, AccountChangedEvent(std::optional( added_account->account_id->address))); // now switch back to the account just connected SetSelectedAccount(added_account->account_id); @@ -763,7 +764,7 @@ TEST_F(SolanaProviderImplUnitTest, NoSelectedAccount) { mojom::SolanaProviderError error; std::string error_message; // connect - std::string account = Connect(absl::nullopt, &error, &error_message); + std::string account = Connect(std::nullopt, &error, &error_message); EXPECT_TRUE(account.empty()); EXPECT_EQ(error, mojom::SolanaProviderError::kInternalError); EXPECT_EQ(error_message, l10n_util::GetStringUTF8(IDS_WALLET_INTERNAL_ERROR)); @@ -780,7 +781,7 @@ TEST_F(SolanaProviderImplUnitTest, NoSelectedAccount) { // sign message const std::string signature = - SignMessage({1, 2, 3, 4}, absl::nullopt, &error, &error_message); + SignMessage({1, 2, 3, 4}, std::nullopt, &error, &error_message); EXPECT_TRUE(signature.empty()); EXPECT_EQ(error, mojom::SolanaProviderError::kInternalError); EXPECT_EQ(error_message, l10n_util::GetStringUTF8(IDS_WALLET_INTERNAL_ERROR)); @@ -799,7 +800,7 @@ TEST_F(SolanaProviderImplUnitTest, SignMessage) { // Disconnected state will be rejcted. ASSERT_FALSE(IsConnected()); std::string signature = - SignMessage({1, 2, 3, 4}, absl::nullopt, &error, &error_message); + SignMessage({1, 2, 3, 4}, std::nullopt, &error, &error_message); EXPECT_TRUE(signature.empty()); EXPECT_EQ(error, mojom::SolanaProviderError::kUnauthorized); EXPECT_EQ(error_message, l10n_util::GetStringUTF8(IDS_WALLET_NOT_AUTHED)); @@ -817,17 +818,17 @@ TEST_F(SolanaProviderImplUnitTest, SignMessage) { 219, 42, 6, 169, 240, 137, 142, 185, 169, 6, 17, 87, 123, 6, 42, 55, 162, 64, 120, 91, 1, 2, 2, 0, 1, 12, 2, 0, 0, 0, 128, 150, 152, 0, 0, 0, 0, 0}, - absl::nullopt, &error, &error_message); + std::nullopt, &error, &error_message); EXPECT_TRUE(signature.empty()); EXPECT_EQ(error, mojom::SolanaProviderError::kUnauthorized); EXPECT_EQ(error_message, l10n_util::GetStringUTF8(IDS_WALLET_NOT_AUTHED)); AddSolanaPermission(added_account->account_id); - Connect(absl::nullopt, &error, &error_message); + Connect(std::nullopt, &error, &error_message); ASSERT_TRUE(IsConnected()); // User rejected. - signature = SignMessage({1, 2, 3, 4}, absl::nullopt, &error, &error_message, + signature = SignMessage({1, 2, 3, 4}, std::nullopt, &error, &error_message, true, false /* approve */); EXPECT_EQ(error, mojom::SolanaProviderError::kUserRejectedRequest); EXPECT_EQ(error_message, @@ -836,7 +837,7 @@ TEST_F(SolanaProviderImplUnitTest, SignMessage) { // test encoding, sign message requests won't be processed so callbacks will // not run const std::vector message = {66, 82, 65, 86, 69}; - provider_->SignMessage(message, absl::nullopt, base::DoNothing()); + provider_->SignMessage(message, std::nullopt, base::DoNothing()); provider_->SignMessage(message, "utf8", base::DoNothing()); provider_->SignMessage(message, "hex", base::DoNothing()); provider_->SignMessage(message, "invalid", base::DoNothing()); @@ -865,12 +866,12 @@ TEST_F(SolanaProviderImplUnitTest, SignMessage_Hardware) { Navigate(GURL("https://brave.com")); AddSolanaPermission(added_hw_account->account_id); - Connect(absl::nullopt, &error, &error_message); + Connect(std::nullopt, &error, &error_message); ASSERT_TRUE(IsConnected()); // User accepted. std::string signature = - SignMessage(mock_msg, absl::nullopt, &error, &error_message, true, true, + SignMessage(mock_msg, std::nullopt, &error, &error_message, true, true, mock_hw_sig.Clone()); EXPECT_EQ(signature, Base58Encode(mock_hw_sig->get_bytes())); EXPECT_EQ(error, mojom::SolanaProviderError::kSuccess); @@ -878,13 +879,13 @@ TEST_F(SolanaProviderImplUnitTest, SignMessage_Hardware) { // User rejected. signature = - SignMessage(mock_msg, absl::nullopt, &error, &error_message, true, false); + SignMessage(mock_msg, std::nullopt, &error, &error_message, true, false); EXPECT_EQ(error, mojom::SolanaProviderError::kUserRejectedRequest); EXPECT_EQ(error_message, l10n_util::GetStringUTF8(IDS_WALLET_USER_REJECTED_REQUEST)); // Hareware signing has error. - signature = SignMessage(mock_msg, absl::nullopt, &error, &error_message, true, + signature = SignMessage(mock_msg, std::nullopt, &error, &error_message, true, true, mock_hw_sig.Clone(), "error"); EXPECT_EQ(error, mojom::SolanaProviderError::kInternalError); EXPECT_EQ(error_message, "error"); @@ -896,7 +897,7 @@ TEST_F(SolanaProviderImplUnitTest, SignMessage_Hardware) { invalid_sigs.push_back(mojom::ByteArrayStringUnion::NewStr("str")); for (auto& invalid_sig : invalid_sigs) { - signature = SignMessage(mock_msg, absl::nullopt, &error, &error_message, + signature = SignMessage(mock_msg, std::nullopt, &error, &error_message, true, true, std::move(invalid_sig)); EXPECT_EQ(error, mojom::SolanaProviderError::kInternalError); EXPECT_EQ(error_message, @@ -911,8 +912,8 @@ TEST_F(SolanaProviderImplUnitTest, GetDeserializedMessage) { SolanaInstruction instruction( mojom::kSolanaSystemProgramId, - {SolanaAccountMeta(added_account->address, absl::nullopt, true, true), - SolanaAccountMeta(added_account->address, absl::nullopt, false, true)}, + {SolanaAccountMeta(added_account->address, std::nullopt, true, true), + SolanaAccountMeta(added_account->address, std::nullopt, false, true)}, {2, 0, 0, 0, 128, 150, 152, 0, 0, 0, 0, 0}); auto msg = SolanaMessage::CreateLegacyMessage( "9sHcv6xwn9YkB8nxTUGKDwPwNnmqVp5oAXxU8Fdkm4J6", 0, added_account->address, @@ -954,7 +955,7 @@ TEST_F(SolanaProviderImplUnitTest, SignTransactionAPIs) { EXPECT_EQ(signed_txs, std::vector>()); AddSolanaPermission(added_account->account_id); - Connect(absl::nullopt, nullptr, nullptr); + Connect(std::nullopt, nullptr, nullptr); ASSERT_TRUE(IsConnected()); // Test message can't be deserialized. @@ -978,13 +979,13 @@ TEST_F(SolanaProviderImplUnitTest, SignTransactionAPIs_Hardware) { SetSelectedAccount(added_hw_account->account_id); Navigate(GURL("https://brave.com")); AddSolanaPermission(added_hw_account->account_id); - Connect(absl::nullopt, nullptr, nullptr); + Connect(std::nullopt, nullptr, nullptr); ASSERT_TRUE(IsConnected()); SolanaInstruction instruction( mojom::kSolanaSystemProgramId, - {SolanaAccountMeta(kHardwareAccountAddr, absl::nullopt, true, true), - SolanaAccountMeta(kHardwareAccountAddr, absl::nullopt, false, true)}, + {SolanaAccountMeta(kHardwareAccountAddr, std::nullopt, true, true), + SolanaAccountMeta(kHardwareAccountAddr, std::nullopt, false, true)}, {}); auto msg = SolanaMessage::CreateLegacyMessage( "9sHcv6xwn9YkB8nxTUGKDwPwNnmqVp5oAXxU8Fdkm4J6", 0, kHardwareAccountAddr, @@ -1039,7 +1040,7 @@ TEST_F(SolanaProviderImplUnitTest, SignTransactionAPIs_Hardware) { EXPECT_TRUE(signed_tx.empty()); signed_txs = SignAllTransactions({encoded_serialized_msg}, mojom::SolanaProviderError::kInternalError, - "error", true, true, absl::nullopt, "error"); + "error", true, true, std::nullopt, "error"); EXPECT_TRUE(signed_txs.empty()); // Invalid signatures: null signature, empty signature, non-bytes signature. diff --git a/browser/brave_wallet/solana_provider_renderer_browsertest.cc b/browser/brave_wallet/solana_provider_renderer_browsertest.cc index f94fc6765c4..4ff3ef525d9 100644 --- a/browser/brave_wallet/solana_provider_renderer_browsertest.cc +++ b/browser/brave_wallet/solana_provider_renderer_browsertest.cc @@ -3,6 +3,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include + #include "base/containers/flat_map.h" #include "base/feature_list.h" #include "base/json/json_reader.h" @@ -320,7 +322,7 @@ class TestSolanaProvider final : public brave_wallet::mojom::SolanaProvider { events_listener_.Bind(std::move(events_listener)); } } - void Connect(absl::optional arg, + void Connect(std::optional arg, ConnectCallback callback) override { if (error_ == SolanaProviderError::kSuccess) { std::move(callback).Run(SolanaProviderError::kSuccess, "", @@ -333,7 +335,7 @@ class TestSolanaProvider final : public brave_wallet::mojom::SolanaProvider { void Disconnect() override { // Used to test onAccountChanged if (emit_empty_account_changed_) { - events_listener_->AccountChangedEvent(absl::nullopt); + events_listener_->AccountChangedEvent(std::nullopt); } else { events_listener_->AccountChangedEvent(kTestPublicKey); } @@ -385,7 +387,7 @@ class TestSolanaProvider final : public brave_wallet::mojom::SolanaProvider { } void SignAndSendTransaction( brave_wallet::mojom::SolanaSignTransactionParamPtr param, - absl::optional send_options, + std::optional send_options, SignAndSendTransactionCallback callback) override { EXPECT_EQ(param->encoded_serialized_msg, brave_wallet::Base58Encode(kSerializedMessage)); @@ -409,7 +411,7 @@ class TestSolanaProvider final : public brave_wallet::mojom::SolanaProvider { } } void SignMessage(const std::vector& blob_msg, - const absl::optional& display_encoding, + const std::optional& display_encoding, SignMessageCallback callback) override { EXPECT_EQ(blob_msg, kMessageToSign); base::Value::Dict result; @@ -441,7 +443,7 @@ class TestSolanaProvider final : public brave_wallet::mojom::SolanaProvider { error_message_ = error_message; } - void SetSendOptions(absl::optional options) { + void SetSendOptions(std::optional options) { send_options_ = std::move(options); } @@ -457,7 +459,7 @@ class TestSolanaProvider final : public brave_wallet::mojom::SolanaProvider { SolanaProviderError error_ = SolanaProviderError::kSuccess; std::string error_message_; bool emit_empty_account_changed_ = false; - absl::optional send_options_; + std::optional send_options_; mojo::Remote events_listener_; }; @@ -908,7 +910,7 @@ IN_PROC_BROWSER_TEST_F(SolanaProviderRendererTest, SignAndSendTransaction) { SignAndSendTransactionScript(tx_with_send_options)); EXPECT_EQ(base::Value(true), send_options_result.value); - provider->SetSendOptions(absl::nullopt); + provider->SetSendOptions(std::nullopt); const std::string tx = base::StrCat({"(", CreateTransactionScript(kSerializedTx), ")"}); @@ -927,7 +929,7 @@ IN_PROC_BROWSER_TEST_F(SolanaProviderRendererTest, SignAndSendTransaction) { auto result2 = EvalJs(web_contents(browser()), SignAndSendTransactionScript(tx2)); EXPECT_EQ(base::Value(true), result2.value); - provider->SetSendOptions(absl::nullopt); + provider->SetSendOptions(std::nullopt); // no arg auto result3 = diff --git a/browser/brave_wallet/wallet_watch_asset_browsertest.cc b/browser/brave_wallet/wallet_watch_asset_browsertest.cc index 34220b53857..bc12ea10182 100644 --- a/browser/brave_wallet/wallet_watch_asset_browsertest.cc +++ b/browser/brave_wallet/wallet_watch_asset_browsertest.cc @@ -3,6 +3,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include + #include "base/command_line.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h" @@ -93,7 +95,7 @@ class WalletWatchAssetBrowserTest : public InProcessBrowserTest { std::vector tokens_out; brave_wallet_service_->GetUserAssets( GetCurrentChainId(browser()->profile()->GetPrefs(), - mojom::CoinType::ETH, absl::nullopt), + mojom::CoinType::ETH, std::nullopt), mojom::CoinType::ETH, base::BindLambdaForTesting( [&](std::vector tokens) { diff --git a/browser/browsing_data/brave_clear_browsing_data_browsertest.cc b/browser/browsing_data/brave_clear_browsing_data_browsertest.cc index 266ab54ef20..08a8a3cf76c 100644 --- a/browser/browsing_data/brave_clear_browsing_data_browsertest.cc +++ b/browser/browsing_data/brave_clear_browsing_data_browsertest.cc @@ -3,6 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include "brave/browser/browsing_data/brave_clear_browsing_data.h" + +#include #include #include "base/files/file_util.h" @@ -13,7 +16,6 @@ #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" #include "base/test/scoped_feature_list.h" -#include "brave/browser/browsing_data/brave_clear_browsing_data.h" #include "brave/components/ai_chat/core/common/buildflags/buildflags.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h" @@ -41,7 +43,6 @@ #include "content/public/test/browser_test.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_navigation_observer.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/url_constants.h" using content::BraveClearBrowsingData; @@ -201,8 +202,8 @@ class BraveClearDataOnExitTest unsigned int browsers_count_ = 1u; int remove_data_call_count_ = 0; int expected_remove_data_call_count_ = 0; - absl::optional expected_remove_mask_; - absl::optional expected_origin_mask_; + std::optional expected_remove_mask_; + std::optional expected_origin_mask_; }; IN_PROC_BROWSER_TEST_F(BraveClearDataOnExitTest, NoPrefsSet) { diff --git a/browser/component_updater/brave_component_updater_configurator.cc b/browser/component_updater/brave_component_updater_configurator.cc index a4dd20c77f3..e6efb91c9cf 100644 --- a/browser/component_updater/brave_component_updater_configurator.cc +++ b/browser/component_updater/brave_component_updater_configurator.cc @@ -8,6 +8,7 @@ #include #include +#include #include #include #include @@ -193,8 +194,8 @@ BraveConfigurator::GetProtocolHandlerFactory() const { return configurator_impl_.GetProtocolHandlerFactory(); } -absl::optional BraveConfigurator::IsMachineExternallyManaged() const { - return absl::nullopt; +std::optional BraveConfigurator::IsMachineExternallyManaged() const { + return std::nullopt; } update_client::UpdaterStateProvider BraveConfigurator::GetUpdaterStateProvider() @@ -205,12 +206,12 @@ update_client::UpdaterStateProvider BraveConfigurator::GetUpdaterStateProvider() return configurator_impl_.GetUpdaterStateProvider(); } -absl::optional BraveConfigurator::GetCrxCachePath() const { +std::optional BraveConfigurator::GetCrxCachePath() const { base::FilePath path; bool result = base::PathService::Get(chrome::DIR_USER_DATA, &path); - return result ? absl::optional( + return result ? std::optional( path.AppendASCII("component_crx_cache")) - : absl::nullopt; + : std::nullopt; } } // namespace component_updater diff --git a/browser/component_updater/brave_component_updater_configurator.h b/browser/component_updater/brave_component_updater_configurator.h index 4767a4530fd..2bd8b0cf39b 100644 --- a/browser/component_updater/brave_component_updater_configurator.h +++ b/browser/component_updater/brave_component_updater_configurator.h @@ -7,6 +7,7 @@ #define BRAVE_BROWSER_COMPONENT_UPDATER_BRAVE_COMPONENT_UPDATER_CONFIGURATOR_H_ #include +#include #include #include @@ -15,7 +16,6 @@ #include "base/time/time.h" #include "components/component_updater/configurator_impl.h" #include "components/update_client/configurator.h" -#include "third_party/abseil-cpp/absl/types/optional.h" class PrefRegistrySimple; class PrefService; @@ -69,9 +69,9 @@ class BraveConfigurator : public update_client::Configurator { bool IsPerUserInstall() const override; std::unique_ptr GetProtocolHandlerFactory() const override; - absl::optional IsMachineExternallyManaged() const override; + std::optional IsMachineExternallyManaged() const override; update_client::UpdaterStateProvider GetUpdaterStateProvider() const override; - absl::optional GetCrxCachePath() const override; + std::optional GetCrxCachePath() const override; private: friend class base::RefCountedThreadSafe; diff --git a/browser/decentralized_dns/test/decentralized_dns_navigation_throttle_browsertest.cc b/browser/decentralized_dns/test/decentralized_dns_navigation_throttle_browsertest.cc index 1ebac5f8ef8..10619d6ab96 100644 --- a/browser/decentralized_dns/test/decentralized_dns_navigation_throttle_browsertest.cc +++ b/browser/decentralized_dns/test/decentralized_dns_navigation_throttle_browsertest.cc @@ -3,6 +3,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include + #include "base/test/bind.h" #include "brave/components/brave_wallet/browser/ens_resolver_task.h" #include "brave/components/decentralized_dns/content/decentralized_dns_opt_in_page.h" @@ -175,27 +177,27 @@ class EnsL2OffchanLookupNavigationThrottleBrowserTest PrefService* local_state() { return g_browser_process->local_state(); } protected: - void SetEnsResolverResult(absl::optional task_result, - absl::optional task_error) { + void SetEnsResolverResult(std::optional task_result, + std::optional task_error) { ens_resolved_task_result_ = std::move(task_result); ens_resolved_task_error_ = std::move(task_error); } - absl::optional ens_resolved_task_result_; - absl::optional ens_resolved_task_error_; + std::optional ens_resolved_task_result_; + std::optional ens_resolved_task_error_; }; IN_PROC_BROWSER_TEST_F(EnsL2OffchanLookupNavigationThrottleBrowserTest, ShowENSOffchainLookupInterstitialAndProceed) { local_state()->SetInteger(kENSResolveMethod, static_cast(ResolveMethodTypes::ENABLED)); - SetEnsResolverResult(EnsResolverTaskResult({}, true), absl::nullopt); + SetEnsResolverResult(EnsResolverTaskResult({}, true), std::nullopt); EnsResolverTask::GetWorkOnTaskForTesting() = base::BindLambdaForTesting([](EnsResolverTask* task) { EXPECT_FALSE(task->allow_offchain().has_value()); task->SetResultForTesting(EnsResolverTaskResult({}, true), - absl::nullopt); + std::nullopt); }); ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), GURL("http://test.eth"))); @@ -222,13 +224,13 @@ IN_PROC_BROWSER_TEST_F(EnsL2OffchanLookupNavigationThrottleBrowserTest, ShowENSOffchainLookupInterstitialAndDontProceed) { local_state()->SetInteger(kENSResolveMethod, static_cast(ResolveMethodTypes::ENABLED)); - SetEnsResolverResult(EnsResolverTaskResult({}, true), absl::nullopt); + SetEnsResolverResult(EnsResolverTaskResult({}, true), std::nullopt); EnsResolverTask::GetWorkOnTaskForTesting() = base::BindLambdaForTesting([](EnsResolverTask* task) { EXPECT_FALSE(task->allow_offchain().has_value()); task->SetResultForTesting(EnsResolverTaskResult({}, true), - absl::nullopt); + std::nullopt); }); ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), GURL("http://test.eth"))); diff --git a/browser/ephemeral_storage/ephemeral_storage_tab_helper.cc b/browser/ephemeral_storage/ephemeral_storage_tab_helper.cc index c9a1be52fd5..4ea2b2fab26 100644 --- a/browser/ephemeral_storage/ephemeral_storage_tab_helper.cc +++ b/browser/ephemeral_storage/ephemeral_storage_tab_helper.cc @@ -7,6 +7,7 @@ #include #include +#include #include #include "base/feature_list.h" @@ -20,7 +21,6 @@ #include "content/public/browser/web_contents.h" #include "net/base/features.h" #include "net/base/url_util.h" -#include "third_party/abseil-cpp/absl/types/optional.h" using content::BrowserContext; using content::NavigationHandle; @@ -122,11 +122,11 @@ void EphemeralStorageTabHelper::CreateEphemeralStorageAreasForDomainAndURL( storage_partition, session_partition_id, // clone the namespace if there is an opener // https://html.spec.whatwg.org/multipage/browsers.html#copy-session-storage - opener_rfh ? absl::make_optional(StringToSessionStorageId( + opener_rfh ? std::make_optional(StringToSessionStorageId( content::GetSessionStorageNamespaceId( WebContents::FromRenderFrameHost(opener_rfh)), kSessionStorageSuffix)) - : absl::nullopt); + : std::nullopt); tld_ephemeral_lifetime_ = TLDEphemeralLifetime::GetOrCreate( browser_context, new_domain, site_instance->GetStoragePartitionConfig()); diff --git a/browser/extensions/api/brave_rewards_api.cc b/browser/extensions/api/brave_rewards_api.cc index e5d06a35a72..440458e5ccc 100644 --- a/browser/extensions/api/brave_rewards_api.cc +++ b/browser/extensions/api/brave_rewards_api.cc @@ -5,6 +5,7 @@ #include "brave/browser/extensions/api/brave_rewards_api.h" +#include #include #include @@ -200,7 +201,7 @@ BraveRewardsUpdateMediaDurationFunction:: ExtensionFunction::ResponseAction BraveRewardsUpdateMediaDurationFunction::Run() { - absl::optional params = + std::optional params = brave_rewards::UpdateMediaDuration::Params::Create(args()); EXTENSION_FUNCTION_VALIDATE(params); @@ -222,7 +223,7 @@ BraveRewardsGetPublisherInfoFunction::~BraveRewardsGetPublisherInfoFunction() = default; ExtensionFunction::ResponseAction BraveRewardsGetPublisherInfoFunction::Run() { - absl::optional params = + std::optional params = brave_rewards::GetPublisherInfo::Params::Create(args()); EXTENSION_FUNCTION_VALIDATE(params); @@ -343,7 +344,7 @@ BraveRewardsGetPublisherPanelInfoFunction:: ExtensionFunction::ResponseAction BraveRewardsGetPublisherPanelInfoFunction::Run() { - absl::optional params = + std::optional params = brave_rewards::GetPublisherPanelInfo::Params::Create(args()); EXTENSION_FUNCTION_VALIDATE(params); @@ -390,7 +391,7 @@ BraveRewardsSavePublisherInfoFunction:: ~BraveRewardsSavePublisherInfoFunction() = default; ExtensionFunction::ResponseAction BraveRewardsSavePublisherInfoFunction::Run() { - absl::optional params = + std::optional params = brave_rewards::SavePublisherInfo::Params::Create(args()); EXTENSION_FUNCTION_VALIDATE(params); @@ -425,7 +426,7 @@ void BraveRewardsSavePublisherInfoFunction::OnSavePublisherInfo( BraveRewardsTipSiteFunction::~BraveRewardsTipSiteFunction() = default; ExtensionFunction::ResponseAction BraveRewardsTipSiteFunction::Run() { - absl::optional params = + std::optional params = brave_rewards::TipSite::Params::Create(args()); EXTENSION_FUNCTION_VALIDATE(params); @@ -450,7 +451,7 @@ BraveRewardsIncludeInAutoContributionFunction:: ExtensionFunction::ResponseAction BraveRewardsIncludeInAutoContributionFunction::Run() { - absl::optional params = + std::optional params = brave_rewards::IncludeInAutoContribution::Params::Create(args()); Profile* profile = Profile::FromBrowserContext(browser_context()); RewardsService* rewards_service = @@ -466,7 +467,7 @@ BraveRewardsGetPublisherDataFunction::~BraveRewardsGetPublisherDataFunction() = default; ExtensionFunction::ResponseAction BraveRewardsGetPublisherDataFunction::Run() { - absl::optional params = + std::optional params = brave_rewards::GetPublisherData::Params::Create(args()); Profile* profile = Profile::FromBrowserContext(browser_context()); auto* rewards_service = RewardsServiceFactory::GetForProfile(profile); @@ -696,7 +697,7 @@ ExtensionFunction::ResponseAction BraveRewardsGetBalanceReportFunction::Run() { return RespondNow(Error("Rewards service is not available")); } - absl::optional params = + std::optional params = brave_rewards::GetBalanceReport::Params::Create(args()); rewards_service->GetBalanceReport( @@ -756,7 +757,7 @@ BraveRewardsClaimPromotionFunction::~BraveRewardsClaimPromotionFunction() = default; ExtensionFunction::ResponseAction BraveRewardsClaimPromotionFunction::Run() { - absl::optional params = + std::optional params = brave_rewards::ClaimPromotion::Params::Create(args()); Profile* profile = Profile::FromBrowserContext(browser_context()); RewardsService* rewards_service = @@ -791,7 +792,7 @@ BraveRewardsAttestPromotionFunction::~BraveRewardsAttestPromotionFunction() = default; ExtensionFunction::ResponseAction BraveRewardsAttestPromotionFunction::Run() { - absl::optional params = + std::optional params = brave_rewards::AttestPromotion::Params::Create(args()); Profile* profile = Profile::FromBrowserContext(browser_context()); RewardsService* rewards_service = @@ -830,7 +831,7 @@ BraveRewardsSetAutoContributeEnabledFunction:: ExtensionFunction::ResponseAction BraveRewardsSetAutoContributeEnabledFunction::Run() { - absl::optional params = + std::optional params = brave_rewards::SetAutoContributeEnabled::Params::Create(args()); Profile* profile = Profile::FromBrowserContext(browser_context()); RewardsService* rewards_service = @@ -868,7 +869,7 @@ BraveRewardsSaveRecurringTipFunction::~BraveRewardsSaveRecurringTipFunction() = default; ExtensionFunction::ResponseAction BraveRewardsSaveRecurringTipFunction::Run() { - absl::optional params = + std::optional params = brave_rewards::SaveRecurringTip::Params::Create(args()); Profile* profile = Profile::FromBrowserContext(browser_context()); @@ -899,7 +900,7 @@ BraveRewardsRemoveRecurringTipFunction:: ExtensionFunction::ResponseAction BraveRewardsRemoveRecurringTipFunction::Run() { - absl::optional params = + std::optional params = brave_rewards::RemoveRecurringTip::Params::Create(args()); Profile* profile = Profile::FromBrowserContext(browser_context()); @@ -952,7 +953,7 @@ BraveRewardsRefreshPublisherFunction::~BraveRewardsRefreshPublisherFunction() = default; ExtensionFunction::ResponseAction BraveRewardsRefreshPublisherFunction::Run() { - absl::optional params = + std::optional params = brave_rewards::RefreshPublisher::Params::Create(args()); Profile* profile = Profile::FromBrowserContext(browser_context()); diff --git a/browser/extensions/api/brave_shields_api.cc b/browser/extensions/api/brave_shields_api.cc index 5297e47217c..1e97d36e5df 100644 --- a/browser/extensions/api/brave_shields_api.cc +++ b/browser/extensions/api/brave_shields_api.cc @@ -5,6 +5,7 @@ #include "brave/browser/extensions/api/brave_shields_api.h" +#include #include #include "brave/browser/brave_browser_process.h" @@ -22,7 +23,7 @@ namespace api { ExtensionFunction::ResponseAction BraveShieldsAddSiteCosmeticFilterFunction::Run() { - absl::optional params = + std::optional params = brave_shields::AddSiteCosmeticFilter::Params::Create(args()); EXTENSION_FUNCTION_VALIDATE(params); diff --git a/browser/extensions/api/brave_theme_api.cc b/browser/extensions/api/brave_theme_api.cc index c2a5ee13cc2..e3b3f4a38eb 100644 --- a/browser/extensions/api/brave_theme_api.cc +++ b/browser/extensions/api/brave_theme_api.cc @@ -6,6 +6,7 @@ #include "brave/browser/extensions/api/brave_theme_api.h" #include +#include #include #include "base/json/json_writer.h" @@ -30,7 +31,7 @@ ExtensionFunction::ResponseAction BraveThemeGetBraveThemeTypeFunction::Run() { } ExtensionFunction::ResponseAction BraveThemeSetBraveThemeTypeFunction::Run() { - absl::optional params = + std::optional params = brave_theme::SetBraveThemeType::Params::Create(args()); EXTENSION_FUNCTION_VALIDATE(params); diff --git a/browser/extensions/api/brave_wallet_api.cc b/browser/extensions/api/brave_wallet_api.cc index 3e7f81e981a..f2a524c17d4 100644 --- a/browser/extensions/api/brave_wallet_api.cc +++ b/browser/extensions/api/brave_wallet_api.cc @@ -6,6 +6,7 @@ #include "brave/browser/extensions/api/brave_wallet_api.h" #include +#include #include #include "base/feature_list.h" @@ -102,7 +103,7 @@ BraveWalletShouldPromptForSetupFunction::Run() { ExtensionFunction::ResponseAction BraveWalletGetWalletSeedFunction::Run() { // make sure the passed in enryption key is 32 bytes. - absl::optional params = + std::optional params = brave_wallet::GetWalletSeed::Params::Create(args()); EXTENSION_FUNCTION_VALIDATE(params); if (params->key.size() != 32) { diff --git a/browser/extensions/api/greaselion_api.cc b/browser/extensions/api/greaselion_api.cc index 53cbc03a82a..416afe6259c 100644 --- a/browser/extensions/api/greaselion_api.cc +++ b/browser/extensions/api/greaselion_api.cc @@ -6,6 +6,7 @@ #include "brave/browser/extensions/api/greaselion_api.h" #include +#include #include "base/values.h" #include "brave/browser/greaselion/greaselion_service_factory.h" @@ -25,7 +26,7 @@ GreaselionIsGreaselionExtensionFunction::Run() { return RespondNow(WithArguments(false)); } - absl::optional params = + std::optional params = greaselion::IsGreaselionExtension::Params::Create(args()); EXTENSION_FUNCTION_VALIDATE(params); diff --git a/browser/extensions/api/identity/brave_web_auth_flow.cc b/browser/extensions/api/identity/brave_web_auth_flow.cc index 4519c36ac71..2d05e510eb7 100644 --- a/browser/extensions/api/identity/brave_web_auth_flow.cc +++ b/browser/extensions/api/identity/brave_web_auth_flow.cc @@ -6,6 +6,7 @@ #include "brave/browser/extensions/api/identity/brave_web_auth_flow.h" #include +#include #include #include @@ -27,7 +28,7 @@ BraveWebAuthFlow::BraveWebAuthFlow() {} BraveWebAuthFlow::~BraveWebAuthFlow() {} // static -absl::optional BraveWebAuthFlow::token_for_testing_; +std::optional BraveWebAuthFlow::token_for_testing_; // static void BraveWebAuthFlow::SetTokenForTesting(const std::string& token) { token_for_testing_ = token; diff --git a/browser/extensions/api/identity/brave_web_auth_flow.h b/browser/extensions/api/identity/brave_web_auth_flow.h index 5a8820fd3b6..2a2075ebab0 100644 --- a/browser/extensions/api/identity/brave_web_auth_flow.h +++ b/browser/extensions/api/identity/brave_web_auth_flow.h @@ -50,7 +50,7 @@ class BraveWebAuthFlow : public WebAuthFlow::Delegate { bool user_gesture); private: - static absl::optional token_for_testing_; + static std::optional token_for_testing_; raw_ptr profile_; ExtensionTokenKey token_key_{/*extension_id=*/"", diff --git a/browser/extensions/api/ipfs_api.cc b/browser/extensions/api/ipfs_api.cc index d3604b6e3ef..9e450a35ce2 100644 --- a/browser/extensions/api/ipfs_api.cc +++ b/browser/extensions/api/ipfs_api.cc @@ -6,6 +6,7 @@ #include "brave/browser/extensions/api/ipfs_api.h" #include +#include #include #include #include @@ -96,7 +97,7 @@ ExtensionFunction::ResponseAction IpfsRemoveIpfsPeerFunction::Run() { if (!ipfs_service) { return RespondNow(Error("Could not obtain IPFS service")); } - absl::optional params = + std::optional params = ipfs::RemoveIpfsPeer::Params::Create(args()); EXTENSION_FUNCTION_VALIDATE(params); ipfs_service->GetConfig( @@ -142,7 +143,7 @@ ExtensionFunction::ResponseAction IpfsAddIpfsPeerFunction::Run() { if (!ipfs_service) { return RespondNow(Error("Could not obtain IPFS service")); } - absl::optional params = + std::optional params = ipfs::AddIpfsPeer::Params::Create(args()); EXTENSION_FUNCTION_VALIDATE(params); ipfs_service->GetConfig( @@ -217,7 +218,7 @@ ExtensionFunction::ResponseAction IpfsRemoveIpnsKeyFunction::Run() { if (!ipfs_service->IsDaemonLaunched() || !key_manager) { return RespondNow(Error("IPFS node is not launched")); } - absl::optional params = + std::optional params = ipfs::RemoveIpnsKey::Params::Create(args()); EXTENSION_FUNCTION_VALIDATE(params); key_manager->RemoveKey( @@ -243,7 +244,7 @@ ExtensionFunction::ResponseAction IpfsRotateKeyFunction::Run() { if (!ipfs_service) { return RespondNow(Error("Could not obtain IPFS service")); } - absl::optional params = + std::optional params = ipfs::RotateKey::Params::Create(args()); EXTENSION_FUNCTION_VALIDATE(params); ipfs_service->RotateKey(params->name, @@ -267,7 +268,7 @@ ExtensionFunction::ResponseAction IpfsAddIpnsKeyFunction::Run() { if (!ipfs_service->IsDaemonLaunched() || !key_manager) { return RespondNow(Error("IPFS node is not launched")); } - absl::optional params = + std::optional params = ipfs::AddIpnsKey::Params::Create(args()); EXTENSION_FUNCTION_VALIDATE(params); key_manager->GenerateNewKey( @@ -431,7 +432,7 @@ ExtensionFunction::ResponseAction IpfsResolveIPFSURIFunction::Run() { return RespondNow(Error("IPFS not enabled")); } - absl::optional params = + std::optional params = ipfs::ResolveIPFSURI::Params::Create(args()); EXTENSION_FUNCTION_VALIDATE(params); GURL uri(params->uri); @@ -453,7 +454,7 @@ ExtensionFunction::ResponseAction IpfsValidateGatewayUrlFunction::Run() { if (!ipfs_service) { return RespondNow(Error("Could not obtain IPFS service")); } - absl::optional params = + std::optional params = ipfs::ValidateGatewayUrl::Params::Create(args()); EXTENSION_FUNCTION_VALIDATE(params); @@ -516,7 +517,7 @@ ExtensionFunction::ResponseAction IpfsSetPublicGatewayFunction::Run() { PrefService* prefs = user_prefs::UserPrefs::Get(browser_context()); - absl::optional params = + std::optional params = ipfs::SetPublicGateway::Params::Create(args()); EXTENSION_FUNCTION_VALIDATE(params); @@ -536,7 +537,7 @@ ExtensionFunction::ResponseAction IpfsSetPublicNFTGatewayFunction::Run() { PrefService* prefs = user_prefs::UserPrefs::Get(browser_context()); - absl::optional params = + std::optional params = ipfs::SetPublicNFTGateway::Params::Create(args()); EXTENSION_FUNCTION_VALIDATE(params); @@ -556,7 +557,7 @@ ExtensionFunction::ResponseAction IpfsSetResolveMethodFunction::Run() { PrefService* prefs = user_prefs::UserPrefs::Get(browser_context()); - absl::optional params = + std::optional params = ipfs::SetResolveMethod::Params::Create(args()); EXTENSION_FUNCTION_VALIDATE(params); @@ -585,7 +586,7 @@ IpfsSetAutoRedirectToConfiguredGatewayEnabledFunction::Run() { PrefService* prefs = user_prefs::UserPrefs::Get(browser_context()); - absl::optional + std::optional params = ipfs::SetAutoRedirectToConfiguredGatewayEnabled::Params::Create( args()); EXTENSION_FUNCTION_VALIDATE(params); @@ -601,7 +602,7 @@ ExtensionFunction::ResponseAction IpfsSetGatewayFallbackEnabledFunction::Run() { PrefService* prefs = user_prefs::UserPrefs::Get(browser_context()); - absl::optional params = + std::optional params = ipfs::SetGatewayFallbackEnabled::Params::Create(args()); EXTENSION_FUNCTION_VALIDATE(params); diff --git a/browser/extensions/api/rewards_notifications_api.cc b/browser/extensions/api/rewards_notifications_api.cc index 0ff480fd8e7..bba57e2cd0e 100644 --- a/browser/extensions/api/rewards_notifications_api.cc +++ b/browser/extensions/api/rewards_notifications_api.cc @@ -3,14 +3,15 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include - #include "brave/browser/extensions/api/rewards_notifications_api.h" +#include +#include + +#include "brave/browser/brave_rewards/rewards_service_factory.h" #include "brave/common/extensions/api/rewards_notifications.h" #include "brave/components/brave_rewards/browser/rewards_notification_service.h" #include "brave/components/brave_rewards/browser/rewards_service.h" -#include "brave/browser/brave_rewards/rewards_service_factory.h" #include "chrome/browser/profiles/profile.h" using brave_rewards::RewardsNotificationService; @@ -24,7 +25,7 @@ RewardsNotificationsAddNotificationFunction:: ExtensionFunction::ResponseAction RewardsNotificationsAddNotificationFunction::Run() { - absl::optional params = + std::optional params = rewards_notifications::AddNotification::Params::Create(args()); EXTENSION_FUNCTION_VALIDATE(params); Profile* profile = Profile::FromBrowserContext(browser_context()); @@ -44,7 +45,7 @@ RewardsNotificationsDeleteNotificationFunction:: ExtensionFunction::ResponseAction RewardsNotificationsDeleteNotificationFunction::Run() { - absl::optional params = + std::optional params = rewards_notifications::DeleteNotification::Params::Create(args()); EXTENSION_FUNCTION_VALIDATE(params); Profile* profile = Profile::FromBrowserContext(browser_context()); @@ -75,7 +76,7 @@ RewardsNotificationsGetNotificationFunction:: ExtensionFunction::ResponseAction RewardsNotificationsGetNotificationFunction::Run() { - absl::optional params = + std::optional params = rewards_notifications::GetNotification::Params::Create(args()); EXTENSION_FUNCTION_VALIDATE(params); Profile* profile = Profile::FromBrowserContext(browser_context()); diff --git a/browser/extensions/mv2_warning_unittest.cc b/browser/extensions/mv2_warning_unittest.cc index d130f23ca7e..6fde7633c8d 100644 --- a/browser/extensions/mv2_warning_unittest.cc +++ b/browser/extensions/mv2_warning_unittest.cc @@ -3,6 +3,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include + #include "base/values.h" #include "brave/browser/brave_browser_main_extra_parts.h" #include "extensions/common/extension.h" @@ -18,7 +20,7 @@ TEST(Mv2WarningTest, ExtensionManifestVersions) { auto main_extra_parts = BraveBrowserMainExtraParts(); main_extra_parts.PreProfileInit(); - auto get_manifest = [](absl::optional manifest_version) { + auto get_manifest = [](std::optional manifest_version) { base::Value::Dict dict; dict.Set("name", "My Extension"); dict.Set("version", "0.1"); diff --git a/browser/extensions/updater/brave_update_client_config.cc b/browser/extensions/updater/brave_update_client_config.cc index cad7e7a591d..57a11517c71 100644 --- a/browser/extensions/updater/brave_update_client_config.cc +++ b/browser/extensions/updater/brave_update_client_config.cc @@ -5,6 +5,7 @@ #include "brave/browser/extensions/updater/brave_update_client_config.h" +#include #include #include "base/functional/bind.h" @@ -58,7 +59,7 @@ BraveUpdateClientConfig::~BraveUpdateClientConfig() = default; // static scoped_refptr BraveUpdateClientConfig::Create( content::BrowserContext* context, - absl::optional update_url_override) { + std::optional update_url_override) { FactoryCallback& factory = GetFactoryCallback(); return factory.is_null() ? base::MakeRefCounted( context, update_url_override) diff --git a/browser/extensions/updater/brave_update_client_config.h b/browser/extensions/updater/brave_update_client_config.h index d1629aec189..01e7c117a58 100644 --- a/browser/extensions/updater/brave_update_client_config.h +++ b/browser/extensions/updater/brave_update_client_config.h @@ -6,12 +6,12 @@ #ifndef BRAVE_BROWSER_EXTENSIONS_UPDATER_BRAVE_UPDATE_CLIENT_CONFIG_H_ #define BRAVE_BROWSER_EXTENSIONS_UPDATER_BRAVE_UPDATE_CLIENT_CONFIG_H_ +#include #include #include "base/memory/ref_counted.h" #include "base/memory/scoped_refptr.h" #include "chrome/browser/extensions/updater/chrome_update_client_config.h" -#include "third_party/abseil-cpp/absl/types/optional.h" class GURL; @@ -34,7 +34,7 @@ class BraveUpdateClientConfig : public ChromeUpdateClientConfig { static scoped_refptr Create( content::BrowserContext* context, - absl::optional url_override); + std::optional url_override); using ChromeUpdateClientConfig::ChromeUpdateClientConfig; diff --git a/browser/importer/brave_external_process_importer_host.cc b/browser/importer/brave_external_process_importer_host.cc index 0f84cabcc9f..20239d529b2 100644 --- a/browser/importer/brave_external_process_importer_host.cc +++ b/browser/importer/brave_external_process_importer_host.cc @@ -6,6 +6,7 @@ #include "brave/browser/importer/brave_external_process_importer_host.h" #include +#include #include #include #include @@ -125,7 +126,7 @@ void BraveExternalProcessImporterHost::ImportExtensions( } void BraveExternalProcessImporterHost::OnGetChromeExtensionsList( - absl::optional> extensions_list) { + std::optional> extensions_list) { if (!extensions_list.has_value()) { ExternalProcessImporterHost::NotifyImportEnded(); return; diff --git a/browser/importer/brave_external_process_importer_host.h b/browser/importer/brave_external_process_importer_host.h index e61ac29fc89..1501e63eab8 100644 --- a/browser/importer/brave_external_process_importer_host.h +++ b/browser/importer/brave_external_process_importer_host.h @@ -6,6 +6,7 @@ #ifndef BRAVE_BROWSER_IMPORTER_BRAVE_EXTERNAL_PROCESS_IMPORTER_HOST_H_ #define BRAVE_BROWSER_IMPORTER_BRAVE_EXTERNAL_PROCESS_IMPORTER_HOST_H_ +#include #include #include @@ -15,7 +16,6 @@ #include "chrome/browser/importer/external_process_importer_host.h" #include "chrome/common/extensions/webstore_install_result.h" #include "extensions/buildflags/buildflags.h" -#include "third_party/abseil-cpp/absl/types/optional.h" class BraveExternalProcessImporterHost : public ExternalProcessImporterHost { public: @@ -55,7 +55,7 @@ class BraveExternalProcessImporterHost : public ExternalProcessImporterHost { #if BUILDFLAG(ENABLE_EXTENSIONS) void LaunchExtensionsImport(); void OnGetChromeExtensionsList( - absl::optional> extensions_list); + std::optional> extensions_list); #endif bool do_not_launch_import_for_testing_ = false; MockedInstallCallback install_extension_callback_for_testing_; diff --git a/browser/importer/extensions_import_helpers.h b/browser/importer/extensions_import_helpers.h index d20e2609a15..cd1479cdc4d 100644 --- a/browser/importer/extensions_import_helpers.h +++ b/browser/importer/extensions_import_helpers.h @@ -11,7 +11,6 @@ #include "base/files/file_util.h" #include "base/values.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave { void ImportStorages(base::FilePath source_profile, diff --git a/browser/importer/test_storage_utils.cc b/browser/importer/test_storage_utils.cc index c86e7da45cd..2d55e3e6007 100644 --- a/browser/importer/test_storage_utils.cc +++ b/browser/importer/test_storage_utils.cc @@ -5,6 +5,7 @@ #include "brave/browser/importer/test_storage_utils.h" +#include #include #include "base/files/file_path.h" @@ -29,17 +30,17 @@ void CreateTestingStore( } } -absl::optional ReadStore(base::FilePath path, - const std::string& id) { +std::optional ReadStore(base::FilePath path, + const std::string& id) { if (!base::DirectoryExists(path)) - return absl::nullopt; + return std::nullopt; auto store_factory = base::MakeRefCounted(path); auto source_store0 = store_factory->CreateValueStore( base::FilePath(extensions::kLocalExtensionSettingsDirectoryName), id); auto store = source_store0->Get(); if (!store.status().ok()) - return absl::nullopt; + return std::nullopt; return store.PassSettings(); } diff --git a/browser/importer/test_storage_utils.h b/browser/importer/test_storage_utils.h index 410e5a15ee1..3d4be9016f0 100644 --- a/browser/importer/test_storage_utils.h +++ b/browser/importer/test_storage_utils.h @@ -6,16 +6,16 @@ #ifndef BRAVE_BROWSER_IMPORTER_TEST_STORAGE_UTILS_H_ #define BRAVE_BROWSER_IMPORTER_TEST_STORAGE_UTILS_H_ +#include #include #include "base/containers/flat_map.h" #include "base/files/file_util.h" #include "base/values.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave { -absl::optional ReadStore(base::FilePath path, - const std::string& id); +std::optional ReadStore(base::FilePath path, + const std::string& id); void CreateTestingStore(base::FilePath path, const std::string& id, const base::flat_map& values); diff --git a/browser/ipfs/content_browser_client_helper.h b/browser/ipfs/content_browser_client_helper.h index 91fdaec5b67..a2bd1521d2c 100644 --- a/browser/ipfs/content_browser_client_helper.h +++ b/browser/ipfs/content_browser_client_helper.h @@ -6,8 +6,9 @@ #ifndef BRAVE_BROWSER_IPFS_CONTENT_BROWSER_CLIENT_HELPER_H_ #define BRAVE_BROWSER_IPFS_CONTENT_BROWSER_CLIENT_HELPER_H_ +#include + #include "content/public/browser/web_contents.h" -#include "third_party/abseil-cpp/absl/types/optional.h" class GURL; @@ -29,7 +30,7 @@ void LoadOrLaunchIPFSURL(const GURL& url, content::WebContents::OnceGetter web_contents_getter, ui::PageTransition page_transition, bool has_user_gesture, - const absl::optional& initiating_origin); + const std::optional& initiating_origin); bool HandleIPFSURLRewrite(GURL* url, content::BrowserContext* browser_context); diff --git a/browser/ipfs/ipfs_dns_resolver_impl.cc b/browser/ipfs/ipfs_dns_resolver_impl.cc index 51436259e76..10db31d5efd 100644 --- a/browser/ipfs/ipfs_dns_resolver_impl.cc +++ b/browser/ipfs/ipfs_dns_resolver_impl.cc @@ -5,6 +5,8 @@ #include "brave/browser/ipfs/ipfs_dns_resolver_impl.h" +#include + #include "base/time/time.h" #include "chrome/browser/net/secure_dns_config.h" #include "chrome/browser/net/system_network_context_manager.h" @@ -57,7 +59,7 @@ void IpfsDnsResolverImpl::OnDnsConfigChanged() { Notify(GetFirstDnsOverHttpsServer()); } -absl::optional IpfsDnsResolverImpl::GetFirstDnsOverHttpsServer() { +std::optional IpfsDnsResolverImpl::GetFirstDnsOverHttpsServer() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); SecureDnsConfig secure_dns_config = SystemNetworkContextManager::GetStubResolverConfigReader() @@ -66,11 +68,11 @@ absl::optional IpfsDnsResolverImpl::GetFirstDnsOverHttpsServer() { const auto servers = secure_dns_config.doh_servers().servers(); if (secure_dns_config.mode() == net::SecureDnsMode::kOff || servers.empty()) { - return absl::nullopt; + return std::nullopt; } std::string server_template = servers[0].server_template(); if (server_template.empty()) { - return absl::nullopt; + return std::nullopt; } return server_template; } diff --git a/browser/ipfs/ipfs_dns_resolver_impl.h b/browser/ipfs/ipfs_dns_resolver_impl.h index 5c708b66edb..bb723c1d028 100644 --- a/browser/ipfs/ipfs_dns_resolver_impl.h +++ b/browser/ipfs/ipfs_dns_resolver_impl.h @@ -6,12 +6,12 @@ #ifndef BRAVE_BROWSER_IPFS_IPFS_DNS_RESOLVER_IMPL_H_ #define BRAVE_BROWSER_IPFS_IPFS_DNS_RESOLVER_IMPL_H_ -#include "brave/components/ipfs/ipfs_dns_resolver.h" - +#include #include #include "base/gtest_prod_util.h" #include "base/sequence_checker.h" +#include "brave/components/ipfs/ipfs_dns_resolver.h" #include "mojo/public/cpp/bindings/receiver.h" #include "mojo/public/cpp/bindings/remote.h" #include "services/network/public/mojom/host_resolver.mojom.h" @@ -33,7 +33,7 @@ class IpfsDnsResolverImpl void OnDnsConfigChanged() override; void OnDnsConfigChangeManagerConnectionError(); - absl::optional GetFirstDnsOverHttpsServer() override; + std::optional GetFirstDnsOverHttpsServer() override; private: FRIEND_TEST_ALL_PREFIXES(IpfsDnsResolverImplUnitTest, ReconnectOnMojoError); diff --git a/browser/ipfs/ipfs_host_resolver.cc b/browser/ipfs/ipfs_host_resolver.cc index bd2282602ea..b16feecf25e 100644 --- a/browser/ipfs/ipfs_host_resolver.cc +++ b/browser/ipfs/ipfs_host_resolver.cc @@ -3,19 +3,20 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include "brave/browser/ipfs/ipfs_host_resolver.h" + +#include #include #include #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" -#include "brave/browser/ipfs/ipfs_host_resolver.h" #include "chrome/browser/net/secure_dns_config.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/storage_partition.h" #include "mojo/public/cpp/bindings/receiver.h" #include "net/base/host_port_pair.h" #include "net/dns/public/dns_protocol.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace { @@ -24,7 +25,7 @@ namespace { const char kDnsLinkHeader[] = "dnslink"; // Expects dns TXT record in format: name=value -absl::optional GetDNSRecordValue( +std::optional GetDNSRecordValue( const std::vector& text_results, const std::string& name) { for (const auto& txt : text_results) { @@ -36,7 +37,7 @@ absl::optional GetDNSRecordValue( continue; return tokens.back(); } - return absl::nullopt; + return std::nullopt; } } // namespace @@ -69,7 +70,7 @@ void IPFSHostResolver::Resolve( receiver_.reset(); resolved_callback_ = std::move(callback); - dnslink_ = absl::nullopt; + dnslink_ = std::nullopt; resolving_host_ = host.host(); net::HostPortPair local_host_port(prefix_ + resolving_host_, host.port()); auto* network_context = GetNetworkContext(); @@ -96,14 +97,14 @@ network::mojom::NetworkContext* IPFSHostResolver::GetNetworkContext() { void IPFSHostResolver::OnComplete( int result, const net::ResolveErrorInfo& error_info, - const absl::optional& list, - const absl::optional& + const std::optional& list, + const std::optional& endpoint_results_with_metadata) { if (result != net::OK) { VLOG(1) << "DNS resolving error:" << net::ErrorToString(result) << " for host: " << prefix_ + resolving_host_; if (resolved_callback_) { - std::move(resolved_callback_).Run(resolving_host_, absl::nullopt); + std::move(resolved_callback_).Run(resolving_host_, std::nullopt); } } } diff --git a/browser/ipfs/ipfs_host_resolver.h b/browser/ipfs/ipfs_host_resolver.h index aab04ebc622..8b63010796c 100644 --- a/browser/ipfs/ipfs_host_resolver.h +++ b/browser/ipfs/ipfs_host_resolver.h @@ -6,6 +6,7 @@ #ifndef BRAVE_BROWSER_IPFS_IPFS_HOST_RESOLVER_H_ #define BRAVE_BROWSER_IPFS_IPFS_HOST_RESOLVER_H_ +#include #include #include #include @@ -36,7 +37,7 @@ class IPFSHostResolver : public network::ResolveHostClientBase { using HostTextResultsCallback = base::OnceCallback& dnslink)>; + const std::optional& dnslink)>; virtual void Resolve(const net::HostPortPair& host, const net::NetworkAnonymizationKey& anonymization_key, @@ -44,7 +45,7 @@ class IPFSHostResolver : public network::ResolveHostClientBase { HostTextResultsCallback callback); std::string host() const { return resolving_host_; } - absl::optional dnslink() const { return dnslink_; } + std::optional dnslink() const { return dnslink_; } void SetNetworkContextForTesting( network::mojom::NetworkContext* network_context) { network_context_for_testing_ = network_context; @@ -54,16 +55,16 @@ class IPFSHostResolver : public network::ResolveHostClientBase { // network::mojom::ResolveHostClient implementation: void OnComplete(int result, const net::ResolveErrorInfo& resolve_error_info, - const absl::optional& resolved_addresses, - const absl::optional& + const std::optional& resolved_addresses, + const std::optional& endpoint_results_with_metadata) override; void OnTextResults(const std::vector& text_results) override; network::mojom::NetworkContext* GetNetworkContext(); std::string resolving_host_; std::string prefix_; - absl::optional dnslink_; - absl::optional network_context_for_testing_; + std::optional dnslink_; + std::optional network_context_for_testing_; raw_ptr browser_context_; HostTextResultsCallback resolved_callback_; diff --git a/browser/ipfs/ipfs_host_resolver_unittest.cc b/browser/ipfs/ipfs_host_resolver_unittest.cc index 6b4b17fb030..ae7d9f7160b 100644 --- a/browser/ipfs/ipfs_host_resolver_unittest.cc +++ b/browser/ipfs/ipfs_host_resolver_unittest.cc @@ -6,12 +6,12 @@ #include "brave/browser/ipfs/ipfs_host_resolver.h" #include +#include #include #include "base/run_loop.h" #include "base/test/bind.h" #include "base/test/task_environment.h" - #include "chrome/browser/net/secure_dns_config.h" #include "chrome/browser/net/stub_resolver_config_reader.h" #include "chrome/browser/net/system_network_context_manager.h" @@ -96,8 +96,8 @@ class FakeHostResolverFail : public FakeHostResolver { pending_response_client) override { mojo::Remote response_client; response_client.Bind(std::move(pending_response_client)); - response_client->OnComplete(-2, net::ResolveErrorInfo(), absl::nullopt, - absl::nullopt); + response_client->OnComplete(-2, net::ResolveErrorInfo(), std::nullopt, + std::nullopt); resolve_host_called_++; } }; @@ -140,7 +140,7 @@ class IPFSHostResolverTest : public testing::Test { void HostResolvedCallback(base::OnceClosure callback, const std::string& expected_host, const std::string& host, - const absl::optional& dnslink) { + const std::optional& dnslink) { EXPECT_EQ(expected_host, host); resolved_callback_called_ = true; if (callback) @@ -231,7 +231,7 @@ TEST_F(IPFSHostResolverTest, SuccessOnReuse) { base::BindLambdaForTesting( [&run_loop, &expected_host]( const std::string& host, - const absl::optional& dnslink) { + const std::optional& dnslink) { EXPECT_EQ(expected_host, host); EXPECT_EQ(dnslink.value(), "abc"); run_loop.Quit(); @@ -257,7 +257,7 @@ TEST_F(IPFSHostResolverTest, ResolutionFailed) { net::DnsQueryType::TXT, base::BindLambdaForTesting( [&run_loop](const std::string& host, - const absl::optional& dnslink) { + const std::optional& dnslink) { EXPECT_FALSE(dnslink); run_loop.Quit(); })); diff --git a/browser/ipfs/ipfs_tab_helper.cc b/browser/ipfs/ipfs_tab_helper.cc index e2f40006bfe..7cb681da2fb 100644 --- a/browser/ipfs/ipfs_tab_helper.cc +++ b/browser/ipfs/ipfs_tab_helper.cc @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -227,10 +228,10 @@ void IPFSTabHelper::HostResolvedCallback( const GURL& current, const GURL& target_url, bool is_gateway_url, - absl::optional x_ipfs_path_header, + std::optional x_ipfs_path_header, const bool auto_redirect_blocked, const std::string& host, - const absl::optional& dnslink) { + const std::optional& dnslink) { // Check if user hasn't redirected to another host while dnslink was resolving if (current.host() != web_contents()->GetVisibleURL().host() || !current.SchemeIsHTTPOrHTTPS()) @@ -334,7 +335,7 @@ GURL IPFSTabHelper::GetIPFSResolvedURL() const { void IPFSTabHelper::CheckDNSLinkRecord( const GURL& target, bool is_gateway_url, - absl::optional x_ipfs_path_header, + std::optional x_ipfs_path_header, const bool& auto_redirect_blocked) { if (!target.SchemeIsHTTPOrHTTPS()) return; @@ -409,7 +410,7 @@ GURL IPFSTabHelper::ResolveXIPFSPathUrl( return TranslateXIPFSPath(x_ipfs_path_header_value).value_or(GURL()); } -absl::optional IPFSTabHelper::ResolveIPFSUrlFromGatewayLikeUrl( +std::optional IPFSTabHelper::ResolveIPFSUrlFromGatewayLikeUrl( const GURL& gurl) { bool api_gateway = IsAPIGateway(gurl, chrome::GetChannel()); auto base_gateway = @@ -420,7 +421,7 @@ absl::optional IPFSTabHelper::ResolveIPFSUrlFromGatewayLikeUrl( return ipfs::ExtractSourceFromGateway(gurl); } - return absl::nullopt; + return std::nullopt; } // For _dnslink we just translate url to ipns:// scheme @@ -464,14 +465,14 @@ void IPFSTabHelper::MaybeCheckDNSLinkRecord( if ((response_code >= net::HttpStatusCode::HTTP_INTERNAL_SERVER_ERROR && response_code <= net::HttpStatusCode::HTTP_VERSION_NOT_SUPPORTED)) { CheckDNSLinkRecord(dnslink_target, possible_redirect.has_value(), - absl::nullopt, auto_redirect_blocked); + std::nullopt, auto_redirect_blocked); } else if (headers->GetNormalizedHeader(kIfpsPathHeader, &normalized_header)) { CheckDNSLinkRecord(dnslink_target, possible_redirect.has_value(), normalized_header, auto_redirect_blocked); } else if (possible_redirect) { CheckDNSLinkRecord(dnslink_target, possible_redirect.has_value(), - absl::nullopt, auto_redirect_blocked); + std::nullopt, auto_redirect_blocked); } } diff --git a/browser/ipfs/ipfs_tab_helper.h b/browser/ipfs/ipfs_tab_helper.h index 64695ffaf9c..2f27cfff1c9 100644 --- a/browser/ipfs/ipfs_tab_helper.h +++ b/browser/ipfs/ipfs_tab_helper.h @@ -7,6 +7,7 @@ #define BRAVE_BROWSER_IPFS_IPFS_TAB_HELPER_H_ #include +#include #include #include #include @@ -18,7 +19,6 @@ #include "components/prefs/pref_change_registrar.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_contents_user_data.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace content { class NavigationHandle; @@ -136,7 +136,7 @@ class IPFSTabHelper : public content::WebContentsObserver, void MaybeCheckDNSLinkRecord(const net::HttpResponseHeaders* headers, const bool& auto_redirect_blocked); void UpdateDnsLinkButtonState(); - absl::optional ResolveIPFSUrlFromGatewayLikeUrl(const GURL& gurl); + std::optional ResolveIPFSUrlFromGatewayLikeUrl(const GURL& gurl); GURL ResolveDNSLinkUrl(const GURL& url); GURL ResolveXIPFSPathUrl(const std::string& x_ipfs_path_header_value); @@ -150,15 +150,15 @@ class IPFSTabHelper : public content::WebContentsObserver, void CheckDNSLinkRecord(const GURL& gurl, bool is_gateway_url, - absl::optional x_ipfs_path_header, + std::optional x_ipfs_path_header, const bool& auto_redirect_blocked); void HostResolvedCallback(const GURL& current, const GURL& url, bool is_gateway_url, - absl::optional x_ipfs_path_header, + std::optional x_ipfs_path_header, const bool auto_redirect_blocked, const std::string& host, - const absl::optional& dnslink); + const std::optional& dnslink); void LoadUrl(const GURL& gurl); diff --git a/browser/ipfs/ipfs_tab_helper_unittest.cc b/browser/ipfs/ipfs_tab_helper_unittest.cc index 94632ca8577..30eaa8f4a4e 100644 --- a/browser/ipfs/ipfs_tab_helper_unittest.cc +++ b/browser/ipfs/ipfs_tab_helper_unittest.cc @@ -5,6 +5,8 @@ #include "brave/browser/ipfs/ipfs_tab_helper.h" +#include + #include "base/memory/raw_ptr.h" #include "brave/components/ipfs/ipfs_utils.h" #include "brave/components/ipfs/pref_names.h" @@ -242,7 +244,7 @@ TEST_F(IpfsTabHelperUnitTest, DNSLinkRecordResolved_AutoRedirectDNSLink) { helper->SetPageURLForTesting(GURL("https://brantly.eth/page?query#ref")); helper->HostResolvedCallback(GURL("https://brantly.eth/page?query#ref"), GURL("https://brantly.eth/page?query#ref"), - false, absl::nullopt, false, "brantly.eth", + false, std::nullopt, false, "brantly.eth", "/ipns/brantly.eth/"); ASSERT_EQ(GURL("ipns://brantly.eth/page?query#ref"), helper->GetIPFSResolvedURL()); diff --git a/browser/ipfs/test/ipfs_service_browsertest.cc b/browser/ipfs/test/ipfs_service_browsertest.cc index 5dbaa6b4fdf..36e95e16890 100644 --- a/browser/ipfs/test/ipfs_service_browsertest.cc +++ b/browser/ipfs/test/ipfs_service_browsertest.cc @@ -4,6 +4,7 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ #include +#include #include #include "base/base64.h" @@ -728,7 +729,7 @@ IN_PROC_BROWSER_TEST_F(IpfsServiceBrowserTest, GetConnectedPeers) { ipfs_service()->GetConnectedPeers( base::BindOnce(&IpfsServiceBrowserTest::OnGetConnectedPeersSuccess, base::Unretained(this)), - absl::nullopt); + std::nullopt); WaitForRequest(); } @@ -739,7 +740,7 @@ IN_PROC_BROWSER_TEST_F(IpfsServiceBrowserTest, GetConnectedPeersServerError) { ipfs_service()->GetConnectedPeers( base::BindOnce(&IpfsServiceBrowserTest::OnGetConnectedPeersFail, base::Unretained(this)), - absl::nullopt); + std::nullopt); WaitForRequest(); } @@ -1696,7 +1697,7 @@ IN_PROC_BROWSER_TEST_F(IpfsServiceBrowserTest, DNSResolversConfig) { } ASSERT_EQ( fake_ipfs_service()->ipfs_dns_resolver_->GetFirstDnsOverHttpsServer(), - absl::nullopt); + std::nullopt); } } diff --git a/browser/net/brave_ad_block_csp_network_delegate_helper.cc b/browser/net/brave_ad_block_csp_network_delegate_helper.cc index 7241acc590a..5921db4b465 100644 --- a/browser/net/brave_ad_block_csp_network_delegate_helper.cc +++ b/browser/net/brave_ad_block_csp_network_delegate_helper.cc @@ -5,6 +5,7 @@ #include "brave/browser/net/brave_ad_block_csp_network_delegate_helper.h" +#include #include #include "brave/browser/brave_browser_process.h" @@ -18,9 +19,9 @@ namespace brave { -absl::optional GetCspDirectivesOnTaskRunner( +std::optional GetCspDirectivesOnTaskRunner( std::shared_ptr ctx, - absl::optional original_csp) { + std::optional original_csp) { std::string source_host; if (ctx->initiator_url.is_valid() && !ctx->initiator_url.host().empty()) { source_host = ctx->initiator_url.host(); @@ -30,10 +31,10 @@ absl::optional GetCspDirectivesOnTaskRunner( // use the request URL as the initiator. source_host = ctx->request_url.host(); } else { - return absl::nullopt; + return std::nullopt; } - absl::optional csp_directives = + std::optional csp_directives = g_brave_browser_process->ad_block_service()->GetCspDirectives( ctx->request_url, ctx->resource_type, source_host); @@ -45,7 +46,7 @@ void OnReceiveCspDirectives( const ResponseCallback& next_callback, std::shared_ptr ctx, scoped_refptr override_response_headers, - absl::optional csp_directives) { + std::optional csp_directives) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); if (csp_directives) { @@ -79,11 +80,11 @@ int OnHeadersReceived_AdBlockCspWork( } std::string original_csp_string; - absl::optional original_csp = absl::nullopt; + std::optional original_csp = std::nullopt; if ((*override_response_headers) ->GetNormalizedHeader("Content-Security-Policy", &original_csp_string)) { - original_csp = absl::optional(original_csp_string); + original_csp = std::optional(original_csp_string); } (*override_response_headers)->RemoveHeader("Content-Security-Policy"); diff --git a/browser/net/brave_ad_block_tp_network_delegate_helper.cc b/browser/net/brave_ad_block_tp_network_delegate_helper.cc index 53ed0e68321..115a8b099ec 100644 --- a/browser/net/brave_ad_block_tp_network_delegate_helper.cc +++ b/browser/net/brave_ad_block_tp_network_delegate_helper.cc @@ -6,6 +6,7 @@ #include "brave/browser/net/brave_ad_block_tp_network_delegate_helper.h" #include +#include #include #include #include @@ -35,7 +36,6 @@ #include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "net/dns/public/dns_query_type.h" #include "services/network/host_resolver.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave { @@ -67,12 +67,12 @@ void UseCnameResult(scoped_refptr task_runner, const ResponseCallback& next_callback, std::shared_ptr ctx, EngineFlags previous_result, - absl::optional cname); + std::optional cname); class AdblockCnameResolveHostClient : public network::mojom::ResolveHostClient { private: mojo::Receiver receiver_{this}; - base::OnceCallback)> cb_; + base::OnceCallback)> cb_; base::TimeTicks start_time_; public: @@ -114,8 +114,8 @@ class AdblockCnameResolveHostClient : public network::mojom::ResolveHostClient { content::WebContents::FromFrameTreeNodeId(ctx->frame_tree_node_id); if (!web_contents) { start_time_ = base::TimeTicks::Now(); - this->OnComplete(net::ERR_FAILED, net::ResolveErrorInfo(), - absl::nullopt, absl::nullopt); + this->OnComplete(net::ERR_FAILED, net::ResolveErrorInfo(), std::nullopt, + std::nullopt); return; } @@ -134,22 +134,22 @@ class AdblockCnameResolveHostClient : public network::mojom::ResolveHostClient { receiver_.set_disconnect_handler(base::BindOnce( &AdblockCnameResolveHostClient::OnComplete, base::Unretained(this), net::ERR_NAME_NOT_RESOLVED, net::ResolveErrorInfo(net::ERR_FAILED), - absl::nullopt, absl::nullopt)); + std::nullopt, std::nullopt)); } void OnComplete(int32_t result, const net::ResolveErrorInfo& resolve_error_info, - const absl::optional& resolved_addresses, - const absl::optional& + const std::optional& resolved_addresses, + const std::optional& endpoint_results_with_metadata) override { UMA_HISTOGRAM_TIMES("Brave.ShieldsCNAMEBlocking.TotalResolutionTime", base::TimeTicks::Now() - start_time_); if (result == net::OK && resolved_addresses) { DCHECK(resolved_addresses.has_value() && !resolved_addresses->empty()); - std::move(cb_).Run(absl::optional( + std::move(cb_).Run(std::optional( GetCanonicalName(resolved_addresses.value().dns_aliases()))); } else { - std::move(cb_).Run(absl::nullopt); + std::move(cb_).Run(std::nullopt); } delete this; @@ -172,7 +172,7 @@ class AdblockCnameResolveHostClient : public network::mojom::ResolveHostClient { EngineFlags ShouldBlockRequestOnTaskRunner( std::shared_ptr ctx, EngineFlags previous_result, - absl::optional canonical_url) { + std::optional canonical_url) { if (!ctx->initiator_url.is_valid()) { return previous_result; } @@ -244,7 +244,7 @@ void UseCnameResult(scoped_refptr task_runner, const ResponseCallback& next_callback, std::shared_ptr ctx, EngineFlags previous_result, - absl::optional cname) { + std::optional cname) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); if (cname.has_value() && ctx->request_url.host() != *cname && @@ -256,7 +256,7 @@ void UseCnameResult(scoped_refptr task_runner, task_runner->PostTaskAndReplyWithResult( FROM_HERE, base::BindOnce(&ShouldBlockRequestOnTaskRunner, ctx, previous_result, - absl::make_optional(canonical_url)), + std::make_optional(canonical_url)), base::BindOnce(&OnShouldBlockRequestResult, false, task_runner, next_callback, ctx)); } else { @@ -351,7 +351,7 @@ void OnBeforeURLRequestAdBlockTP(const ResponseCallback& next_callback, task_runner->PostTaskAndReplyWithResult( FROM_HERE, base::BindOnce(&ShouldBlockRequestOnTaskRunner, ctx, EngineFlags(), - absl::nullopt), + std::nullopt), base::BindOnce(&OnShouldBlockRequestResult, should_check_uncloaked, task_runner, next_callback, ctx)); } diff --git a/browser/net/brave_network_audit_browsertest.cc b/browser/net/brave_network_audit_browsertest.cc index ae9c8ff6719..53437bef551 100644 --- a/browser/net/brave_network_audit_browsertest.cc +++ b/browser/net/brave_network_audit_browsertest.cc @@ -3,6 +3,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include + #include "base/base_paths.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" @@ -93,7 +95,7 @@ bool PerformNetworkAuditProcess(base::Value::List* events) { base::Value::Dict* event_dict = event_value.GetIfDict(); EXPECT_TRUE(event_dict); - absl::optional event_type = event_dict->FindInt("type"); + std::optional event_type = event_dict->FindInt("type"); EXPECT_TRUE(event_type.has_value()); // Showing these helps determine which URL requests which don't @@ -107,7 +109,7 @@ bool PerformNetworkAuditProcess(base::Value::List* events) { EXPECT_TRUE(source_dict); // Consider URL requests only. - absl::optional source_type = source_dict->FindInt("type"); + std::optional source_type = source_dict->FindInt("type"); EXPECT_TRUE(source_type.has_value()); if (static_cast(source_type.value()) != diff --git a/browser/net/brave_proxying_url_loader_factory.cc b/browser/net/brave_proxying_url_loader_factory.cc index 57596965aa5..b779e801b90 100644 --- a/browser/net/brave_proxying_url_loader_factory.cc +++ b/browser/net/brave_proxying_url_loader_factory.cc @@ -5,6 +5,7 @@ #include "brave/browser/net/brave_proxying_url_loader_factory.h" +#include #include #include @@ -59,7 +60,7 @@ net::RedirectInfo CreateRedirectInfo( const network::ResourceRequest& original_request, const GURL& new_url, int response_code, - const absl::optional& referrer_policy_header) { + const std::optional& referrer_policy_header) { // Workaround for a bug in Chromium (crbug.com/1097681). // download_utils.cc do not set update_first_party_url_on_redirect to true // for new ResourceRequests, but we can mitigate it by looking at @@ -180,7 +181,7 @@ void BraveProxyingURLLoaderFactory::InProgressRequest::FollowRedirect( const std::vector& removed_headers, const net::HttpRequestHeaders& modified_headers, const net::HttpRequestHeaders& modified_cors_exempt_headers, - const absl::optional& new_url) { + const std::optional& new_url) { if (new_url) request_.url = new_url.value(); @@ -227,7 +228,7 @@ void BraveProxyingURLLoaderFactory::InProgressRequest::OnReceiveEarlyHints( void BraveProxyingURLLoaderFactory::InProgressRequest::OnReceiveResponse( network::mojom::URLResponseHeadPtr head, mojo::ScopedDataPipeConsumerHandle body, - absl::optional cached_metadata) { + std::optional cached_metadata) { current_response_head_ = std::move(head); current_response_body_ = std::move(body); cached_metadata_ = std::move(cached_metadata); @@ -293,7 +294,7 @@ void BraveProxyingURLLoaderFactory::InProgressRequest:: net::RedirectInfo redirect_info = CreateRedirectInfo(request_, redirect_url_, kInternalRedirectStatusCode, - absl::nullopt /* referrer_policy_header */); + std::nullopt /* referrer_policy_header */); network::mojom::URLResponseHeadPtr head = network::mojom::URLResponseHead::New(); diff --git a/browser/net/brave_proxying_url_loader_factory.h b/browser/net/brave_proxying_url_loader_factory.h index e10444ce3b8..989653e0a6e 100644 --- a/browser/net/brave_proxying_url_loader_factory.h +++ b/browser/net/brave_proxying_url_loader_factory.h @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -35,7 +36,6 @@ #include "services/network/public/mojom/url_loader.mojom.h" #include "services/network/public/mojom/url_loader_factory.mojom.h" #include "services/network/public/mojom/url_response_head.mojom.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h" namespace content { @@ -79,7 +79,7 @@ class BraveProxyingURLLoaderFactory const std::vector& removed_headers, const net::HttpRequestHeaders& modified_headers, const net::HttpRequestHeaders& modified_cors_exempt_headers, - const absl::optional& new_url) override; + const std::optional& new_url) override; void SetPriority(net::RequestPriority priority, int32_t intra_priority_value) override; void PauseReadingBodyFromNet() override; @@ -91,7 +91,7 @@ class BraveProxyingURLLoaderFactory void OnReceiveResponse( network::mojom::URLResponseHeadPtr response_head, mojo::ScopedDataPipeConsumerHandle body, - absl::optional cached_metadata) override; + std::optional cached_metadata) override; void OnReceiveRedirect( const net::RedirectInfo& redirect_info, network::mojom::URLResponseHeadPtr response_head) override; @@ -151,7 +151,7 @@ class BraveProxyingURLLoaderFactory // ExtensionWebRequestEventRouter) through much of the request's lifetime. // That code supports both Network Service and non-Network Service behavior, // which is why this weirdness exists here. - absl::optional cached_metadata_; + std::optional cached_metadata_; network::mojom::URLResponseHeadPtr current_response_head_; mojo::ScopedDataPipeConsumerHandle current_response_body_; scoped_refptr override_headers_; @@ -170,7 +170,7 @@ class BraveProxyingURLLoaderFactory std::vector removed_headers; net::HttpRequestHeaders modified_headers; net::HttpRequestHeaders modified_cors_exempt_headers; - absl::optional new_url; + std::optional new_url; }; std::unique_ptr pending_follow_redirect_params_; diff --git a/browser/net/brave_proxying_web_socket.cc b/browser/net/brave_proxying_web_socket.cc index 643d6f8e1cb..2c64db5c7da 100644 --- a/browser/net/brave_proxying_web_socket.cc +++ b/browser/net/brave_proxying_web_socket.cc @@ -5,6 +5,7 @@ #include "brave/browser/net/brave_proxying_web_socket.h" +#include #include #include "base/containers/flat_set.h" @@ -19,7 +20,6 @@ #include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_process_host.h" #include "net/cookies/site_for_cookies.h" -#include "third_party/abseil-cpp/absl/types/optional.h" BraveProxyingWebSocket::BraveProxyingWebSocket( WebSocketFactory factory, @@ -51,11 +51,11 @@ BraveProxyingWebSocket::~BraveProxyingWebSocket() { } if (on_before_send_headers_callback_) { std::move(on_before_send_headers_callback_) - .Run(net::ERR_ABORTED, absl::nullopt); + .Run(net::ERR_ABORTED, std::nullopt); } if (on_headers_received_callback_) { std::move(on_headers_received_callback_) - .Run(net::ERR_ABORTED, absl::nullopt, absl::nullopt); + .Run(net::ERR_ABORTED, std::nullopt, std::nullopt); } } @@ -65,7 +65,7 @@ BraveProxyingWebSocket* BraveProxyingWebSocket::ProxyWebSocket( content::ContentBrowserClient::WebSocketFactory factory, const GURL& url, const net::SiteForCookies& site_for_cookies, - const absl::optional& user_agent, + const std::optional& user_agent, mojo::PendingRemote handshake_client) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); @@ -262,7 +262,7 @@ void BraveProxyingWebSocket::OnBeforeRequestComplete(int error_code) { void BraveProxyingWebSocket::OnBeforeSendHeadersCompleteFromProxy( int error_code, - const absl::optional& headers) { + const std::optional& headers) { DCHECK(proxy_has_extra_headers() || !receiver_as_handshake_client_.is_bound()); if (error_code != net::OK) { @@ -310,7 +310,7 @@ void BraveProxyingWebSocket::OnBeforeSendHeadersComplete(int error_code) { if (on_before_send_headers_callback_) std::move(on_before_send_headers_callback_) .Run(error_code, - absl::optional(request_.headers)); + std::optional(request_.headers)); if (!proxy_has_extra_headers()) ContinueToStartRequest(error_code); @@ -353,11 +353,11 @@ void BraveProxyingWebSocket::ContinueToStartRequest(int error_code) { void BraveProxyingWebSocket::OnHeadersReceivedCompleteFromProxy( int error_code, - const absl::optional& headers, - const absl::optional& url) { + const std::optional& headers, + const std::optional& url) { if (on_headers_received_callback_) std::move(on_headers_received_callback_) - .Run(net::OK, headers, absl::nullopt); + .Run(net::OK, headers, std::nullopt); if (override_headers_) { response_.headers = override_headers_; @@ -386,7 +386,7 @@ void BraveProxyingWebSocket::OnHeadersReceivedComplete(int error_code) { weak_factory_.GetWeakPtr())); } else { OnHeadersReceivedCompleteFromProxy( - error_code, absl::optional(headers), absl::nullopt); + error_code, std::optional(headers), std::nullopt); } } diff --git a/browser/net/brave_proxying_web_socket.h b/browser/net/brave_proxying_web_socket.h index fe85dcf5d0a..6a3f7efa04c 100644 --- a/browser/net/brave_proxying_web_socket.h +++ b/browser/net/brave_proxying_web_socket.h @@ -7,6 +7,7 @@ #define BRAVE_BROWSER_NET_BRAVE_PROXYING_WEB_SOCKET_H_ #include +#include #include #include @@ -26,7 +27,6 @@ #include "services/network/public/mojom/network_context.mojom.h" #include "services/network/public/mojom/url_response_head.mojom.h" #include "services/network/public/mojom/websocket.mojom.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h" #include "url/origin.h" @@ -66,7 +66,7 @@ class BraveProxyingWebSocket content::ContentBrowserClient::WebSocketFactory factory, const GURL& url, const net::SiteForCookies& site_for_cookies, - const absl::optional& user_agent, + const std::optional& user_agent, mojo::PendingRemote handshake_client); @@ -120,11 +120,11 @@ class BraveProxyingWebSocket void ContinueToHeadersReceived(); void OnBeforeSendHeadersCompleteFromProxy( int error_code, - const absl::optional& headers); + const std::optional& headers); void OnHeadersReceivedCompleteFromProxy( int error_code, - const absl::optional& headers, - const absl::optional& url); + const std::optional& headers, + const std::optional& url); void PauseIncomingMethodCallProcessing(); void ResumeIncomingMethodCallProcessing(); diff --git a/browser/net/decentralized_dns_network_delegate_helper.cc b/browser/net/decentralized_dns_network_delegate_helper.cc index a7e8baaad6b..084a3872cc0 100644 --- a/browser/net/decentralized_dns_network_delegate_helper.cc +++ b/browser/net/decentralized_dns_network_delegate_helper.cc @@ -5,6 +5,7 @@ #include "brave/browser/net/decentralized_dns_network_delegate_helper.h" +#include #include #include @@ -102,7 +103,7 @@ void OnBeforeURLRequest_EnsRedirectWork( void OnBeforeURLRequest_SnsRedirectWork( const brave::ResponseCallback& next_callback, std::shared_ptr ctx, - const absl::optional& url, + const std::optional& url, brave_wallet::mojom::SolanaProviderError error, const std::string& error_message) { if (error == brave_wallet::mojom::SolanaProviderError::kSuccess && url && @@ -118,7 +119,7 @@ void OnBeforeURLRequest_SnsRedirectWork( void OnBeforeURLRequest_UnstoppableDomainsRedirectWork( const brave::ResponseCallback& next_callback, std::shared_ptr ctx, - const absl::optional& url, + const std::optional& url, brave_wallet::mojom::ProviderError error, const std::string& error_message) { if (error == brave_wallet::mojom::ProviderError::kSuccess && url && diff --git a/browser/net/decentralized_dns_network_delegate_helper.h b/browser/net/decentralized_dns_network_delegate_helper.h index 55ec6f25786..201e902d550 100644 --- a/browser/net/decentralized_dns_network_delegate_helper.h +++ b/browser/net/decentralized_dns_network_delegate_helper.h @@ -7,6 +7,7 @@ #define BRAVE_BROWSER_NET_DECENTRALIZED_DNS_NETWORK_DELEGATE_HELPER_H_ #include +#include #include #include @@ -25,7 +26,7 @@ int OnBeforeURLRequest_DecentralizedDnsPreRedirectWork( void OnBeforeURLRequest_UnstoppableDomainsRedirectWork( const brave::ResponseCallback& next_callback, std::shared_ptr ctx, - const absl::optional& url, + const std::optional& url, brave_wallet::mojom::ProviderError error, const std::string& error_message); @@ -40,7 +41,7 @@ void OnBeforeURLRequest_EnsRedirectWork( void OnBeforeURLRequest_SnsRedirectWork( const brave::ResponseCallback& next_callback, std::shared_ptr ctx, - const absl::optional& url, + const std::optional& url, brave_wallet::mojom::SolanaProviderError error, const std::string& error_message); diff --git a/browser/net/global_privacy_control_network_delegate_helper_browsertest.cc b/browser/net/global_privacy_control_network_delegate_helper_browsertest.cc index cffb6ff43ec..78fbf9a8b58 100644 --- a/browser/net/global_privacy_control_network_delegate_helper_browsertest.cc +++ b/browser/net/global_privacy_control_network_delegate_helper_browsertest.cc @@ -3,6 +3,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include + #include "base/feature_list.h" #include "base/path_service.h" #include "base/thread_annotations.h" @@ -15,7 +17,6 @@ #include "content/public/test/browser_test_utils.h" #include "net/dns/mock_host_resolver.h" #include "net/test/embedded_test_server/http_request.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/blink/public/common/features.h" using blink::features::kBraveGlobalPrivacyControl; @@ -94,8 +95,7 @@ class GlobalPrivacyControlNetworkDelegateBrowserTest net::test_server::EmbeddedTestServer https_server_; mutable base::Lock header_result_lock_; bool start_tracking_ GUARDED_BY(header_result_lock_) = false; - absl::optional header_result_ - GUARDED_BY(header_result_lock_); + std::optional header_result_ GUARDED_BY(header_result_lock_); }; // When kGlobalPrivacyControl is enabled, the Sec-GPC flag should appear on diff --git a/browser/net/resource_context_data.cc b/browser/net/resource_context_data.cc index c87e82519a8..892906cc845 100644 --- a/browser/net/resource_context_data.cc +++ b/browser/net/resource_context_data.cc @@ -6,6 +6,7 @@ #include "brave/browser/net/resource_context_data.h" #include +#include #include #include @@ -64,7 +65,7 @@ BraveProxyingWebSocket* ResourceContextData::StartProxyingWebSocket( content::ContentBrowserClient::WebSocketFactory factory, const GURL& url, const net::SiteForCookies& site_for_cookies, - const absl::optional& user_agent, + const std::optional& user_agent, mojo::PendingRemote handshake_client, content::BrowserContext* browser_context, diff --git a/browser/net/resource_context_data.h b/browser/net/resource_context_data.h index 344fe10c6c7..031c8540ef1 100644 --- a/browser/net/resource_context_data.h +++ b/browser/net/resource_context_data.h @@ -8,6 +8,7 @@ #include #include +#include #include #include @@ -71,7 +72,7 @@ class ResourceContextData : public base::SupportsUserData::Data { content::ContentBrowserClient::WebSocketFactory factory, const GURL& url, const net::SiteForCookies& site_for_cookies, - const absl::optional& user_agent, + const std::optional& user_agent, mojo::PendingRemote handshake_client, content::BrowserContext* browser_context, diff --git a/browser/net/url_context.h b/browser/net/url_context.h index e83674af6c4..f4b1ec42d09 100644 --- a/browser/net/url_context.h +++ b/browser/net/url_context.h @@ -7,6 +7,7 @@ #define BRAVE_BROWSER_NET_URL_CONTEXT_H_ #include +#include #include #include @@ -15,7 +16,6 @@ #include "net/http/http_request_headers.h" #include "net/http/http_response_headers.h" #include "net/url_request/referrer_policy.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/blink/public/mojom/loader/resource_load_info.mojom-shared.h" #include "url/gurl.h" @@ -73,9 +73,9 @@ struct BraveRequestInfo { GURL referrer; net::ReferrerPolicy referrer_policy = net::ReferrerPolicy::CLEAR_ON_TRANSITION_FROM_SECURE_TO_INSECURE; - absl::optional new_referrer; + std::optional new_referrer; - absl::optional pending_error; + std::optional pending_error; std::string new_url_spec; // TODO(iefremov): rename to shields_up. bool allow_brave_shields = true; diff --git a/browser/notifications/ads_notification_handler.cc b/browser/notifications/ads_notification_handler.cc index d843f348b76..80e52660c71 100644 --- a/browser/notifications/ads_notification_handler.cc +++ b/browser/notifications/ads_notification_handler.cc @@ -5,6 +5,8 @@ #include "brave/browser/notifications/ads_notification_handler.h" +#include + #include "brave/browser/brave_ads/ads_service_factory.h" #include "url/gurl.h" @@ -41,13 +43,12 @@ void AdsNotificationHandler::OnClose(Profile* profile, ads_service->OnNotificationAdClosed(id, by_user); } -void AdsNotificationHandler::OnClick( - Profile* profile, - const GURL& origin, - const std::string& id, - const absl::optional& action_index, - const absl::optional& reply, - base::OnceClosure completed_closure) { +void AdsNotificationHandler::OnClick(Profile* profile, + const GURL& origin, + const std::string& id, + const std::optional& action_index, + const std::optional& reply, + base::OnceClosure completed_closure) { AdsService* ads_service = AdsServiceFactory::GetForProfile(profile); if (!ads_service) { return; diff --git a/browser/notifications/ads_notification_handler.h b/browser/notifications/ads_notification_handler.h index 74114e4ac7b..89408669267 100644 --- a/browser/notifications/ads_notification_handler.h +++ b/browser/notifications/ads_notification_handler.h @@ -6,12 +6,12 @@ #ifndef BRAVE_BROWSER_NOTIFICATIONS_ADS_NOTIFICATION_HANDLER_H_ #define BRAVE_BROWSER_NOTIFICATIONS_ADS_NOTIFICATION_HANDLER_H_ +#include #include #include "base/functional/callback_forward.h" #include "base/memory/raw_ref.h" #include "chrome/browser/notifications/notification_handler.h" -#include "third_party/abseil-cpp/absl/types/optional.h" class GURL; class Profile; @@ -33,8 +33,8 @@ class AdsNotificationHandler : public NotificationHandler { void OnClick(Profile* profile, const GURL& origin, const std::string& id, - const absl::optional& action_index, - const absl::optional& reply, + const std::optional& action_index, + const std::optional& reply, base::OnceClosure completed_closure) override; void OpenSettings(Profile* profile, const GURL& origin) override; diff --git a/browser/ntp_background/android/ntp_background_images_bridge.cc b/browser/ntp_background/android/ntp_background_images_bridge.cc index 62d2e1120c6..8b4433737b3 100644 --- a/browser/ntp_background/android/ntp_background_images_bridge.cc +++ b/browser/ntp_background/android/ntp_background_images_bridge.cc @@ -9,6 +9,7 @@ #include #include +#include #include #include @@ -246,7 +247,7 @@ NTPBackgroundImagesBridge::GetCurrentWallpaper( const JavaParamRef& obj) { DCHECK_CURRENTLY_ON(BrowserThread::UI); - absl::optional data; + std::optional data; if (view_counter_service_) data = view_counter_service_->GetCurrentWallpaperForDisplay(); diff --git a/browser/ntp_background/android/ntp_background_images_bridge.h b/browser/ntp_background/android/ntp_background_images_bridge.h index fe4a0268224..1d09d0804bb 100644 --- a/browser/ntp_background/android/ntp_background_images_bridge.h +++ b/browser/ntp_background/android/ntp_background_images_bridge.h @@ -12,7 +12,6 @@ #include "brave/components/ntp_background_images/browser/ntp_background_images_service.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h" #include "components/keyed_service/core/keyed_service.h" -#include "third_party/abseil-cpp/absl/types/optional.h" class Profile; diff --git a/browser/ntp_background/ntp_p3a_helper_impl.cc b/browser/ntp_background/ntp_p3a_helper_impl.cc index 4de6dc3d0cd..980e8da7a62 100644 --- a/browser/ntp_background/ntp_p3a_helper_impl.cc +++ b/browser/ntp_background/ntp_p3a_helper_impl.cc @@ -6,6 +6,7 @@ #include "brave/browser/ntp_background/ntp_p3a_helper_impl.h" #include +#include #include #include "base/check.h" @@ -281,7 +282,7 @@ void NTPP3AHelperImpl::UpdateMetricCount( creative_instance_dict->EnsureDict(kInflightDictKey); } - const absl::optional current_value = + const std::optional current_value = creative_instance_dict->FindInt(event_type); const int count = current_value.value_or(0) + 1; diff --git a/browser/ntp_background/ntp_p3a_helper_impl.h b/browser/ntp_background/ntp_p3a_helper_impl.h index c8121e95bd4..98fafa9c0aa 100644 --- a/browser/ntp_background/ntp_p3a_helper_impl.h +++ b/browser/ntp_background/ntp_p3a_helper_impl.h @@ -6,13 +6,12 @@ #ifndef BRAVE_BROWSER_NTP_BACKGROUND_NTP_P3A_HELPER_IMPL_H_ #define BRAVE_BROWSER_NTP_BACKGROUND_NTP_P3A_HELPER_IMPL_H_ -#include "brave/components/ntp_background_images/browser/ntp_p3a_helper.h" - +#include #include #include "base/callback_list.h" #include "base/timer/timer.h" -#include "third_party/abseil-cpp/absl/types/optional.h" +#include "brave/components/ntp_background_images/browser/ntp_p3a_helper.h" class PrefRegistrySimple; class PrefService; @@ -72,7 +71,7 @@ class NTPP3AHelperImpl : public NTPP3AHelper { raw_ptr p3a_service_; raw_ptr prefs_; - absl::optional last_tab_hostname_; + std::optional last_tab_hostname_; base::OneShotTimer landing_check_timer_; diff --git a/browser/permissions/mock_permission_lifetime_prompt.cc b/browser/permissions/mock_permission_lifetime_prompt.cc index 2188975e4a1..80e9ead9815 100644 --- a/browser/permissions/mock_permission_lifetime_prompt.cc +++ b/browser/permissions/mock_permission_lifetime_prompt.cc @@ -5,6 +5,8 @@ #include "brave/browser/permissions/mock_permission_lifetime_prompt.h" +#include + #include "brave/browser/permissions/mock_permission_lifetime_prompt_factory.h" namespace permissions { @@ -37,9 +39,9 @@ void MockPermissionLifetimePrompt::ResetFactory() { factory_ = nullptr; } -absl::optional MockPermissionLifetimePrompt::GetViewBoundsInScreen() +std::optional MockPermissionLifetimePrompt::GetViewBoundsInScreen() const { - return absl::nullopt; + return std::nullopt; } bool MockPermissionLifetimePrompt::ShouldFinalizeRequestAfterDecided() const { diff --git a/browser/permissions/mock_permission_lifetime_prompt.h b/browser/permissions/mock_permission_lifetime_prompt.h index 81a64a754d5..b1ab6648df2 100644 --- a/browser/permissions/mock_permission_lifetime_prompt.h +++ b/browser/permissions/mock_permission_lifetime_prompt.h @@ -6,6 +6,8 @@ #ifndef BRAVE_BROWSER_PERMISSIONS_MOCK_PERMISSION_LIFETIME_PROMPT_H_ #define BRAVE_BROWSER_PERMISSIONS_MOCK_PERMISSION_LIFETIME_PROMPT_H_ +#include + #include "base/memory/raw_ptr.h" #include "components/permissions/permission_prompt.h" @@ -22,7 +24,7 @@ class MockPermissionLifetimePrompt : public PermissionPrompt { bool UpdateAnchor() override; TabSwitchingBehavior GetTabSwitchingBehavior() override; PermissionPromptDisposition GetPromptDisposition() const override; - absl::optional GetViewBoundsInScreen() const override; + std::optional GetViewBoundsInScreen() const override; bool ShouldFinalizeRequestAfterDecided() const override; Delegate* delegate() { return delegate_; } diff --git a/browser/permissions/permission_lifetime_manager_browsertest.cc b/browser/permissions/permission_lifetime_manager_browsertest.cc index 1e207af259f..929ea0c389f 100644 --- a/browser/permissions/permission_lifetime_manager_browsertest.cc +++ b/browser/permissions/permission_lifetime_manager_browsertest.cc @@ -3,10 +3,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include - #include "brave/components/permissions/permission_lifetime_manager.h" +#include +#include + #include "base/command_line.h" #include "base/json/json_file_value_serializer.h" #include "base/path_service.h" @@ -56,11 +57,11 @@ namespace { struct TestCase { const char* address; ContentSettingsType type; - absl::optional permission; + std::optional permission; }; constexpr TestCase kTestCases[] = { - {nullptr, ContentSettingsType::GEOLOCATION, absl::nullopt}, + {nullptr, ContentSettingsType::GEOLOCATION, std::nullopt}, {"0xaf5Ad1E10926C0Ee4af4eDAC61DD60E853753f8A", ContentSettingsType::BRAVE_ETHEREUM, blink::PermissionType::BRAVE_ETHEREUM}, diff --git a/browser/playlist/playlist_data_source.h b/browser/playlist/playlist_data_source.h index b6fe64d4f3d..d90734078d6 100644 --- a/browser/playlist/playlist_data_source.h +++ b/browser/playlist/playlist_data_source.h @@ -11,7 +11,6 @@ #include "base/memory/weak_ptr.h" #include "chrome/browser/ui/webui/favicon_source.h" #include "content/public/browser/url_data_source.h" -#include "third_party/abseil-cpp/absl/types/optional.h" class GURL; class Profile; diff --git a/browser/renderer_context_menu/test/render_view_context_menu_unittest.cc b/browser/renderer_context_menu/test/render_view_context_menu_unittest.cc index fd876f50e09..e8f285343af 100644 --- a/browser/renderer_context_menu/test/render_view_context_menu_unittest.cc +++ b/browser/renderer_context_menu/test/render_view_context_menu_unittest.cc @@ -5,6 +5,8 @@ #include "chrome/browser/renderer_context_menu/render_view_context_menu.h" +#include + #include "brave/app/brave_command_ids.h" #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" #include "chrome/browser/autocomplete/chrome_autocomplete_provider_client.h" @@ -108,7 +110,7 @@ TEST_F(BraveRenderViewContextMenuTest, MenuForPlainText) { content::ContextMenuParams params = CreateSelectedTextParams(u"plain text"); auto context_menu = CreateContextMenu(GetWebContents(), params); EXPECT_TRUE(context_menu); - absl::optional clean_link_index = + std::optional clean_link_index = context_menu->menu_model().GetIndexOfCommandId(IDC_COPY_CLEAN_LINK); EXPECT_FALSE(clean_link_index.has_value()); } @@ -117,7 +119,7 @@ TEST_F(BraveRenderViewContextMenuTest, MenuForSelectedUrl) { content::ContextMenuParams params = CreateSelectedTextParams(u"brave.com"); auto context_menu = CreateContextMenu(GetWebContents(), params); EXPECT_TRUE(context_menu); - absl::optional clean_link_index = + std::optional clean_link_index = context_menu->menu_model().GetIndexOfCommandId(IDC_COPY_CLEAN_LINK); EXPECT_TRUE(clean_link_index.has_value()); EXPECT_TRUE(context_menu->IsCommandIdEnabled(IDC_COPY_CLEAN_LINK)); @@ -128,7 +130,7 @@ TEST_F(BraveRenderViewContextMenuTest, MenuForLink) { CreateLinkParams(GURL("https://brave.com")); auto context_menu = CreateContextMenu(GetWebContents(), params); EXPECT_TRUE(context_menu); - absl::optional clean_link_index = + std::optional clean_link_index = context_menu->menu_model().GetIndexOfCommandId(IDC_COPY_CLEAN_LINK); EXPECT_TRUE(clean_link_index.has_value()); EXPECT_TRUE(context_menu->IsCommandIdEnabled(IDC_COPY_CLEAN_LINK)); diff --git a/browser/test/document_location_browsertest.cc b/browser/test/document_location_browsertest.cc index 2d4f5fda2a7..f9c5ab9f46b 100644 --- a/browser/test/document_location_browsertest.cc +++ b/browser/test/document_location_browsertest.cc @@ -3,6 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include #include #include @@ -64,7 +65,7 @@ IN_PROC_BROWSER_TEST_F(DocumentLocationBrowserTest, content::TestUntrustedDataSourceHeaders headers; std::vector frame_ancestors({"chrome://web-ui"}); headers.frame_ancestors = - absl::make_optional>(std::move(frame_ancestors)); + std::make_optional>(std::move(frame_ancestors)); headers.child_src = "child-src *;"; content::WebUIConfigMap::GetInstance().AddUntrustedWebUIConfig( std::make_unique("test-host", headers)); diff --git a/browser/themes/brave_dark_mode_utils_linux.cc b/browser/themes/brave_dark_mode_utils_linux.cc index ab4b5361459..db70b488d18 100644 --- a/browser/themes/brave_dark_mode_utils_linux.cc +++ b/browser/themes/brave_dark_mode_utils_linux.cc @@ -5,13 +5,15 @@ #include "brave/browser/themes/brave_dark_mode_utils.h" +#include + #include "brave/browser/themes/brave_dark_mode_utils_internal.h" #include "ui/native_theme/native_theme.h" namespace dark_mode { namespace { -absl::optional g_system_dark_mode_prefs; +std::optional g_system_dark_mode_prefs; } // namespace void CacheSystemDarkModePrefs(bool prefer_dark_theme) { diff --git a/browser/ui/brave_browser.cc b/browser/ui/brave_browser.cc index 407be7928da..416eba02fa6 100644 --- a/browser/ui/brave_browser.cc +++ b/browser/ui/brave_browser.cc @@ -6,6 +6,7 @@ #include "brave/browser/ui/brave_browser.h" #include +#include #include #include "brave/browser/brave_browser_features.h" @@ -90,7 +91,7 @@ void BraveBrowser::TabStripEmpty() { base::SequencedTaskRunner::GetCurrentDefault()->PostTask( FROM_HERE, base::BindOnce(&chrome::AddTabAt, this, GetNewTabURL(), -1, - true, absl::nullopt)); + true, std::nullopt)); } bool BraveBrowser::ShouldDisplayFavicon( diff --git a/browser/ui/brave_browser_command_controller.cc b/browser/ui/brave_browser_command_controller.cc index f7dec81d1ca..ae0df6ee3ea 100644 --- a/browser/ui/brave_browser_command_controller.cc +++ b/browser/ui/brave_browser_command_controller.cc @@ -5,6 +5,7 @@ #include "brave/browser/ui/brave_browser_command_controller.h" +#include #include #include @@ -523,7 +524,7 @@ bool BraveBrowserCommandController::ExecuteBraveCommandWithDisposition( #if BUILDFLAG(ENABLE_BRAVE_VPN) void BraveBrowserCommandController::OnPurchasedStateChanged( brave_vpn::mojom::PurchasedState state, - const absl::optional& description) { + const std::optional& description) { UpdateCommandForBraveVPN(); } #endif diff --git a/browser/ui/brave_browser_command_controller.h b/browser/ui/brave_browser_command_controller.h index 0671d16606f..a7af20b4626 100644 --- a/browser/ui/brave_browser_command_controller.h +++ b/browser/ui/brave_browser_command_controller.h @@ -6,6 +6,7 @@ #ifndef BRAVE_BROWSER_UI_BRAVE_BROWSER_COMMAND_CONTROLLER_H_ #define BRAVE_BROWSER_UI_BRAVE_BROWSER_COMMAND_CONTROLLER_H_ +#include #include #include "base/memory/raw_ref.h" @@ -80,7 +81,7 @@ class BraveBrowserCommandController : public chrome::BrowserCommandController // brave_vpn::BraveVPNServiceObserver overrides: void OnPurchasedStateChanged( brave_vpn::mojom::PurchasedState state, - const absl::optional& description) override; + const std::optional& description) override; #endif void InitBraveCommandState(); diff --git a/browser/ui/brave_browser_command_controller_browsertest.cc b/browser/ui/brave_browser_command_controller_browsertest.cc index a8bf93d1199..1435f609210 100644 --- a/browser/ui/brave_browser_command_controller_browsertest.cc +++ b/browser/ui/brave_browser_command_controller_browsertest.cc @@ -3,12 +3,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include "brave/browser/ui/brave_browser_command_controller.h" + #include +#include #include "base/functional/callback_helpers.h" #include "base/test/scoped_feature_list.h" #include "brave/app/brave_command_ids.h" -#include "brave/browser/ui/brave_browser_command_controller.h" #include "brave/browser/ui/browser_commands.h" #include "brave/components/brave_vpn/common/buildflags/buildflags.h" #include "brave/components/skus/common/features.h" @@ -88,7 +90,7 @@ class BraveBrowserCommandControllerTest : public InProcessBrowserTest { // async way. static_cast( browser->command_controller()) - ->OnPurchasedStateChanged(target_state, absl::nullopt); + ->OnPurchasedStateChanged(target_state, std::nullopt); } void CheckBraveVPNCommands(Browser* browser) { diff --git a/browser/ui/brave_icon_with_badge_image_source.cc b/browser/ui/brave_icon_with_badge_image_source.cc index ce7f7ffe52b..c930c7c5b7a 100644 --- a/browser/ui/brave_icon_with_badge_image_source.cc +++ b/browser/ui/brave_icon_with_badge_image_source.cc @@ -6,12 +6,12 @@ #include "brave/browser/ui/brave_icon_with_badge_image_source.h" #include +#include #include #include "base/strings/utf_string_conversions.h" #include "cc/paint/paint_flags.h" #include "chrome/grit/theme_resources.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" @@ -193,16 +193,16 @@ gfx::Rect BraveIconWithBadgeImageSource::GetIconAreaRect() const { return gfx::Rect(size()); } -absl::optional BraveIconWithBadgeImageSource::GetCustomGraphicSize() { +std::optional BraveIconWithBadgeImageSource::GetCustomGraphicSize() { return content_image_size_; } -absl::optional BraveIconWithBadgeImageSource::GetCustomGraphicXOffset() { +std::optional BraveIconWithBadgeImageSource::GetCustomGraphicXOffset() { return std::floor( (image_left_margin_extra_ + size().width() - content_image_size_) / 2.0); } -absl::optional BraveIconWithBadgeImageSource::GetCustomGraphicYOffset() { +std::optional BraveIconWithBadgeImageSource::GetCustomGraphicYOffset() { return std::floor((size().height() - content_image_size_) / 2.0); } diff --git a/browser/ui/brave_icon_with_badge_image_source.h b/browser/ui/brave_icon_with_badge_image_source.h index 40a0422056d..6f304c23fa7 100644 --- a/browser/ui/brave_icon_with_badge_image_source.h +++ b/browser/ui/brave_icon_with_badge_image_source.h @@ -6,6 +6,8 @@ #ifndef BRAVE_BROWSER_UI_BRAVE_ICON_WITH_BADGE_IMAGE_SOURCE_H_ #define BRAVE_BROWSER_UI_BRAVE_ICON_WITH_BADGE_IMAGE_SOURCE_H_ +#include + #include "chrome/browser/ui/extensions/icon_with_badge_image_source.h" namespace gfx { @@ -48,9 +50,9 @@ class BraveIconWithBadgeImageSource : public IconWithBadgeImageSource { gfx::Rect GetIconAreaRect() const override; gfx::Rect GetBadgeRect(size_t badge_width) const; - absl::optional GetCustomGraphicSize() override; - absl::optional GetCustomGraphicXOffset() override; - absl::optional GetCustomGraphicYOffset() override; + std::optional GetCustomGraphicSize() override; + std::optional GetCustomGraphicXOffset() override; + std::optional GetCustomGraphicYOffset() override; bool allow_empty_text_ = false; size_t content_image_size_; diff --git a/browser/ui/brave_layout_constants.cc b/browser/ui/brave_layout_constants.cc index 68d40b86dad..6f75159369f 100644 --- a/browser/ui/brave_layout_constants.cc +++ b/browser/ui/brave_layout_constants.cc @@ -5,6 +5,8 @@ #include "brave/browser/ui/brave_layout_constants.h" +#include + #include "brave/browser/ui/tabs/brave_tab_layout_constants.h" #include "brave/browser/ui/tabs/features.h" #include "chrome/browser/ui/layout_constants.h" @@ -13,7 +15,7 @@ using tabs::features::HorizontalTabsUpdateEnabled; // Returns a |nullopt| if the UI color is not handled by Brave. -absl::optional GetBraveLayoutConstant(LayoutConstant constant) { +std::optional GetBraveLayoutConstant(LayoutConstant constant) { const bool touch = ui::TouchUiController::Get()->touch_ui(); // const bool hybrid = mode == ui::MaterialDesignController::MATERIAL_HYBRID; // const bool touch_optimized_material = @@ -29,7 +31,7 @@ absl::optional GetBraveLayoutConstant(LayoutConstant constant) { } case TABSTRIP_TOOLBAR_OVERLAP: { if (!HorizontalTabsUpdateEnabled()) { - return absl::nullopt; + return std::nullopt; } return 0; } @@ -41,5 +43,5 @@ absl::optional GetBraveLayoutConstant(LayoutConstant constant) { default: break; } - return absl::nullopt; + return std::nullopt; } diff --git a/browser/ui/brave_layout_constants.h b/browser/ui/brave_layout_constants.h index ad2b6950ee8..6044127844e 100644 --- a/browser/ui/brave_layout_constants.h +++ b/browser/ui/brave_layout_constants.h @@ -6,9 +6,10 @@ #ifndef BRAVE_BROWSER_UI_BRAVE_LAYOUT_CONSTANTS_H_ #define BRAVE_BROWSER_UI_BRAVE_LAYOUT_CONSTANTS_H_ -#include "chrome/browser/ui/layout_constants.h" -#include "third_party/abseil-cpp/absl/types/optional.h" +#include -absl::optional GetBraveLayoutConstant(LayoutConstant constant); +#include "chrome/browser/ui/layout_constants.h" + +std::optional GetBraveLayoutConstant(LayoutConstant constant); #endif // BRAVE_BROWSER_UI_BRAVE_LAYOUT_CONSTANTS_H_ diff --git a/browser/ui/sidebar/sidebar_browsertest.cc b/browser/ui/sidebar/sidebar_browsertest.cc index 77384d4a2d0..2c7973ab919 100644 --- a/browser/ui/sidebar/sidebar_browsertest.cc +++ b/browser/ui/sidebar/sidebar_browsertest.cc @@ -3,6 +3,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include + #include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h" @@ -220,7 +222,7 @@ class SidebarBrowserTest : public InProcessBrowserTest { void VerifyTargetDragIndicatorIndexCalc(const gfx::Point& screen_position) { auto sidebar_items_contents_view = GetSidebarItemsContentsView( static_cast(browser())->sidebar_controller()); - EXPECT_NE(absl::nullopt, + EXPECT_NE(std::nullopt, sidebar_items_contents_view->CalculateTargetDragIndicatorIndex( screen_position)); } @@ -252,7 +254,7 @@ class SidebarBrowserTest : public InProcessBrowserTest { IN_PROC_BROWSER_TEST_F(SidebarBrowserTest, BasicTest) { // Initially, active index is not set. - EXPECT_THAT(model()->active_index(), Eq(absl::nullopt)); + EXPECT_THAT(model()->active_index(), Eq(std::nullopt)); // Check sidebar UI is initalized properly. EXPECT_TRUE(!!controller()->sidebar()); @@ -261,13 +263,13 @@ IN_PROC_BROWSER_TEST_F(SidebarBrowserTest, BasicTest) { WaitUntil( base::BindLambdaForTesting([&]() { return !!model()->active_index(); })); // Check active index is non-null. - EXPECT_THAT(model()->active_index(), Ne(absl::nullopt)); + EXPECT_THAT(model()->active_index(), Ne(std::nullopt)); browser()->command_controller()->ExecuteCommand(IDC_TOGGLE_SIDEBAR); WaitUntil( base::BindLambdaForTesting([&]() { return !model()->active_index(); })); // Check active index is null. - EXPECT_THAT(model()->active_index(), Eq(absl::nullopt)); + EXPECT_THAT(model()->active_index(), Eq(std::nullopt)); auto expected_count = GetDefaultItemCount(); EXPECT_EQ(expected_count, model()->GetAllSidebarItems().size()); @@ -284,9 +286,9 @@ IN_PROC_BROWSER_TEST_F(SidebarBrowserTest, BasicTest) { controller()->ActivateItemAt(1); EXPECT_THAT(model()->active_index(), Optional(2u)); - // Setting absl::nullopt means deactivate current active tab. - controller()->ActivateItemAt(absl::nullopt); - EXPECT_THAT(model()->active_index(), Eq(absl::nullopt)); + // Setting std::nullopt means deactivate current active tab. + controller()->ActivateItemAt(std::nullopt); + EXPECT_THAT(model()->active_index(), Eq(std::nullopt)); controller()->ActivateItemAt(2); diff --git a/browser/ui/sidebar/sidebar_controller.cc b/browser/ui/sidebar/sidebar_controller.cc index 7306502c57f..b16bb45cc2a 100644 --- a/browser/ui/sidebar/sidebar_controller.cc +++ b/browser/ui/sidebar/sidebar_controller.cc @@ -5,6 +5,7 @@ #include "brave/browser/ui/sidebar/sidebar_controller.h" +#include #include #include "base/check_op.h" @@ -55,7 +56,7 @@ SidebarController::SidebarController(BraveBrowser* browser, Profile* profile) SidebarController::~SidebarController() = default; -bool SidebarController::IsActiveIndex(absl::optional index) const { +bool SidebarController::IsActiveIndex(std::optional index) const { return sidebar_model_->active_index() == index; } @@ -77,7 +78,7 @@ bool SidebarController::DoesBrowserHaveOpenedTabForItem( return false; } -void SidebarController::ActivateItemAt(absl::optional index, +void SidebarController::ActivateItemAt(std::optional index, WindowOpenDisposition disposition) { // disengaged means there is no active item. if (!index) { diff --git a/browser/ui/sidebar/sidebar_controller.h b/browser/ui/sidebar/sidebar_controller.h index 778f4df6bdc..be9f898e76a 100644 --- a/browser/ui/sidebar/sidebar_controller.h +++ b/browser/ui/sidebar/sidebar_controller.h @@ -7,13 +7,13 @@ #define BRAVE_BROWSER_UI_SIDEBAR_SIDEBAR_CONTROLLER_H_ #include +#include #include #include "base/memory/raw_ptr.h" #include "base/scoped_observation.h" #include "brave/components/sidebar/sidebar_item.h" #include "brave/components/sidebar/sidebar_service.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/base/window_open_disposition.h" class BraveBrowser; @@ -49,7 +49,7 @@ class SidebarController : public SidebarService::Observer { // |disposition| is only valid for shortcut type. If |disposition| is not // CURRENT_TAB, item at |index| is handled based on |disposition|. void ActivateItemAt( - absl::optional index, + std::optional index, WindowOpenDisposition disposition = WindowOpenDisposition::CURRENT_TAB); void AddItemWithCurrentTab(); @@ -63,7 +63,7 @@ class SidebarController : public SidebarService::Observer { // new tab. void LoadAtTab(const GURL& url); - bool IsActiveIndex(absl::optional index) const; + bool IsActiveIndex(std::optional index) const; bool DoesBrowserHaveOpenedTabForItem(const SidebarItem& item) const; void SetSidebar(Sidebar* sidebar); diff --git a/browser/ui/sidebar/sidebar_model.cc b/browser/ui/sidebar/sidebar_model.cc index ff2ad1ace54..002de2fe222 100644 --- a/browser/ui/sidebar/sidebar_model.cc +++ b/browser/ui/sidebar/sidebar_model.cc @@ -5,6 +5,7 @@ #include "brave/browser/ui/sidebar/sidebar_model.h" +#include #include #include @@ -120,7 +121,7 @@ void SidebarModel::OnItemMoved(const SidebarItem& item, if (active_index_is_unaffected) { return; } - absl::optional new_active_index = absl::nullopt; + std::optional new_active_index = std::nullopt; if (active_index_ == from) { new_active_index = to; } else { @@ -142,7 +143,7 @@ void SidebarModel::OnItemUpdated(const SidebarItem& item, void SidebarModel::OnWillRemoveItem(const SidebarItem& item, size_t index) { if (index == active_index_) - UpdateActiveIndexAndNotify(absl::nullopt); + UpdateActiveIndexAndNotify(std::nullopt); } void SidebarModel::OnItemRemoved(const SidebarItem& item, size_t index) { @@ -182,7 +183,7 @@ void SidebarModel::RemoveItemAt(size_t index) { } } -void SidebarModel::SetActiveIndex(absl::optional index) { +void SidebarModel::SetActiveIndex(std::optional index) { if (index == active_index_) return; @@ -197,33 +198,33 @@ bool SidebarModel::IsSidebarHasAllBuiltInItems() const { return GetSidebarService(profile_)->GetHiddenDefaultSidebarItems().empty(); } -absl::optional SidebarModel::GetIndexOf(const SidebarItem& item) const { +std::optional SidebarModel::GetIndexOf(const SidebarItem& item) const { const auto items = GetAllSidebarItems(); const auto iter = base::ranges::find_if(items, [&item](const auto& i) { return (item.built_in_item_type == i.built_in_item_type && item.url == i.url); }); if (iter == items.end()) - return absl::nullopt; + return std::nullopt; return std::distance(items.begin(), iter); } -absl::optional SidebarModel::GetIndexOf( +std::optional SidebarModel::GetIndexOf( SidebarItem::BuiltInItemType type) const { const auto items = GetAllSidebarItems(); const auto iter = base::ranges::find_if(items, [&type](const auto& i) { return IsBuiltInType(i) && (type == i.built_in_item_type); }); if (iter == items.end()) { - return absl::nullopt; + return std::nullopt; } return std::distance(items.begin(), iter); } void SidebarModel::UpdateActiveIndexAndNotify( - absl::optional new_active_index) { + std::optional new_active_index) { if (new_active_index == active_index_) return; diff --git a/browser/ui/sidebar/sidebar_model.h b/browser/ui/sidebar/sidebar_model.h index a3edf2defec..e1e2a96f7b3 100644 --- a/browser/ui/sidebar/sidebar_model.h +++ b/browser/ui/sidebar/sidebar_model.h @@ -7,6 +7,7 @@ #define BRAVE_BROWSER_UI_SIDEBAR_SIDEBAR_MODEL_H_ #include +#include #include #include "base/gtest_prod_util.h" @@ -18,7 +19,6 @@ #include "brave/components/sidebar/sidebar_service.h" #include "components/history/core/browser/history_service.h" #include "components/history/core/browser/history_service_observer.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace base { class CancelableTaskTracker; @@ -58,8 +58,8 @@ class SidebarModel : public SidebarService::Observer, bool user_gesture) {} virtual void OnItemMoved(const SidebarItem& item, size_t from, size_t to) {} virtual void OnItemRemoved(size_t index) {} - virtual void OnActiveIndexChanged(absl::optional old_index, - absl::optional new_index) {} + virtual void OnActiveIndexChanged(std::optional old_index, + std::optional new_index) {} virtual void OnItemUpdated(const SidebarItem& item, const SidebarItemUpdate& update) {} virtual void OnFaviconUpdatedForItem(const SidebarItem& item, @@ -80,19 +80,19 @@ class SidebarModel : public SidebarService::Observer, void AddObserver(Observer* observer); void RemoveObserver(Observer* observer); - void SetActiveIndex(absl::optional index); + void SetActiveIndex(std::optional index); // Returns true if webcontents of item at |index| already loaded url. bool IsSidebarHasAllBuiltInItems() const; - absl::optional GetIndexOf(const SidebarItem& item) const; - absl::optional GetIndexOf(SidebarItem::BuiltInItemType type) const; + std::optional GetIndexOf(const SidebarItem& item) const; + std::optional GetIndexOf(SidebarItem::BuiltInItemType type) const; void FetchFavicon(const sidebar::SidebarItem& item); // Don't cache item list. list can be changed during the runtime. const std::vector& GetAllSidebarItems() const; - // Return absl::nullopt if sidebar panel is not opened. - absl::optional active_index() const { return active_index_; } + // Return std::nullopt if sidebar panel is not opened. + std::optional active_index() const { return active_index_; } // SidebarService::Observer overrides: void OnItemAdded(const SidebarItem& item, size_t index) override; @@ -114,7 +114,7 @@ class SidebarModel : public SidebarService::Observer, // Add item at last. void AddItem(const SidebarItem& item, size_t index, bool user_gesture); void RemoveItemAt(size_t index); - void UpdateActiveIndexAndNotify(absl::optional new_active_index); + void UpdateActiveIndexAndNotify(std::optional new_active_index); // TODO(simonhong): Use separated class for fetching favicon from this model // class. @@ -129,7 +129,7 @@ class SidebarModel : public SidebarService::Observer, const image_fetcher::RequestMetadata& request_metadata); // Optional engaged if sidebar panel is opened. - absl::optional active_index_ = absl::nullopt; + std::optional active_index_ = std::nullopt; const raw_ptr profile_ = nullptr; std::unique_ptr task_tracker_; base::ObserverList observers_; diff --git a/browser/ui/sidebar/sidebar_unittest.cc b/browser/ui/sidebar/sidebar_unittest.cc index 6db3636eb4b..9323c302b90 100644 --- a/browser/ui/sidebar/sidebar_unittest.cc +++ b/browser/ui/sidebar/sidebar_unittest.cc @@ -4,6 +4,7 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ #include +#include #include "base/memory/raw_ptr.h" #include "base/scoped_observation.h" @@ -46,8 +47,8 @@ class MockSidebarModelObserver : public SidebarModel::Observer { MOCK_METHOD(void, OnItemRemoved, (size_t index), (override)); MOCK_METHOD(void, OnActiveIndexChanged, - (absl::optional old_index, - absl::optional new_index), + (std::optional old_index, + std::optional new_index), (override)); MOCK_METHOD(void, OnItemUpdated, @@ -90,7 +91,7 @@ TEST_F(SidebarModelTest, ItemsChangedTest) { model()->Init(nullptr); - EXPECT_THAT(model()->active_index(), Eq(absl::nullopt)); + EXPECT_THAT(model()->active_index(), Eq(std::nullopt)); // Add one more item to test with 5 items. SidebarItem new_item = SidebarItem::Create( @@ -133,7 +134,7 @@ TEST_F(SidebarModelTest, ItemsChangedTest) { service()->items()[2].built_in_item_type); EXPECT_EQ(item_data.url, service()->items()[2].url); EXPECT_EQ(item_data.title, service()->items()[2].title); - EXPECT_THAT(model()->active_index(), Eq(absl::nullopt)); + EXPECT_THAT(model()->active_index(), Eq(std::nullopt)); EXPECT_EQ(items_size, service()->items().size()); model()->SetActiveIndex(1); diff --git a/browser/ui/sidebar/sidebar_utils.cc b/browser/ui/sidebar/sidebar_utils.cc index 1ce9bab48ff..2a786632f0d 100644 --- a/browser/ui/sidebar/sidebar_utils.cc +++ b/browser/ui/sidebar/sidebar_utils.cc @@ -5,6 +5,8 @@ #include "brave/browser/ui/sidebar/sidebar_utils.h" +#include + #include "brave/browser/ui/brave_browser.h" #include "brave/browser/ui/sidebar/sidebar_controller.h" #include "brave/browser/ui/sidebar/sidebar_model.h" @@ -146,12 +148,12 @@ SidePanelEntryId SidePanelIdFromSideBarItem(const SidebarItem& item) { return SidePanelIdFromSideBarItemType(item.built_in_item_type); } -absl::optional AddItemForSidePanelIdIfNeeded(Browser* browser, - SidePanelEntryId id) { +std::optional AddItemForSidePanelIdIfNeeded(Browser* browser, + SidePanelEntryId id) { const auto hidden_default_items = GetSidebarService(browser)->GetHiddenDefaultSidebarItems(); if (hidden_default_items.empty()) { - return absl::nullopt; + return std::nullopt; } for (const auto& item : hidden_default_items) { @@ -161,11 +163,11 @@ absl::optional AddItemForSidePanelIdIfNeeded(Browser* browser, } } - return absl::nullopt; + return std::nullopt; } void SetLastUsedSidePanel(PrefService* prefs, - absl::optional id) { + std::optional id) { BuiltInItemType type = BuiltInItemType::kNone; if (id) { switch (*id) { @@ -189,7 +191,7 @@ void SetLastUsedSidePanel(PrefService* prefs, prefs->SetInteger(kLastUsedBuiltInItemType, static_cast(type)); } -absl::optional GetLastUsedSidePanel(Browser* browser) { +std::optional GetLastUsedSidePanel(Browser* browser) { PrefService* prefs = browser->profile()->GetPrefs(); BuiltInItemType type = static_cast(prefs->GetInteger(kLastUsedBuiltInItemType)); @@ -198,7 +200,7 @@ absl::optional GetLastUsedSidePanel(Browser* browser) { ->sidebar_controller() ->model() ->GetIndexOf(type)) { - return absl::nullopt; + return std::nullopt; } return SidePanelIdFromSideBarItemType(type); } diff --git a/browser/ui/sidebar/sidebar_utils.h b/browser/ui/sidebar/sidebar_utils.h index bffa72d1ba0..1882afb822e 100644 --- a/browser/ui/sidebar/sidebar_utils.h +++ b/browser/ui/sidebar/sidebar_utils.h @@ -6,8 +6,9 @@ #ifndef BRAVE_BROWSER_UI_SIDEBAR_SIDEBAR_UTILS_H_ #define BRAVE_BROWSER_UI_SIDEBAR_SIDEBAR_UTILS_H_ +#include + #include "brave/components/sidebar/sidebar_item.h" -#include "third_party/abseil-cpp/absl/types/optional.h" class Browser; class GURL; @@ -29,12 +30,12 @@ SidePanelEntryId SidePanelIdFromSideBarItemType( SidebarItem::BuiltInItemType type); SidePanelEntryId SidePanelIdFromSideBarItem(const SidebarItem& item); void SetLastUsedSidePanel(PrefService* prefs, - absl::optional id); -absl::optional GetLastUsedSidePanel(Browser* browser); + std::optional id); +std::optional GetLastUsedSidePanel(Browser* browser); // Return the added item if item for |id| is added. -absl::optional AddItemForSidePanelIdIfNeeded(Browser* browser, - SidePanelEntryId id); +std::optional AddItemForSidePanelIdIfNeeded(Browser* browser, + SidePanelEntryId id); bool IsDisabledItemForPrivate(SidebarItem::BuiltInItemType type); bool IsDisabledItemForGuest(SidebarItem::BuiltInItemType type); diff --git a/browser/ui/toolbar/brave_app_menu_model.cc b/browser/ui/toolbar/brave_app_menu_model.cc index 650fb9ec936..530126713df 100644 --- a/browser/ui/toolbar/brave_app_menu_model.cc +++ b/browser/ui/toolbar/brave_app_menu_model.cc @@ -5,6 +5,7 @@ #include "brave/browser/ui/toolbar/brave_app_menu_model.h" +#include #include #include "base/memory/raw_ptr.h" @@ -284,7 +285,7 @@ void BraveAppMenuModel::BuildBrowserSection() { // Bookmarks // Downloads // Extensions - absl::optional bookmark_item_index = + std::optional bookmark_item_index = GetIndexOfCommandId(IDC_BOOKMARKS_MENU); // If bookmark is not used, we don't need to adjust download item. @@ -449,7 +450,7 @@ void BraveAppMenuModel::ExecuteCommand(int id, int event_flags) { if (ipfs_command == -1) return; auto* submenu = ipns_keys_submenu_models_[ipfs_command].get(); - absl::optional command_index = submenu->GetIndexOfCommandId(id); + std::optional command_index = submenu->GetIndexOfCommandId(id); if (!command_index.has_value()) return; auto label = base::UTF16ToUTF8(submenu->GetLabelAt(command_index.value())); @@ -534,7 +535,7 @@ void BraveAppMenuModel::ExecuteIPFSCommand(int id, const std::string& key) { int BraveAppMenuModel::GetSelectedIPFSCommandId(int id) const { for (const auto& it : ipns_keys_submenu_models_) { - absl::optional index = it.second->GetIndexOfCommandId(id); + std::optional index = it.second->GetIndexOfCommandId(id); if (!index.has_value()) continue; return it.first; @@ -591,12 +592,12 @@ size_t BraveAppMenuModel::GetNextIndexOfBraveProductsSection() const { return last_index_of_second_section + 1; } -absl::optional BraveAppMenuModel::GetProperItemIndex( +std::optional BraveAppMenuModel::GetProperItemIndex( std::vector commands_to_check, bool insert_next) const { const size_t commands_size = commands_to_check.size(); for (size_t i = 0; i < commands_size; i++) { - absl::optional item_index = + std::optional item_index = GetIndexOfCommandId(commands_to_check[i]); if (item_index.has_value()) return insert_next ? item_index.value() + 1 : item_index; @@ -604,5 +605,5 @@ absl::optional BraveAppMenuModel::GetProperItemIndex( NOTREACHED() << "At least, a menu item for this command should exist: " << commands_to_check[commands_size - 1]; - return absl::nullopt; + return std::nullopt; } diff --git a/browser/ui/toolbar/brave_app_menu_model.h b/browser/ui/toolbar/brave_app_menu_model.h index aaa56c2a890..306dfff7e28 100644 --- a/browser/ui/toolbar/brave_app_menu_model.h +++ b/browser/ui/toolbar/brave_app_menu_model.h @@ -7,6 +7,7 @@ #define BRAVE_BROWSER_UI_TOOLBAR_BRAVE_APP_MENU_MODEL_H_ #include +#include #include #include #include @@ -15,7 +16,6 @@ #include "brave/components/brave_vpn/common/buildflags/buildflags.h" #include "brave/components/ipfs/buildflags/buildflags.h" #include "chrome/browser/ui/toolbar/app_menu_model.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/base/models/simple_menu_model.h" #if BUILDFLAG(ENABLE_IPFS_LOCAL_NODE) @@ -43,8 +43,8 @@ class BraveAppMenuModel : public AppMenuModel { void ExecuteCommand(int id, int event_flags) override; bool IsCommandIdEnabled(int id) const override; - absl::optional GetProperItemIndex(std::vector commands_to_check, - bool insert_next) const; + std::optional GetProperItemIndex(std::vector commands_to_check, + bool insert_next) const; void BuildTabsAndWindowsSection(); diff --git a/browser/ui/toolbar/brave_app_menu_model_browsertest.cc b/browser/ui/toolbar/brave_app_menu_model_browsertest.cc index 962d16c672d..651994457f2 100644 --- a/browser/ui/toolbar/brave_app_menu_model_browsertest.cc +++ b/browser/ui/toolbar/brave_app_menu_model_browsertest.cc @@ -6,6 +6,7 @@ #include "brave/browser/ui/toolbar/brave_app_menu_model.h" #include +#include #include #include "base/containers/contains.h" @@ -33,7 +34,6 @@ #include "content/public/browser/notification_service.h" #include "content/public/test/browser_test.h" #include "content/public/test/test_utils.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #if BUILDFLAG(ENABLE_BRAVE_VPN) #include "brave/browser/brave_vpn/brave_vpn_service_factory.h" @@ -69,7 +69,7 @@ class BraveAppMenuModelBrowserTest : public InProcessBrowserTest { // async way. static_cast( browser->command_controller()) - ->OnPurchasedStateChanged(target_state, absl::nullopt); + ->OnPurchasedStateChanged(target_state, std::nullopt); } base::test::ScopedFeatureList scoped_feature_list_; @@ -123,7 +123,7 @@ void CheckCommandsAreInOrderInMenuModel( const std::vector& commands_in_order) { std::vector commands_index; for (int id : commands_in_order) { - absl::optional index = model->GetIndexOfCommandId(id); + std::optional index = model->GetIndexOfCommandId(id); EXPECT_TRUE(index.has_value()); commands_index.push_back(index.value()); } diff --git a/browser/ui/toolbar/brave_vpn_menu_model.h b/browser/ui/toolbar/brave_vpn_menu_model.h index 4ef4d238014..078e85409a6 100644 --- a/browser/ui/toolbar/brave_vpn_menu_model.h +++ b/browser/ui/toolbar/brave_vpn_menu_model.h @@ -6,8 +6,9 @@ #ifndef BRAVE_BROWSER_UI_TOOLBAR_BRAVE_VPN_MENU_MODEL_H_ #define BRAVE_BROWSER_UI_TOOLBAR_BRAVE_VPN_MENU_MODEL_H_ +#include + #include "base/memory/raw_ptr.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/base/models/simple_menu_model.h" class Browser; @@ -39,7 +40,7 @@ class BraveVPNMenuModel : public ui::SimpleMenuModel, #if BUILDFLAG(IS_WIN) bool IsTrayIconEnabled() const; #endif // BUILDFLAG(IS_WIN) - absl::optional tray_icon_enabled_for_testing_; + std::optional tray_icon_enabled_for_testing_; raw_ptr profile_prefs_ = nullptr; raw_ptr browser_ = nullptr; }; diff --git a/browser/ui/toolbar/brave_vpn_menu_model_unittest.cc b/browser/ui/toolbar/brave_vpn_menu_model_unittest.cc index cd137a7dd08..ae500fa8c02 100644 --- a/browser/ui/toolbar/brave_vpn_menu_model_unittest.cc +++ b/browser/ui/toolbar/brave_vpn_menu_model_unittest.cc @@ -19,7 +19,6 @@ #include "components/prefs/pref_service.h" #include "components/sync_preferences/testing_pref_service_syncable.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/simple_menu_model.h" diff --git a/browser/ui/views/brave_rewards/tip_panel_bubble_host.cc b/browser/ui/views/brave_rewards/tip_panel_bubble_host.cc index a4d9707dd56..97d0c7c29df 100644 --- a/browser/ui/views/brave_rewards/tip_panel_bubble_host.cc +++ b/browser/ui/views/brave_rewards/tip_panel_bubble_host.cc @@ -6,6 +6,7 @@ #include "brave/browser/ui/views/brave_rewards/tip_panel_bubble_host.h" #include +#include #include #include "brave/browser/brave_rewards/rewards_util.h" @@ -40,7 +41,7 @@ class TipPanelBubbleManager : public BraveWebUIBubbleManager { void MaybeInitPersistentRenderer() override {} base::WeakPtr CreateWebUIBubbleDialog( - const absl::optional& anchor, + const std::optional& anchor, views::BubbleBorder::Arrow arrow) override { set_cached_contents_wrapper(nullptr); return BraveWebUIBubbleManager::CreateWebUIBubbleDialog(anchor, arrow); diff --git a/browser/ui/views/brave_shields/cookie_list_opt_in_bubble_host.cc b/browser/ui/views/brave_shields/cookie_list_opt_in_bubble_host.cc index d11fd753deb..4aef4306a30 100644 --- a/browser/ui/views/brave_shields/cookie_list_opt_in_bubble_host.cc +++ b/browser/ui/views/brave_shields/cookie_list_opt_in_bubble_host.cc @@ -6,6 +6,7 @@ #include "brave/browser/ui/views/brave_shields/cookie_list_opt_in_bubble_host.h" #include +#include #include "base/feature_list.h" #include "base/metrics/histogram_functions.h" @@ -96,7 +97,7 @@ class BubbleManager : public WebUIBubbleManagerT { // WebUIBubbleManagerT: base::WeakPtr CreateWebUIBubbleDialog( - const absl::optional& anchor, + const std::optional& anchor, views::BubbleBorder::Arrow arrow) override { auto dialog_view = WebUIBubbleManagerT::CreateWebUIBubbleDialog(anchor, diff --git a/browser/ui/views/brave_tab_search_bubble_host.h b/browser/ui/views/brave_tab_search_bubble_host.h index a6679e52bdf..f1f41d77837 100644 --- a/browser/ui/views/brave_tab_search_bubble_host.h +++ b/browser/ui/views/brave_tab_search_bubble_host.h @@ -6,6 +6,8 @@ #ifndef BRAVE_BROWSER_UI_VIEWS_BRAVE_TAB_SEARCH_BUBBLE_HOST_H_ #define BRAVE_BROWSER_UI_VIEWS_BRAVE_TAB_SEARCH_BUBBLE_HOST_H_ +#include + #include "chrome/browser/ui/views/tab_search_bubble_host.h" class BraveTabSearchBubbleHost : public TabSearchBubbleHost { @@ -20,7 +22,7 @@ class BraveTabSearchBubbleHost : public TabSearchBubbleHost { bool triggered_by_keyboard_shortcut = false) override; private: - absl::optional arrow_; + std::optional arrow_; }; #endif // BRAVE_BROWSER_UI_VIEWS_BRAVE_TAB_SEARCH_BUBBLE_HOST_H_ diff --git a/browser/ui/views/frame/brave_browser_view.cc b/browser/ui/views/frame/brave_browser_view.cc index 248a50c3aa5..85bc38e3435 100644 --- a/browser/ui/views/frame/brave_browser_view.cc +++ b/browser/ui/views/frame/brave_browser_view.cc @@ -9,6 +9,7 @@ #include #include #include +#include #include #include @@ -58,7 +59,6 @@ #include "chrome/browser/ui/views/toolbar/browser_app_menu_button.h" #include "chrome/common/pref_names.h" #include "extensions/buildflags/buildflags.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/base/accelerators/accelerator.h" #include "ui/base/accelerators/accelerator_manager.h" #include "ui/base/metadata/metadata_header_macros.h" @@ -85,7 +85,7 @@ namespace { -absl::optional g_download_confirm_return_allow_for_testing; +std::optional g_download_confirm_return_allow_for_testing; bool IsUnsupportedCommand(int command_id, Browser* browser) { return chrome::IsRunningInForcedAppMode() && diff --git a/browser/ui/views/frame/vertical_tab_strip_region_view.cc b/browser/ui/views/frame/vertical_tab_strip_region_view.cc index 26af10e5f9f..ae797eacc45 100644 --- a/browser/ui/views/frame/vertical_tab_strip_region_view.cc +++ b/browser/ui/views/frame/vertical_tab_strip_region_view.cc @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -1071,7 +1072,7 @@ void VerticalTabStripRegionView::OnResize(int resize_amount, dest_width = std::clamp(dest_width, tab_style_->GetPinnedWidth() * 3, tab_style_->GetStandardWidth() * 2); if (done_resizing) { - resize_offset_ = absl::nullopt; + resize_offset_ = std::nullopt; } if (*expanded_width_ == dest_width) { diff --git a/browser/ui/views/frame/vertical_tab_strip_region_view.h b/browser/ui/views/frame/vertical_tab_strip_region_view.h index cf17e3800e0..5de3a9ea936 100644 --- a/browser/ui/views/frame/vertical_tab_strip_region_view.h +++ b/browser/ui/views/frame/vertical_tab_strip_region_view.h @@ -7,6 +7,7 @@ #define BRAVE_BROWSER_UI_VIEWS_FRAME_VERTICAL_TAB_STRIP_REGION_VIEW_H_ #include +#include #include "base/functional/callback_helpers.h" #include "base/gtest_prod_util.h" @@ -178,7 +179,7 @@ class VerticalTabStripRegionView : public views::View, raw_ptr new_tab_button_ = nullptr; raw_ptr resize_area_ = nullptr; - absl::optional resize_offset_; + std::optional resize_offset_; // A pointer storing the global tab style to be used. const raw_ptr tab_style_; diff --git a/browser/ui/views/infobars/web_discovery_infobar_content_view.cc b/browser/ui/views/infobars/web_discovery_infobar_content_view.cc index 47b2c644bae..2416169e1be 100644 --- a/browser/ui/views/infobars/web_discovery_infobar_content_view.cc +++ b/browser/ui/views/infobars/web_discovery_infobar_content_view.cc @@ -18,7 +18,6 @@ #include "brave/grit/brave_theme_resources.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/singleton_tabs.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/metadata/metadata_impl_macros.h" #include "ui/base/resource/resource_bundle.h" diff --git a/browser/ui/views/location_bar/brave_location_bar_view.cc b/browser/ui/views/location_bar/brave_location_bar_view.cc index c13ce676f06..041b2c15059 100644 --- a/browser/ui/views/location_bar/brave_location_bar_view.cc +++ b/browser/ui/views/location_bar/brave_location_bar_view.cc @@ -5,6 +5,7 @@ #include "brave/browser/ui/views/location_bar/brave_location_bar_view.h" +#include #include #include "base/containers/contains.h" @@ -33,7 +34,6 @@ #include "components/omnibox/browser/omnibox_edit_model.h" #include "components/version_info/channel.h" #include "content/public/browser/navigation_entry.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/base/metadata/metadata_impl_macros.h" #include "ui/base/resource/resource_bundle.h" #include "ui/compositor/layer.h" @@ -79,10 +79,10 @@ class BraveLocationBarViewFocusRingHighlightPathGenerator } }; -absl::optional GetFocusRingColor(Profile* profile) { +std::optional GetFocusRingColor(Profile* profile) { if (brave::IsRegularProfile(profile) || profile->IsGuestSession()) { // Don't update color. - return absl::nullopt; + return std::nullopt; } // Private or Tor window - use color mixer. return kColorLocationBarFocusRing; diff --git a/browser/ui/views/omnibox/brave_omnibox_view_views.cc b/browser/ui/views/omnibox/brave_omnibox_view_views.cc index fbad9699ae3..35ee3eb292a 100644 --- a/browser/ui/views/omnibox/brave_omnibox_view_views.cc +++ b/browser/ui/views/omnibox/brave_omnibox_view_views.cc @@ -5,6 +5,7 @@ #include "brave/browser/ui/views/omnibox/brave_omnibox_view_views.h" +#include #include #include "brave/app/brave_command_ids.h" @@ -20,7 +21,7 @@ namespace { void BraveUpdateContextMenu(ui::SimpleMenuModel* menu_contents, GURL url) { if (!url.SchemeIsHTTPOrHTTPS()) return; - absl::optional copy_position = + std::optional copy_position = menu_contents->GetIndexOfCommandId(views::Textfield::kCopy); if (!copy_position) return; @@ -31,14 +32,14 @@ void BraveUpdateContextMenu(ui::SimpleMenuModel* menu_contents, GURL url) { BraveOmniboxViewViews::~BraveOmniboxViewViews() = default; -absl::optional BraveOmniboxViewViews::GetURLToCopy() { +std::optional BraveOmniboxViewViews::GetURLToCopy() { GURL url; bool write_url = false; std::u16string selected_text = GetSelectedText(); model()->AdjustTextForCopy(GetSelectedRange().GetMin(), &selected_text, &url, &write_url); if (!write_url) { - return absl::nullopt; + return std::nullopt; } return url; } diff --git a/browser/ui/views/omnibox/brave_omnibox_view_views.h b/browser/ui/views/omnibox/brave_omnibox_view_views.h index 5dca77b58e7..1cb510d6bc5 100644 --- a/browser/ui/views/omnibox/brave_omnibox_view_views.h +++ b/browser/ui/views/omnibox/brave_omnibox_view_views.h @@ -6,8 +6,9 @@ #ifndef BRAVE_BROWSER_UI_VIEWS_OMNIBOX_BRAVE_OMNIBOX_VIEW_VIEWS_H_ #define BRAVE_BROWSER_UI_VIEWS_OMNIBOX_BRAVE_OMNIBOX_VIEW_VIEWS_H_ +#include + #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h" -#include "third_party/abseil-cpp/absl/types/optional.h" class GURL; @@ -23,7 +24,7 @@ class BraveOmniboxViewViews : public OmniboxViewViews { void CleanAndCopySelectedURL(); protected: - absl::optional GetURLToCopy(); + std::optional GetURLToCopy(); void CopySanitizedURL(const GURL& url); #if BUILDFLAG(IS_WIN) // View overrides: diff --git a/browser/ui/views/permission_bubble/brave_wallet_permission_prompt_impl.cc b/browser/ui/views/permission_bubble/brave_wallet_permission_prompt_impl.cc index dc3e4675de1..b55aee34d2a 100644 --- a/browser/ui/views/permission_bubble/brave_wallet_permission_prompt_impl.cc +++ b/browser/ui/views/permission_bubble/brave_wallet_permission_prompt_impl.cc @@ -5,6 +5,8 @@ #include "brave/browser/ui/views/permission_bubble/brave_wallet_permission_prompt_impl.h" +#include + #include "brave/browser/brave_wallet/brave_wallet_tab_helper.h" #include "components/permissions/permission_uma_util.h" @@ -47,9 +49,9 @@ BraveWalletPermissionPromptImpl::GetPromptDisposition() const { return permissions::PermissionPromptDisposition::ANCHORED_BUBBLE; } -absl::optional +std::optional BraveWalletPermissionPromptImpl::GetViewBoundsInScreen() const { - return absl::nullopt; + return std::nullopt; } bool BraveWalletPermissionPromptImpl::ShouldFinalizeRequestAfterDecided() diff --git a/browser/ui/views/permission_bubble/brave_wallet_permission_prompt_impl.h b/browser/ui/views/permission_bubble/brave_wallet_permission_prompt_impl.h index ffeda1ecbc9..cea2d1b948a 100644 --- a/browser/ui/views/permission_bubble/brave_wallet_permission_prompt_impl.h +++ b/browser/ui/views/permission_bubble/brave_wallet_permission_prompt_impl.h @@ -6,6 +6,8 @@ #ifndef BRAVE_BROWSER_UI_VIEWS_PERMISSION_BUBBLE_BRAVE_WALLET_PERMISSION_PROMPT_IMPL_H_ #define BRAVE_BROWSER_UI_VIEWS_PERMISSION_BUBBLE_BRAVE_WALLET_PERMISSION_PROMPT_IMPL_H_ +#include + #include "base/memory/raw_ptr.h" #include "base/time/time.h" #include "components/permissions/permission_prompt.h" @@ -29,7 +31,7 @@ class BraveWalletPermissionPromptImpl : public permissions::PermissionPrompt { TabSwitchingBehavior GetTabSwitchingBehavior() override; permissions::PermissionPromptDisposition GetPromptDisposition() const override; - absl::optional GetViewBoundsInScreen() const override; + std::optional GetViewBoundsInScreen() const override; bool ShouldFinalizeRequestAfterDecided() const override; private: diff --git a/browser/ui/views/profiles/brave_avatar_toolbar_button.cc b/browser/ui/views/profiles/brave_avatar_toolbar_button.cc index 8e7db8179b1..bdf75ffe055 100644 --- a/browser/ui/views/profiles/brave_avatar_toolbar_button.cc +++ b/browser/ui/views/profiles/brave_avatar_toolbar_button.cc @@ -6,6 +6,7 @@ #include "brave/browser/ui/views/profiles/brave_avatar_toolbar_button.h" #include +#include #include #include @@ -25,7 +26,6 @@ #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/profiles/avatar_toolbar_button.h" #include "chrome/browser/ui/views/toolbar/toolbar_ink_drop_util.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/pointer/touch_ui_controller.h" #include "ui/base/theme_provider.h" @@ -53,7 +53,7 @@ class BraveAvatarButtonHighlightPathGenerator const BraveAvatarButtonHighlightPathGenerator&) = delete; ~BraveAvatarButtonHighlightPathGenerator() override = default; - absl::optional GetRoundRect(const gfx::RectF& bounds) override { + std::optional GetRoundRect(const gfx::RectF& bounds) override { gfx::Rect rect(avatar_button_->size()); rect.Inset(GetToolbarInkDropInsets(avatar_button_.get())); DCHECK(avatar_button_); @@ -79,7 +79,7 @@ AvatarToolbarButton::State BraveAvatarToolbarButton::GetAvatarButtonState() void BraveAvatarToolbarButton::SetHighlight( const std::u16string& highlight_text, - absl::optional highlight_color) { + std::optional highlight_color) { std::u16string revised_highlight_text; if (browser_->profile()->IsTor()) { revised_highlight_text = brave_l10n::GetLocalizedResourceUTF16String( diff --git a/browser/ui/views/profiles/brave_avatar_toolbar_button.h b/browser/ui/views/profiles/brave_avatar_toolbar_button.h index ad82c23aa1c..50a54067254 100644 --- a/browser/ui/views/profiles/brave_avatar_toolbar_button.h +++ b/browser/ui/views/profiles/brave_avatar_toolbar_button.h @@ -6,6 +6,8 @@ #ifndef BRAVE_BROWSER_UI_VIEWS_PROFILES_BRAVE_AVATAR_TOOLBAR_BUTTON_H_ #define BRAVE_BROWSER_UI_VIEWS_PROFILES_BRAVE_AVATAR_TOOLBAR_BUTTON_H_ +#include + #include "chrome/browser/ui/views/profiles/avatar_toolbar_button.h" class BrowserView; @@ -21,7 +23,7 @@ class BraveAvatarToolbarButton : public AvatarToolbarButton { // ToolbarButton: void SetHighlight(const std::u16string& highlight_text, - absl::optional highlight_color) override; + std::optional highlight_color) override; void UpdateColorsAndInsets() override; void OnThemeChanged() override; diff --git a/browser/ui/views/profiles/brave_incognito_menu_view.cc b/browser/ui/views/profiles/brave_incognito_menu_view.cc index a4fee0b92f7..cd77cc492ff 100644 --- a/browser/ui/views/profiles/brave_incognito_menu_view.cc +++ b/browser/ui/views/profiles/brave_incognito_menu_view.cc @@ -6,6 +6,7 @@ #include "brave/browser/ui/views/profiles/brave_incognito_menu_view.h" #include +#include #include #include "brave/components/l10n/common/localization_util.h" @@ -74,7 +75,7 @@ void BraveIncognitoMenuView::AddedToWidget() { SetProfileIdentityInfo( /*profile_name=*/std::u16string(), /*profile_background_color=*/SK_ColorTRANSPARENT, - /*edit_button_params=*/absl::nullopt, + /*edit_button_params=*/std::nullopt, ui::ImageModel::FromVectorIcon(kIncognitoProfileIcon, icon_color), brave_l10n::GetLocalizedResourceUTF16String( GetProfileMenuTitleId(browser()->profile())), diff --git a/browser/ui/views/profiles/brave_profile_menu_view.cc b/browser/ui/views/profiles/brave_profile_menu_view.cc index cbdbb5fa1c9..c13c3eabba5 100644 --- a/browser/ui/views/profiles/brave_profile_menu_view.cc +++ b/browser/ui/views/profiles/brave_profile_menu_view.cc @@ -6,6 +6,7 @@ #include "brave/browser/ui/views/profiles/brave_profile_menu_view.h" #include +#include #include #include "brave/browser/profiles/profile_util.h" @@ -35,7 +36,7 @@ void BraveProfileMenuView::BuildIdentity() { SetProfileIdentityInfo( /*profile_name=*/std::u16string(), profile_attributes->GetProfileThemeColors().profile_highlight_color, - /*edit_button_params=*/absl::nullopt, + /*edit_button_params=*/std::nullopt, ui::ImageModel::FromImage(profile_attributes->GetAvatarIcon()), /*title=*/profile_attributes->GetName()); } diff --git a/browser/ui/views/rounded_separator.h b/browser/ui/views/rounded_separator.h index ff29817c211..581457d7102 100644 --- a/browser/ui/views/rounded_separator.h +++ b/browser/ui/views/rounded_separator.h @@ -6,9 +6,9 @@ #ifndef BRAVE_BROWSER_UI_VIEWS_ROUNDED_SEPARATOR_H_ #define BRAVE_BROWSER_UI_VIEWS_ROUNDED_SEPARATOR_H_ +#include #include -#include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/views/view.h" // The RoundedSeparator class is a view that shows a line used to visually @@ -38,7 +38,7 @@ class RoundedSeparator : public views::View { private: int preferred_height_ = kThickness; - absl::optional overridden_color_; + std::optional overridden_color_; }; #endif // BRAVE_BROWSER_UI_VIEWS_ROUNDED_SEPARATOR_H_ diff --git a/browser/ui/views/side_panel/brave_side_panel.cc b/browser/ui/views/side_panel/brave_side_panel.cc index 90d06e6d490..6bbe895d210 100644 --- a/browser/ui/views/side_panel/brave_side_panel.cc +++ b/browser/ui/views/side_panel/brave_side_panel.cc @@ -5,6 +5,8 @@ #include "brave/browser/ui/views/side_panel/brave_side_panel.h" +#include + #include "base/functional/bind.h" #include "base/ranges/algorithm.h" #include "brave/browser/ui/brave_browser.h" @@ -128,7 +130,7 @@ void BraveSidePanel::OnResize(int resize_amount, bool done_resizing) { (IsRightAligned() ? -resize_amount : resize_amount); if (done_resizing) { - starting_width_on_resize_ = absl::nullopt; + starting_width_on_resize_ = std::nullopt; // Before arriving resizing doen event, user could hide sidebar because // resizing done event is arrived a little bit later after user stops // resizing. And resizing done event is arrived as a result of diff --git a/browser/ui/views/side_panel/brave_side_panel.h b/browser/ui/views/side_panel/brave_side_panel.h index 027e6bd0068..a46c9f396cf 100644 --- a/browser/ui/views/side_panel/brave_side_panel.h +++ b/browser/ui/views/side_panel/brave_side_panel.h @@ -7,10 +7,10 @@ #define BRAVE_BROWSER_UI_VIEWS_SIDE_PANEL_BRAVE_SIDE_PANEL_H_ #include +#include #include "base/memory/raw_ptr.h" #include "components/prefs/pref_member.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/base/metadata/metadata_header_macros.h" #include "ui/gfx/geometry/size.h" #include "ui/views/controls/resize_area_delegate.h" @@ -53,7 +53,7 @@ class BraveSidePanel : public views::View, bool IsRightAligned(); gfx::Size GetContentSizeUpperBound() const { return gfx::Size(); } - void set_fixed_contents_width(absl::optional fixed_width) { + void set_fixed_contents_width(std::optional fixed_width) { fixed_contents_width_ = fixed_width; } @@ -76,12 +76,12 @@ class BraveSidePanel : public views::View, void OnSidePanelWidthChanged(); HorizontalAlignment horizontal_alignment_ = kHorizontalAlignLeft; - absl::optional starting_width_on_resize_; + std::optional starting_width_on_resize_; // If this is set, use this width for panel contents during the layout // instead of using this panel's bounds. This is used to prevent panel // contents layout while sidebar show/hide animation is in-progress. - absl::optional fixed_contents_width_; + std::optional fixed_contents_width_; raw_ptr browser_view_ = nullptr; IntegerPrefMember side_panel_width_; std::unique_ptr resize_widget_; diff --git a/browser/ui/views/side_panel/brave_side_panel_coordinator.cc b/browser/ui/views/side_panel/brave_side_panel_coordinator.cc index 679d60e51f0..8ee029bedca 100644 --- a/browser/ui/views/side_panel/brave_side_panel_coordinator.cc +++ b/browser/ui/views/side_panel/brave_side_panel_coordinator.cc @@ -5,6 +5,8 @@ #include "brave/browser/ui/views/side_panel/brave_side_panel_coordinator.h" +#include + #include "brave/browser/ui/sidebar/sidebar_service_factory.h" #include "brave/browser/ui/sidebar/sidebar_utils.h" #include "brave/browser/ui/views/frame/brave_browser_view.h" @@ -14,13 +16,13 @@ namespace { -absl::optional GetDefaultEntryId(Profile* profile) { +std::optional GetDefaultEntryId(Profile* profile) { auto* service = sidebar::SidebarServiceFactory::GetForProfile(profile); auto panel_item = service->GetDefaultPanelItem(); if (panel_item.has_value()) { return SidePanelIdFromSideBarItem(panel_item.value()); } - return absl::nullopt; + return std::nullopt; } } // namespace @@ -33,8 +35,8 @@ BraveSidePanelCoordinator::~BraveSidePanelCoordinator() { } void BraveSidePanelCoordinator::Show( - absl::optional entry_id, - absl::optional open_trigger) { + std::optional entry_id, + std::optional open_trigger) { // Choose Brave's own default, and exclude items that user has removed // from sidebar. If none are enabled, do nothing. auto* profile = browser_view_->GetProfile(); diff --git a/browser/ui/views/side_panel/brave_side_panel_coordinator.h b/browser/ui/views/side_panel/brave_side_panel_coordinator.h index d5870fde789..876cdfea11f 100644 --- a/browser/ui/views/side_panel/brave_side_panel_coordinator.h +++ b/browser/ui/views/side_panel/brave_side_panel_coordinator.h @@ -7,6 +7,7 @@ #define BRAVE_BROWSER_UI_VIEWS_SIDE_PANEL_BRAVE_SIDE_PANEL_COORDINATOR_H_ #include +#include #include "chrome/browser/ui/views/side_panel/side_panel_coordinator.h" // IWYU pragma: export @@ -16,9 +17,9 @@ class BraveSidePanelCoordinator : public SidePanelCoordinator { ~BraveSidePanelCoordinator() override; // SidePanelCoodinator overrides: - void Show(absl::optional entry_id = absl::nullopt, - absl::optional open_trigger = - absl::nullopt) override; + void Show(std::optional entry_id = std::nullopt, + std::optional open_trigger = + std::nullopt) override; void OnTabStripModelChanged( TabStripModel* tab_strip_model, const TabStripModelChange& change, diff --git a/browser/ui/views/sidebar/sidebar_container_view.cc b/browser/ui/views/sidebar/sidebar_container_view.cc index e63280db121..0552533566a 100644 --- a/browser/ui/views/sidebar/sidebar_container_view.cc +++ b/browser/ui/views/sidebar/sidebar_container_view.cc @@ -7,6 +7,7 @@ #include #include +#include #include #include "base/functional/bind.h" @@ -407,7 +408,7 @@ void SidebarContainerView::AnimationProgressed( } void SidebarContainerView::AnimationEnded(const gfx::Animation* animation) { - side_panel_->set_fixed_contents_width(absl::nullopt); + side_panel_->set_fixed_contents_width(std::nullopt); PreferredSizeChanged(); @@ -433,8 +434,8 @@ void SidebarContainerView::AnimationEnded(const gfx::Animation* animation) { } void SidebarContainerView::OnActiveIndexChanged( - absl::optional old_index, - absl::optional new_index) { + std::optional old_index, + std::optional new_index) { DVLOG(1) << "OnActiveIndexChanged: " << (old_index ? std::to_string(*old_index) : "none") << " to " << (new_index ? std::to_string(*new_index) : "none"); @@ -506,7 +507,7 @@ void SidebarContainerView::ShowSidebar(bool show_side_panel) { } width_animation_.Reset(); - side_panel_->set_fixed_contents_width(absl::nullopt); + side_panel_->set_fixed_contents_width(std::nullopt); // Calculate the start & end width for animation. Both are used when // calculating preferred width during the show animation. @@ -597,7 +598,7 @@ void SidebarContainerView::HideSidebar(bool hide_sidebar_control) { } width_animation_.Reset(1.0); - side_panel_->set_fixed_contents_width(absl::nullopt); + side_panel_->set_fixed_contents_width(std::nullopt); // Calculate the start & end width for animation. Both are used when // calculating preferred width during the hide animation. @@ -769,7 +770,7 @@ void SidebarContainerView::OnEntryHidden(SidePanelEntry* entry) { // item because same item should be activated. if (controller->IsActiveIndex(sidebar_index) && side_panel_coordinator_->GetCurrentEntryId() != entry->key().id()) { - controller->ActivateItemAt(absl::nullopt); + controller->ActivateItemAt(std::nullopt); return; } } diff --git a/browser/ui/views/sidebar/sidebar_container_view.h b/browser/ui/views/sidebar/sidebar_container_view.h index e6573c5b68b..d2617da3fd9 100644 --- a/browser/ui/views/sidebar/sidebar_container_view.h +++ b/browser/ui/views/sidebar/sidebar_container_view.h @@ -7,6 +7,7 @@ #define BRAVE_BROWSER_UI_VIEWS_SIDEBAR_SIDEBAR_CONTAINER_VIEW_H_ #include +#include #include "base/memory/raw_ptr.h" #include "base/scoped_multi_source_observation.h" @@ -109,8 +110,8 @@ class SidebarContainerView void OnItemAdded(const sidebar::SidebarItem& item, size_t index, bool user_gesture) override; - void OnActiveIndexChanged(absl::optional old_index, - absl::optional new_index) override; + void OnActiveIndexChanged(std::optional old_index, + std::optional new_index) override; void OnItemRemoved(size_t index) override; // NOTE: If SidePanelEntryObserver could be used from outside of view, diff --git a/browser/ui/views/sidebar/sidebar_item_drag_context.cc b/browser/ui/views/sidebar/sidebar_item_drag_context.cc index a2b8cb11131..3477eaf6ea9 100644 --- a/browser/ui/views/sidebar/sidebar_item_drag_context.cc +++ b/browser/ui/views/sidebar/sidebar_item_drag_context.cc @@ -5,6 +5,8 @@ #include "brave/browser/ui/views/sidebar/sidebar_item_drag_context.h" +#include + SidebarItemDragContext::SidebarItemDragContext() = default; SidebarItemDragContext::~SidebarItemDragContext() = default; @@ -25,9 +27,9 @@ bool SidebarItemDragContext::ShouldMoveItem() const { } void SidebarItemDragContext::Reset() { - source_index_ = absl::nullopt; + source_index_ = std::nullopt; source_ = nullptr; - drag_indicator_index_ = absl::nullopt; + drag_indicator_index_ = std::nullopt; } // static diff --git a/browser/ui/views/sidebar/sidebar_item_drag_context.h b/browser/ui/views/sidebar/sidebar_item_drag_context.h index 1c6bbcc0966..2e9cbb6f69e 100644 --- a/browser/ui/views/sidebar/sidebar_item_drag_context.h +++ b/browser/ui/views/sidebar/sidebar_item_drag_context.h @@ -6,8 +6,9 @@ #ifndef BRAVE_BROWSER_UI_VIEWS_SIDEBAR_SIDEBAR_ITEM_DRAG_CONTEXT_H_ #define BRAVE_BROWSER_UI_VIEWS_SIDEBAR_SIDEBAR_ITEM_DRAG_CONTEXT_H_ +#include + #include "base/memory/raw_ptr.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/gfx/geometry/point.h" namespace views { @@ -25,13 +26,13 @@ class SidebarItemDragContext final { bool ShouldMoveItem() const; - absl::optional source_index() const { return source_index_; } - void set_source_index(absl::optional index) { source_index_ = index; } + std::optional source_index() const { return source_index_; } + void set_source_index(std::optional index) { source_index_ = index; } void set_source(views::View* source) { source_ = source; } views::View* source() const { return source_; } - void set_drag_indicator_index(absl::optional index) { + void set_drag_indicator_index(std::optional index) { drag_indicator_index_ = index; } size_t GetTargetIndex() const; @@ -39,9 +40,9 @@ class SidebarItemDragContext final { void Reset(); private: - absl::optional source_index_ = absl::nullopt; + std::optional source_index_ = std::nullopt; raw_ptr source_ = nullptr; - absl::optional drag_indicator_index_ = absl::nullopt; + std::optional drag_indicator_index_ = std::nullopt; }; #endif // BRAVE_BROWSER_UI_VIEWS_SIDEBAR_SIDEBAR_ITEM_DRAG_CONTEXT_H_ diff --git a/browser/ui/views/sidebar/sidebar_items_contents_view.cc b/browser/ui/views/sidebar/sidebar_items_contents_view.cc index 7b6523eb9cc..88b6abd7545 100644 --- a/browser/ui/views/sidebar/sidebar_items_contents_view.cc +++ b/browser/ui/views/sidebar/sidebar_items_contents_view.cc @@ -5,6 +5,7 @@ #include "brave/browser/ui/views/sidebar/sidebar_items_contents_view.h" +#include #include #include "base/check_is_test.h" @@ -268,8 +269,8 @@ void SidebarItemsContentsView::OnItemRemoved(int index) { } void SidebarItemsContentsView::OnActiveIndexChanged( - absl::optional old_index, - absl::optional new_index) { + std::optional old_index, + std::optional new_index) { if (old_index) { UpdateItemViewStateAt(*old_index, false); } @@ -407,7 +408,7 @@ void SidebarItemsContentsView::ClearDragIndicator() { } } -absl::optional +std::optional SidebarItemsContentsView::CalculateTargetDragIndicatorIndex( const gfx::Point& screen_position) { // Find which item view includes this |screen_position|. @@ -441,10 +442,10 @@ SidebarItemsContentsView::CalculateTargetDragIndicatorIndex( } NOTREACHED(); - return absl::nullopt; + return std::nullopt; } -absl::optional SidebarItemsContentsView::DrawDragIndicator( +std::optional SidebarItemsContentsView::DrawDragIndicator( views::View* source, const gfx::Point& position) { auto source_view_index = GetIndexOf(source); @@ -463,7 +464,7 @@ absl::optional SidebarItemsContentsView::DrawDragIndicator( } void SidebarItemsContentsView::DoDrawDragIndicator( - absl::optional index) { + std::optional index) { // Clear current drag indicator. ClearDragIndicator(); diff --git a/browser/ui/views/sidebar/sidebar_items_contents_view.h b/browser/ui/views/sidebar/sidebar_items_contents_view.h index e007ee394a3..219e469bbb8 100644 --- a/browser/ui/views/sidebar/sidebar_items_contents_view.h +++ b/browser/ui/views/sidebar/sidebar_items_contents_view.h @@ -7,6 +7,7 @@ #define BRAVE_BROWSER_UI_VIEWS_SIDEBAR_SIDEBAR_ITEMS_CONTENTS_VIEW_H_ #include +#include #include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" @@ -66,8 +67,8 @@ class SidebarItemsContentsView : public views::View, bool user_gesture); void OnItemMoved(const sidebar::SidebarItem& item, int from, int to); void OnItemRemoved(int index); - void OnActiveIndexChanged(absl::optional old_index, - absl::optional new_index); + void OnActiveIndexChanged(std::optional old_index, + std::optional new_index); void ShowItemAddedFeedbackBubble(size_t added_item_index); @@ -79,8 +80,8 @@ class SidebarItemsContentsView : public views::View, // |source| is drag source view. // |position| is in local coordinate space of |source|. // Returns drag indicator index. - absl::optional DrawDragIndicator(views::View* source, - const gfx::Point& position); + std::optional DrawDragIndicator(views::View* source, + const gfx::Point& position); void ClearDragIndicator(); bool IsBubbleVisible() const; @@ -114,8 +115,8 @@ class SidebarItemsContentsView : public views::View, // When item count is five, drag indicator is drawn in front of first item. // If |index| is 5, it's drawn after the last item. // Pass -1 to remove indicator. - void DoDrawDragIndicator(absl::optional index); - absl::optional CalculateTargetDragIndicatorIndex( + void DoDrawDragIndicator(std::optional index); + std::optional CalculateTargetDragIndicatorIndex( const gfx::Point& screen_position); SidebarItemView* GetItemViewAt(size_t index); void LaunchEditItemDialog(); diff --git a/browser/ui/views/sidebar/sidebar_items_scroll_view.cc b/browser/ui/views/sidebar/sidebar_items_scroll_view.cc index e43defddb03..2319f2786a5 100644 --- a/browser/ui/views/sidebar/sidebar_items_scroll_view.cc +++ b/browser/ui/views/sidebar/sidebar_items_scroll_view.cc @@ -5,6 +5,7 @@ #include "brave/browser/ui/views/sidebar/sidebar_items_scroll_view.h" +#include #include #include "base/functional/bind.h" @@ -200,7 +201,7 @@ void SidebarItemsScrollView::OnBoundsAnimatorDone( CHECK(lastly_added_item_index_.has_value()); contents_view_->ShowItemAddedFeedbackBubble(*lastly_added_item_index_); UpdateArrowViewsEnabledState(); - lastly_added_item_index_ = absl::nullopt; + lastly_added_item_index_ = std::nullopt; } } @@ -239,8 +240,8 @@ void SidebarItemsScrollView::OnItemRemoved(size_t index) { } void SidebarItemsScrollView::OnActiveIndexChanged( - absl::optional old_index, - absl::optional new_index) { + std::optional old_index, + std::optional new_index) { contents_view_->OnActiveIndexChanged(old_index, new_index); } @@ -476,7 +477,7 @@ void SidebarItemsScrollView::OnDragExited() { void SidebarItemsScrollView::ClearDragIndicator() { contents_view_->ClearDragIndicator(); - drag_context_->set_drag_indicator_index(absl::nullopt); + drag_context_->set_drag_indicator_index(std::nullopt); } int SidebarItemsScrollView::OnDragUpdated(const ui::DropTargetEvent& event) { @@ -553,7 +554,7 @@ bool SidebarItemsScrollView::CanStartDragForView(views::View* sender, } bool SidebarItemsScrollView::IsItemReorderingInProgress() const { - return drag_context_->source_index() != absl::nullopt; + return drag_context_->source_index() != std::nullopt; } bool SidebarItemsScrollView::IsBubbleVisible() const { diff --git a/browser/ui/views/sidebar/sidebar_items_scroll_view.h b/browser/ui/views/sidebar/sidebar_items_scroll_view.h index 9d7cd26419b..8db08f9941b 100644 --- a/browser/ui/views/sidebar/sidebar_items_scroll_view.h +++ b/browser/ui/views/sidebar/sidebar_items_scroll_view.h @@ -7,6 +7,7 @@ #define BRAVE_BROWSER_UI_VIEWS_SIDEBAR_SIDEBAR_ITEMS_SCROLL_VIEW_H_ #include +#include #include #include "base/memory/raw_ptr.h" @@ -14,7 +15,6 @@ #include "base/scoped_multi_source_observation.h" #include "base/scoped_observation.h" #include "brave/browser/ui/sidebar/sidebar_model.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/base/clipboard/clipboard.h" #include "ui/views/animation/bounds_animator.h" #include "ui/views/animation/bounds_animator_observer.h" @@ -85,8 +85,8 @@ class SidebarItemsScrollView : public views::View, size_t from, size_t to) override; void OnItemRemoved(size_t index) override; - void OnActiveIndexChanged(absl::optional old_index, - absl::optional new_index) override; + void OnActiveIndexChanged(std::optional old_index, + std::optional new_index) override; void OnItemUpdated(const sidebar::SidebarItem& item, const sidebar::SidebarItemUpdate& update) override; void OnFaviconUpdatedForItem(const sidebar::SidebarItem& item, @@ -129,7 +129,7 @@ class SidebarItemsScrollView : public views::View, bool IsInVisibleContentsViewBounds(const gfx::Point& position) const; void ClearDragIndicator(); - absl::optional lastly_added_item_index_; + std::optional lastly_added_item_index_; raw_ptr browser_ = nullptr; raw_ptr up_arrow_ = nullptr; raw_ptr down_arrow_ = nullptr; diff --git a/browser/ui/views/tabs/brave_compound_tab_container.cc b/browser/ui/views/tabs/brave_compound_tab_container.cc index 1fabd1464f0..649eca4b653 100644 --- a/browser/ui/views/tabs/brave_compound_tab_container.cc +++ b/browser/ui/views/tabs/brave_compound_tab_container.cc @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -386,8 +387,8 @@ void BraveCompoundTabContainer::ChildPreferredSizeChanged(views::View* child) { } void BraveCompoundTabContainer::SetActiveTab( - absl::optional prev_active_index, - absl::optional new_active_index) { + std::optional prev_active_index, + std::optional new_active_index) { CompoundTabContainer::SetActiveTab(prev_active_index, new_active_index); if (new_active_index.has_value()) { ScrollTabToBeVisible(*new_active_index); diff --git a/browser/ui/views/tabs/brave_compound_tab_container.h b/browser/ui/views/tabs/brave_compound_tab_container.h index b23b3633c07..75730a07a7d 100644 --- a/browser/ui/views/tabs/brave_compound_tab_container.h +++ b/browser/ui/views/tabs/brave_compound_tab_container.h @@ -7,6 +7,7 @@ #define BRAVE_BROWSER_UI_VIEWS_TABS_BRAVE_COMPOUND_TAB_CONTAINER_H_ #include +#include #include "chrome/browser/ui/views/tabs/compound_tab_container.h" @@ -51,8 +52,8 @@ class BraveCompoundTabContainer : public CompoundTabContainer { void OnThemeChanged() override; void PaintChildren(const views::PaintInfo& info) override; void ChildPreferredSizeChanged(views::View* child) override; - void SetActiveTab(absl::optional prev_active_index, - absl::optional new_active_index) override; + void SetActiveTab(std::optional prev_active_index, + std::optional new_active_index) override; // BrowserRootView::DropTarget BrowserRootView::DropTarget* GetDropTarget( diff --git a/browser/ui/views/tabs/brave_tab.cc b/browser/ui/views/tabs/brave_tab.cc index 03fa6bb5430..0ded2e16e03 100644 --- a/browser/ui/views/tabs/brave_tab.cc +++ b/browser/ui/views/tabs/brave_tab.cc @@ -6,6 +6,7 @@ #include "brave/browser/ui/views/tabs/brave_tab.h" #include +#include #include "brave/browser/ui/tabs/brave_tab_layout_constants.h" #include "brave/browser/ui/tabs/brave_tab_prefs.h" @@ -79,7 +80,7 @@ void BraveTab::ActiveStateChanged() { UpdateShadowForActiveTab(); } -absl::optional BraveTab::GetGroupColor() const { +std::optional BraveTab::GetGroupColor() const { // Hide tab border with group color as it doesn't go well with vertical tabs. if (tabs::utils::ShouldShowVerticalTabs(controller()->GetBrowser())) { return {}; diff --git a/browser/ui/views/tabs/brave_tab.h b/browser/ui/views/tabs/brave_tab.h index d2c63729124..fea3d5bf375 100644 --- a/browser/ui/views/tabs/brave_tab.h +++ b/browser/ui/views/tabs/brave_tab.h @@ -7,6 +7,7 @@ #define BRAVE_BROWSER_UI_VIEWS_TABS_BRAVE_TAB_H_ #include +#include #include #include "chrome/browser/ui/views/tabs/tab.h" @@ -31,7 +32,7 @@ class BraveTab : public Tab { void ActiveStateChanged() override; - absl::optional GetGroupColor() const override; + std::optional GetGroupColor() const override; void UpdateIconVisibility() override; bool ShouldRenderAsNormalTab() const override; diff --git a/browser/ui/views/tabs/brave_tab_container.cc b/browser/ui/views/tabs/brave_tab_container.cc index 36d8bdf97c4..9dc9365c8b1 100644 --- a/browser/ui/views/tabs/brave_tab_container.cc +++ b/browser/ui/views/tabs/brave_tab_container.cc @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -124,8 +125,8 @@ gfx::Size BraveTabContainer::CalculatePreferredSize() const { const auto slots_bounds = layout_helper_->CalculateIdealBounds( available_width_callback_.is_null() || base::FeatureList::IsEnabled(features::kScrollableTabStrip) - ? absl::nullopt - : absl::optional(available_width_callback_.Run())); + ? std::nullopt + : std::optional(available_width_callback_.Run())); height = std::max(height, slots_bounds.empty() ? 0 : slots_bounds.back().bottom()); @@ -175,7 +176,7 @@ gfx::Rect BraveTabContainer::GetTargetBoundsForClosingTab( return target_bounds; } -void BraveTabContainer::EnterTabClosingMode(absl::optional override_width, +void BraveTabContainer::EnterTabClosingMode(std::optional override_width, CloseTabSource source) { // Don't shrink vertical tab strip's width if (tabs::utils::ShouldShowVerticalTabs(tab_slot_controller_->GetBrowser())) { @@ -428,7 +429,7 @@ void BraveTabContainer::DropArrow::OnWidgetDestroying(views::Widget* widget) { } void BraveTabContainer::HandleDragUpdate( - const absl::optional& index) { + const std::optional& index) { if (!tabs::utils::ShouldShowVerticalTabs( tab_slot_controller_->GetBrowser())) { TabContainerImpl::HandleDragUpdate(index); @@ -551,9 +552,9 @@ gfx::ImageSkia* BraveTabContainer::GetDropArrowImage( } void BraveTabContainer::SetDropArrow( - const absl::optional& index) { + const std::optional& index) { if (!index) { - controller_->OnDropIndexUpdate(absl::nullopt, false); + controller_->OnDropIndexUpdate(std::nullopt, false); drop_arrow_.reset(); return; } diff --git a/browser/ui/views/tabs/brave_tab_container.h b/browser/ui/views/tabs/brave_tab_container.h index 80ab5e929ff..910e3c94c48 100644 --- a/browser/ui/views/tabs/brave_tab_container.h +++ b/browser/ui/views/tabs/brave_tab_container.h @@ -7,10 +7,10 @@ #define BRAVE_BROWSER_UI_VIEWS_TABS_BRAVE_TAB_CONTAINER_H_ #include - -#include "chrome/browser/ui/views/tabs/tab_container_impl.h" +#include #include "chrome/browser/ui/tabs/tab_style.h" +#include "chrome/browser/ui/views/tabs/tab_container_impl.h" #include "chrome/browser/ui/views/tabs/tab_drag_context.h" class BraveTabContainer : public TabContainerImpl { @@ -36,7 +36,7 @@ class BraveTabContainer : public TabContainerImpl { void UpdateClosingModeOnRemovedTab(int model_index, bool was_active) override; gfx::Rect GetTargetBoundsForClosingTab(Tab* tab, int former_model_index) const override; - void EnterTabClosingMode(absl::optional override_width, + void EnterTabClosingMode(std::optional override_width, CloseTabSource source) override; bool ShouldTabBeVisible(const Tab* tab) const override; void StartInsertTabAnimation(int model_index) override; @@ -49,7 +49,7 @@ class BraveTabContainer : public TabContainerImpl { BrowserRootView::DropIndex GetDropIndex( const ui::DropTargetEvent& event) override; void HandleDragUpdate( - const absl::optional& index) override; + const std::optional& index) override; void HandleDragExited() override; private: @@ -101,7 +101,7 @@ class BraveTabContainer : public TabContainerImpl { void OnUnlockLayout(); - void SetDropArrow(const absl::optional& index); + void SetDropArrow(const std::optional& index); gfx::Rect GetDropBounds(int drop_index, bool drop_before, bool drop_in_group, diff --git a/browser/ui/views/tabs/brave_tab_group_header.cc b/browser/ui/views/tabs/brave_tab_group_header.cc index 3a81d2ce6f8..0b6479f5579 100644 --- a/browser/ui/views/tabs/brave_tab_group_header.cc +++ b/browser/ui/views/tabs/brave_tab_group_header.cc @@ -5,6 +5,8 @@ #include "brave/browser/ui/views/tabs/brave_tab_group_header.h" +#include + #include "brave/browser/ui/color/brave_color_id.h" #include "brave/browser/ui/tabs/brave_tab_layout_constants.h" #include "brave/browser/ui/tabs/features.h" @@ -116,7 +118,7 @@ SkColor BraveTabGroupHeader::GetGroupColor() const { tab_slot_controller_->GetGroupColorId(group_id)); } -absl::optional BraveTabGroupHeader::GetChipBackgroundColor() const { +std::optional BraveTabGroupHeader::GetChipBackgroundColor() const { if (ShouldShowVerticalTabs()) { return {}; } diff --git a/browser/ui/views/tabs/brave_tab_group_header.h b/browser/ui/views/tabs/brave_tab_group_header.h index a8358f41df6..9a01e62c378 100644 --- a/browser/ui/views/tabs/brave_tab_group_header.h +++ b/browser/ui/views/tabs/brave_tab_group_header.h @@ -6,8 +6,9 @@ #ifndef BRAVE_BROWSER_UI_VIEWS_TABS_BRAVE_TAB_GROUP_HEADER_H_ #define BRAVE_BROWSER_UI_VIEWS_TABS_BRAVE_TAB_GROUP_HEADER_H_ +#include + #include "chrome/browser/ui/views/tabs/tab_group_header.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace tab_groups { class TabGroupId; @@ -32,7 +33,7 @@ class BraveTabGroupHeader : public TabGroupHeader { bool ShouldShowVerticalTabs() const; void LayoutTitleChipForVerticalTabs(); SkColor GetGroupColor() const; - absl::optional GetChipBackgroundColor() const; + std::optional GetChipBackgroundColor() const; }; #endif // BRAVE_BROWSER_UI_VIEWS_TABS_BRAVE_TAB_GROUP_HEADER_H_ diff --git a/browser/ui/views/tabs/brave_tab_strip.cc b/browser/ui/views/tabs/brave_tab_strip.cc index 7bc6d845209..7b22c275e46 100644 --- a/browser/ui/views/tabs/brave_tab_strip.cc +++ b/browser/ui/views/tabs/brave_tab_strip.cc @@ -6,6 +6,7 @@ #include "brave/browser/ui/views/tabs/brave_tab_strip.h" #include +#include #include #include "brave/browser/profiles/profile_util.h" @@ -203,7 +204,7 @@ SkColor BraveTabStrip::GetTabSeparatorColor() const { : SkColorSetRGB(0xBE, 0xBF, 0xBF); } -absl::optional BraveTabStrip::GetCustomBackgroundId( +std::optional BraveTabStrip::GetCustomBackgroundId( BrowserFrameActiveState active_state) const { if (!ShouldShowVerticalTabs()) { return TabStrip::GetCustomBackgroundId(active_state); diff --git a/browser/ui/views/tabs/brave_tab_strip.h b/browser/ui/views/tabs/brave_tab_strip.h index d49a8592157..7cddd6d6481 100644 --- a/browser/ui/views/tabs/brave_tab_strip.h +++ b/browser/ui/views/tabs/brave_tab_strip.h @@ -7,6 +7,7 @@ #define BRAVE_BROWSER_UI_VIEWS_TABS_BRAVE_TAB_STRIP_H_ #include +#include #include "base/gtest_prod_util.h" #include "chrome/browser/ui/views/tabs/tab_strip.h" @@ -30,7 +31,7 @@ class BraveTabStrip : public TabStrip { const ui::LocatedEvent& event, const ui::ListSelectionModel& original_selection) override; void AddedToWidget() override; - absl::optional GetCustomBackgroundId( + std::optional GetCustomBackgroundId( BrowserFrameActiveState active_state) const override; private: diff --git a/browser/ui/views/tabs/brave_tab_strip_layout_helper.cc b/browser/ui/views/tabs/brave_tab_strip_layout_helper.cc index ce1bcef6113..23c07c7d0ad 100644 --- a/browser/ui/views/tabs/brave_tab_strip_layout_helper.cc +++ b/browser/ui/views/tabs/brave_tab_strip_layout_helper.cc @@ -6,6 +6,7 @@ #include "brave/browser/ui/views/tabs/brave_tab_strip_layout_helper.h" #include +#include #include "brave/browser/ui/tabs/brave_tab_layout_constants.h" #include "brave/browser/ui/tabs/features.h" @@ -27,7 +28,7 @@ namespace { void CalculatePinnedTabsBoundsInGrid( const TabLayoutConstants& layout_constants, const std::vector& tabs, - absl::optional width, + std::optional width, bool is_floating_mode, std::vector* result) { DCHECK(tabs.size()); @@ -70,7 +71,7 @@ void CalculatePinnedTabsBoundsInGrid( void CalculateVerticalLayout(const TabLayoutConstants& layout_constants, const std::vector& tabs, - absl::optional width, + std::optional width, std::vector* result) { DCHECK(tabs.size()); DCHECK(result); @@ -122,7 +123,7 @@ int GetTabCornerRadius(const Tab& tab) { std::vector CalculateVerticalTabBounds( const TabLayoutConstants& layout_constants, const std::vector& tabs, - absl::optional width, + std::optional width, bool is_floating_mode) { if (tabs.empty()) { return std::vector(); @@ -176,7 +177,7 @@ void UpdateInsertionIndexForVerticalTabs( const gfx::Rect& dragged_bounds, int first_dragged_tab_index, int num_dragged_tabs, - absl::optional dragged_group, + std::optional dragged_group, int candidate_index, TabStripController* tab_strip_controller, TabContainer* tab_container, diff --git a/browser/ui/views/tabs/brave_tab_strip_layout_helper.h b/browser/ui/views/tabs/brave_tab_strip_layout_helper.h index af3bcd16b30..6ed41b14778 100644 --- a/browser/ui/views/tabs/brave_tab_strip_layout_helper.h +++ b/browser/ui/views/tabs/brave_tab_strip_layout_helper.h @@ -6,11 +6,11 @@ #ifndef BRAVE_BROWSER_UI_VIEWS_TABS_BRAVE_TAB_STRIP_LAYOUT_HELPER_H_ #define BRAVE_BROWSER_UI_VIEWS_TABS_BRAVE_TAB_STRIP_LAYOUT_HELPER_H_ +#include #include #include "brave/browser/ui/views/sidebar/sidebar_item_view.h" #include "components/tab_groups/tab_group_id.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace gfx { class Rect; @@ -37,7 +37,7 @@ int GetTabCornerRadius(const Tab& tab); std::vector CalculateVerticalTabBounds( const TabLayoutConstants& layout_constants, const std::vector& tabs, - absl::optional width, + std::optional width, bool is_floating_mode); std::vector CalculateBoundsForVerticalDraggedViews( @@ -48,7 +48,7 @@ void UpdateInsertionIndexForVerticalTabs( const gfx::Rect& dragged_bounds, int first_dragged_tab_index, int num_dragged_tabs, - absl::optional dragged_group, + std::optional dragged_group, int candidate_index, TabStripController* tab_strip_controller, TabContainer* tab_container, diff --git a/browser/ui/views/tabs/brave_tab_style_views.inc.cc b/browser/ui/views/tabs/brave_tab_style_views.inc.cc index 4cbb81c3be2..35916c55312 100644 --- a/browser/ui/views/tabs/brave_tab_style_views.inc.cc +++ b/browser/ui/views/tabs/brave_tab_style_views.inc.cc @@ -282,7 +282,7 @@ void BraveVerticalTabStyle::PaintTab(gfx::Canvas* canvas) const { // as this can cause crashes due to the vertical tabstrip living in a // different widget hierarchy. PaintTabBackground(canvas, GetSelectionState(), IsHoverAnimationActive(), - absl::nullopt, 0); + std::nullopt, 0); } else { BraveGM2TabStyle::PaintTab(canvas); } diff --git a/browser/ui/views/tabs/tab_drag_controller.cc b/browser/ui/views/tabs/tab_drag_controller.cc index 879e34e23d3..8bc4c11e6c9 100644 --- a/browser/ui/views/tabs/tab_drag_controller.cc +++ b/browser/ui/views/tabs/tab_drag_controller.cc @@ -5,6 +5,7 @@ #include "brave/browser/ui/views/tabs/tab_drag_controller.h" +#include #include #include "brave/browser/ui/tabs/features.h" @@ -117,7 +118,7 @@ void TabDragController::MoveAttached(const gfx::Point& point_in_screen, last_move_attached_context_loc_ = point_in_attached_context.y(); } -absl::optional +std::optional TabDragController::GetTabGroupForTargetIndex(const std::vector& selected) { auto group_id = TabDragControllerChromium::GetTabGroupForTargetIndex(selected); @@ -132,9 +133,9 @@ TabDragController::GetTabGroupForTargetIndex(const std::vector& selected) { const auto previous_tab_index = selected.front() - 1; const TabStripModel* attached_model = attached_context_->GetTabStripModel(); - const absl::optional former_group = + const std::optional former_group = attached_model->GetTabGroupForTab(previous_tab_index); - const absl::optional latter_group = + const std::optional latter_group = attached_model->GetTabGroupForTab(selected.back() + 1); // We assume that Chromium can handle it when former and latter group are // same. So just return here. @@ -342,7 +343,7 @@ void TabDragController::InitDragData(TabSlotView* view, // This seems to be a bug from upstream. If the `view` is a group header, // there can't be contents or pinned state which are bound to this `view`. if (view->GetTabSlotViewType() == TabSlotView::ViewType::kTabGroupHeader) { - absl::optional tab_group_id = view->group(); + std::optional tab_group_id = view->group(); DCHECK(tab_group_id.has_value()); drag_data->tab_group_data = TabDragData::TabGroupData{ tab_group_id.value(), *source_context_->GetTabStripModel() diff --git a/browser/ui/views/tabs/tab_drag_controller.h b/browser/ui/views/tabs/tab_drag_controller.h index 862d7265cb8..362e1b6156e 100644 --- a/browser/ui/views/tabs/tab_drag_controller.h +++ b/browser/ui/views/tabs/tab_drag_controller.h @@ -6,6 +6,7 @@ #ifndef BRAVE_BROWSER_UI_VIEWS_TABS_TAB_DRAG_CONTROLLER_H_ #define BRAVE_BROWSER_UI_VIEWS_TABS_TAB_DRAG_CONTROLLER_H_ +#include #include #include "brave/browser/ui/views/frame/vertical_tab_strip_region_view.h" @@ -30,7 +31,7 @@ class TabDragController : public TabDragControllerChromium { gfx::Point GetAttachedDragPoint(const gfx::Point& point_in_screen) override; void MoveAttached(const gfx::Point& point_in_screen, bool just_attached) override; - absl::optional GetTabGroupForTargetIndex( + std::optional GetTabGroupForTargetIndex( const std::vector& selected) override; views::Widget* GetAttachedBrowserWidget() override; diff --git a/browser/ui/views/text_recognition_dialog_view.cc b/browser/ui/views/text_recognition_dialog_view.cc index 077590cbbb0..2666f9ff7fa 100644 --- a/browser/ui/views/text_recognition_dialog_view.cc +++ b/browser/ui/views/text_recognition_dialog_view.cc @@ -6,6 +6,7 @@ #include "brave/browser/ui/views/text_recognition_dialog_view.h" #include +#include #include #include "base/functional/bind.h" @@ -56,7 +57,7 @@ class TargetLanguageComboboxModel : public ui::ComboboxModel { return base::UTF8ToUTF16(languages_[index]); } - absl::optional GetDefaultIndex() const override { return 0; } + std::optional GetDefaultIndex() const override { return 0; } private: const std::vector languages_; @@ -151,7 +152,7 @@ void TextRecognitionDialogView::StartExtractingText( const std::string& language_code) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - result_ = absl::nullopt; + result_ = std::nullopt; show_result_timer_.Reset(); if (image_.empty()) { diff --git a/browser/ui/views/text_recognition_dialog_view.h b/browser/ui/views/text_recognition_dialog_view.h index 146493bc279..91a428cb640 100644 --- a/browser/ui/views/text_recognition_dialog_view.h +++ b/browser/ui/views/text_recognition_dialog_view.h @@ -7,6 +7,7 @@ #define BRAVE_BROWSER_UI_VIEWS_TEXT_RECOGNITION_DIALOG_VIEW_H_ #include +#include #include #include @@ -19,7 +20,6 @@ #include "base/task/single_thread_task_runner.h" #include "base/timer/timer.h" #include "build/build_config.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/base/metadata/metadata_header_macros.h" #include "ui/views/window/dialog_delegate.h" @@ -70,7 +70,7 @@ class TextRecognitionDialogView : public views::DialogDelegateView { raw_ptr scroll_view_ = nullptr; raw_ptr header_container_ = nullptr; SkBitmap image_; - absl::optional> result_; + std::optional> result_; SEQUENCE_CHECKER(sequence_checker_); diff --git a/browser/ui/views/toolbar/brave_app_menu_browsertest.cc b/browser/ui/views/toolbar/brave_app_menu_browsertest.cc index 3fd634e8a69..9bd122ca3ab 100644 --- a/browser/ui/views/toolbar/brave_app_menu_browsertest.cc +++ b/browser/ui/views/toolbar/brave_app_menu_browsertest.cc @@ -3,6 +3,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include + #include "base/test/scoped_feature_list.h" #include "brave/app/brave_command_ids.h" #include "brave/browser/ui/brave_browser_command_controller.h" @@ -57,7 +59,7 @@ class BraveAppMenuBrowserTest : public InProcessBrowserTest { // async way. static_cast( browser->command_controller()) - ->OnPurchasedStateChanged(target_state, absl::nullopt); + ->OnPurchasedStateChanged(target_state, std::nullopt); } base::test::ScopedFeatureList scoped_feature_list_; diff --git a/browser/ui/views/toolbar/brave_vpn_button.cc b/browser/ui/views/toolbar/brave_vpn_button.cc index 995c44e1f9b..8193650935a 100644 --- a/browser/ui/views/toolbar/brave_vpn_button.cc +++ b/browser/ui/views/toolbar/brave_vpn_button.cc @@ -5,6 +5,7 @@ #include "brave/browser/ui/views/toolbar/brave_vpn_button.h" +#include #include #include "base/memory/raw_ptr.h" @@ -23,7 +24,6 @@ #include "chrome/browser/ui/views/chrome_layout_provider.h" #include "chrome/browser/ui/views/toolbar/toolbar_ink_drop_util.h" #include "components/grit/brave_components_strings.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/metadata/metadata_impl_macros.h" #include "ui/base/models/simple_menu_model.h" @@ -90,7 +90,7 @@ class VPNButtonMenuModel : public ui::SimpleMenuModel, // BraveVPNServiceObserver overrides: void OnPurchasedStateChanged( brave_vpn::mojom::PurchasedState state, - const absl::optional& description) override { + const std::optional& description) override { // Rebuild menu items based on purchased state change. Build(service_->is_purchased_user()); } @@ -188,7 +188,7 @@ void BraveVPNButton::UpdateButtonState() { void BraveVPNButton::OnPurchasedStateChanged( brave_vpn::mojom::PurchasedState state, - const absl::optional& description) { + const std::optional& description) { UpdateButtonState(); UpdateColorsAndInsets(); } diff --git a/browser/ui/views/toolbar/brave_vpn_button.h b/browser/ui/views/toolbar/brave_vpn_button.h index 2a68f48e955..078070a369e 100644 --- a/browser/ui/views/toolbar/brave_vpn_button.h +++ b/browser/ui/views/toolbar/brave_vpn_button.h @@ -7,12 +7,12 @@ #define BRAVE_BROWSER_UI_VIEWS_TOOLBAR_BRAVE_VPN_BUTTON_H_ #include +#include #include #include "base/memory/raw_ptr.h" #include "brave/components/brave_vpn/browser/brave_vpn_service_observer.h" #include "chrome/browser/ui/views/toolbar/toolbar_button.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/base/metadata/metadata_header_macros.h" #include "ui/views/controls/button/menu_button_controller.h" @@ -43,7 +43,7 @@ class BraveVPNButton : public ToolbarButton, brave_vpn::mojom::ConnectionState state) override; void OnPurchasedStateChanged( brave_vpn::mojom::PurchasedState state, - const absl::optional& description) override; + const std::optional& description) override; private: friend class brave_vpn::BraveVpnButtonUnitTest; @@ -68,7 +68,7 @@ class BraveVPNButton : public ToolbarButton, bool is_error_state_ = false; bool is_connected_ = false; - absl::optional + std::optional connection_state_for_testing_; raw_ptr browser_ = nullptr; raw_ptr service_ = nullptr; diff --git a/browser/ui/views/toolbar/wallet_button_notification_source.h b/browser/ui/views/toolbar/wallet_button_notification_source.h index 4f1510dd254..28cf8d2d116 100644 --- a/browser/ui/views/toolbar/wallet_button_notification_source.h +++ b/browser/ui/views/toolbar/wallet_button_notification_source.h @@ -6,6 +6,8 @@ #ifndef BRAVE_BROWSER_UI_VIEWS_TOOLBAR_WALLET_BUTTON_NOTIFICATION_SOURCE_H_ #define BRAVE_BROWSER_UI_VIEWS_TOOLBAR_WALLET_BUTTON_NOTIFICATION_SOURCE_H_ +#include + #include "base/memory/weak_ptr.h" #include "brave/components/brave_wallet/browser/keyring_service.h" #include "brave/components/brave_wallet/browser/keyring_service_observer_base.h" @@ -14,7 +16,6 @@ #include "chrome/browser/profiles/profile.h" #include "components/prefs/pref_service.h" #include "mojo/public/cpp/bindings/receiver.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave { @@ -70,7 +71,7 @@ class WalletButtonNotificationSource WalletButtonNotificationSourceCallback callback_; - absl::optional wallet_created_; + std::optional wallet_created_; uint32_t pending_tx_count_ = 0; base::WeakPtrFactory weak_ptr_factory_{this}; diff --git a/browser/ui/views/toolbar/wallet_button_notification_source_browsertest.cc b/browser/ui/views/toolbar/wallet_button_notification_source_browsertest.cc index abd83155c82..63e2bb5148b 100644 --- a/browser/ui/views/toolbar/wallet_button_notification_source_browsertest.cc +++ b/browser/ui/views/toolbar/wallet_button_notification_source_browsertest.cc @@ -6,6 +6,7 @@ #include "brave/browser/ui/views/toolbar/wallet_button_notification_source.h" #include +#include #include "base/test/bind.h" #include "brave/browser/brave_wallet/keyring_service_factory.h" @@ -67,8 +68,8 @@ class WalletButtonNotificationSourceTest : public InProcessBrowserTest { IN_PROC_BROWSER_TEST_F(WalletButtonNotificationSourceTest, ShowBadge_WhenWalletNotCreated) { base::RunLoop run_loop; - absl::optional show_badge_suggest_result; - absl::optional count_result; + std::optional show_badge_suggest_result; + std::optional count_result; auto notification_source = std::make_unique( browser()->profile(), base::BindRepeating(base::BindLambdaForTesting( [&show_badge_suggest_result, &count_result]( @@ -91,8 +92,8 @@ IN_PROC_BROWSER_TEST_F(WalletButtonNotificationSourceTest, RestoreWallet(); base::RunLoop run_loop; - absl::optional show_badge_suggest_result; - absl::optional count_result; + std::optional show_badge_suggest_result; + std::optional count_result; auto notification_source = std::make_unique( browser()->profile(), base::BindRepeating(base::BindLambdaForTesting( [&show_badge_suggest_result, &count_result]( @@ -113,8 +114,8 @@ IN_PROC_BROWSER_TEST_F(WalletButtonNotificationSourceTest, IN_PROC_BROWSER_TEST_F(WalletButtonNotificationSourceTest, HideBadge_WhenWalletButtonClicked) { base::RunLoop run_loop; - absl::optional show_badge_suggest_result; - absl::optional count_result; + std::optional show_badge_suggest_result; + std::optional count_result; auto notification_source = std::make_unique( browser()->profile(), base::BindRepeating(base::BindLambdaForTesting( [&show_badge_suggest_result, &count_result]( @@ -143,8 +144,8 @@ IN_PROC_BROWSER_TEST_F(WalletButtonNotificationSourceTest, IN_PROC_BROWSER_TEST_F(WalletButtonNotificationSourceTest, HideBadge_WhenWalletCreated) { base::RunLoop run_loop; - absl::optional show_badge_suggest_result; - absl::optional count_result; + std::optional show_badge_suggest_result; + std::optional count_result; auto notification_source = std::make_unique( browser()->profile(), base::BindRepeating(base::BindLambdaForTesting( [&show_badge_suggest_result, &count_result]( @@ -189,7 +190,7 @@ IN_PROC_BROWSER_TEST_F(WalletButtonNotificationSourceTest, std::move(tx_data), brave_wallet::GetCurrentChainId(browser()->profile()->GetPrefs(), brave_wallet::mojom::CoinType::FIL, - absl::nullopt), + std::nullopt), from_account->account_id.Clone(), base::BindLambdaForTesting([&](bool success, const std::string& id, const std::string& err_message) { @@ -202,8 +203,8 @@ IN_PROC_BROWSER_TEST_F(WalletButtonNotificationSourceTest, } base::RunLoop idle_loop; - absl::optional show_badge_suggest_result; - absl::optional count_result; + std::optional show_badge_suggest_result; + std::optional count_result; auto notification_source = std::make_unique( browser()->profile(), base::BindRepeating(base::BindLambdaForTesting( [&show_badge_suggest_result, &count_result]( @@ -230,12 +231,12 @@ IN_PROC_BROWSER_TEST_F(WalletButtonNotificationSourceTest, auto tx_data = brave_wallet::mojom::TxData::New( "0x06", "0x09184e72a000", "0x0974", to_account, "0x016345785d8a0000", - std::vector(), false, absl::nullopt); + std::vector(), false, std::nullopt); tx_service()->AddUnapprovedTransaction( brave_wallet::mojom::TxDataUnion::NewEthTxData(std::move(tx_data)), brave_wallet::GetCurrentChainId(browser()->profile()->GetPrefs(), brave_wallet::mojom::CoinType::ETH, - absl::nullopt), + std::nullopt), from_account->account_id.Clone(), base::BindLambdaForTesting([&](bool success, const std::string& id, const std::string& err_message) { @@ -271,7 +272,7 @@ IN_PROC_BROWSER_TEST_F(WalletButtonNotificationSourceTest, brave_wallet::mojom::TxDataUnion::NewSolanaTxData(std::move(tx_data)), brave_wallet::GetCurrentChainId(browser()->profile()->GetPrefs(), brave_wallet::mojom::CoinType::SOL, - absl::nullopt), + std::nullopt), from_account->account_id.Clone(), base::BindLambdaForTesting([&](bool success, const std::string& id, const std::string& err_message) { @@ -296,7 +297,7 @@ IN_PROC_BROWSER_TEST_F(WalletButtonNotificationSourceTest, brave_wallet::mojom::CoinType::FIL, brave_wallet::GetCurrentChainId(browser()->profile()->GetPrefs(), brave_wallet::mojom::CoinType::FIL, - absl::nullopt), + std::nullopt), first_tx_meta_id, base::BindLambdaForTesting([&](bool result) { EXPECT_TRUE(result); run_loop.Quit(); @@ -317,7 +318,7 @@ IN_PROC_BROWSER_TEST_F(WalletButtonNotificationSourceTest, brave_wallet::mojom::CoinType::ETH, brave_wallet::GetCurrentChainId(browser()->profile()->GetPrefs(), brave_wallet::mojom::CoinType::ETH, - absl::nullopt), + std::nullopt), second_tx_meta_id, base::BindLambdaForTesting([&](bool result) { EXPECT_TRUE(result); run_loop.Quit(); @@ -338,7 +339,7 @@ IN_PROC_BROWSER_TEST_F(WalletButtonNotificationSourceTest, brave_wallet::mojom::CoinType::SOL, brave_wallet::GetCurrentChainId(browser()->profile()->GetPrefs(), brave_wallet::mojom::CoinType::SOL, - absl::nullopt), + std::nullopt), third_tx_meta_id, base::BindLambdaForTesting([&](bool result) { EXPECT_TRUE(result); run_loop.Quit(); @@ -372,7 +373,7 @@ IN_PROC_BROWSER_TEST_F(WalletButtonNotificationSourceTest, std::move(tx_data), brave_wallet::GetCurrentChainId(browser()->profile()->GetPrefs(), brave_wallet::mojom::CoinType::FIL, - absl::nullopt), + std::nullopt), from_account->account_id.Clone(), base::BindLambdaForTesting([&](bool success, const std::string& id, const std::string& err_message) { @@ -385,8 +386,8 @@ IN_PROC_BROWSER_TEST_F(WalletButtonNotificationSourceTest, } base::RunLoop run_loop; - absl::optional show_badge_suggest_result; - absl::optional count_result; + std::optional show_badge_suggest_result; + std::optional count_result; auto notification_source = std::make_unique( browser()->profile(), base::BindRepeating(base::BindLambdaForTesting( [&show_badge_suggest_result, &count_result]( @@ -416,8 +417,8 @@ IN_PROC_BROWSER_TEST_F(WalletButtonNotificationSourceTest, EmptyBadgeNotShownAfterRestart_IfClicked) { { base::RunLoop run_loop; - absl::optional show_badge_suggest_result; - absl::optional count_result; + std::optional show_badge_suggest_result; + std::optional count_result; auto notification_source = std::make_unique( browser()->profile(), base::BindRepeating(base::BindLambdaForTesting( [&show_badge_suggest_result, &count_result]( @@ -435,8 +436,8 @@ IN_PROC_BROWSER_TEST_F(WalletButtonNotificationSourceTest, { base::RunLoop run_loop; - absl::optional show_badge_suggest_result; - absl::optional count_result; + std::optional show_badge_suggest_result; + std::optional count_result; auto notification_source = std::make_unique( browser()->profile(), base::BindRepeating(base::BindLambdaForTesting( [&show_badge_suggest_result, &count_result]( diff --git a/browser/ui/views/wallet_bubble_focus_observer.h b/browser/ui/views/wallet_bubble_focus_observer.h index 792312a2e3b..187b891fbac 100644 --- a/browser/ui/views/wallet_bubble_focus_observer.h +++ b/browser/ui/views/wallet_bubble_focus_observer.h @@ -7,9 +7,9 @@ #define BRAVE_BROWSER_UI_VIEWS_WALLET_BUBBLE_FOCUS_OBSERVER_H_ #include +#include #include "base/gtest_prod_util.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/views/focus/focus_manager.h" #include "ui/views/view_observer.h" @@ -56,7 +56,7 @@ class WalletBubbleFocusObserver : public views::ViewObserver, virtual bool GetCurrentBubbleDeactivationState(); virtual void CloseBubble(); - absl::optional close_on_deactivate() { return close_on_deactivate_; } + std::optional close_on_deactivate() { return close_on_deactivate_; } // views::ViewObserver // Listening Bubble's WebView focus events void OnViewFocused(views::View* observed_view) override; @@ -72,7 +72,7 @@ class WalletBubbleFocusObserver : public views::ViewObserver, private: raw_ptr const web_ui_bubble_view_; raw_ptr const focus_manager_; - absl::optional close_on_deactivate_; + std::optional close_on_deactivate_; }; #endif // BRAVE_BROWSER_UI_VIEWS_WALLET_BUBBLE_FOCUS_OBSERVER_H_ diff --git a/browser/ui/views/wallet_bubble_focus_observer_unittest.cc b/browser/ui/views/wallet_bubble_focus_observer_unittest.cc index edcb840ebfc..9a242e0c42f 100644 --- a/browser/ui/views/wallet_bubble_focus_observer_unittest.cc +++ b/browser/ui/views/wallet_bubble_focus_observer_unittest.cc @@ -5,9 +5,10 @@ #include "brave/browser/ui/views/wallet_bubble_focus_observer.h" +#include + #include "chrome/browser/ui/views/bubble/webui_bubble_dialog_view.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/views/focus/focus_manager.h" #include "ui/views/view_observer.h" @@ -51,7 +52,7 @@ TEST(WalletBubbleFocusObserverUnitTest, FocusOutFromWindowAndBackToPanel) { TestWalletBubbleFocusObserver observer(nullptr, nullptr); ASSERT_TRUE(observer.subscribed()); ASSERT_FALSE(observer.IsBubbleLocked()); - EXPECT_EQ(observer.close_on_deactivate(), absl::nullopt); + EXPECT_EQ(observer.close_on_deactivate(), std::nullopt); ASSERT_TRUE(observer.bubble_deactivation_state()); // Focus out of view. observer.OnViewBlurred(nullptr); @@ -61,7 +62,7 @@ TEST(WalletBubbleFocusObserverUnitTest, FocusOutFromWindowAndBackToPanel) { // Focus returned back to bubble view. observer.OnViewFocused(nullptr); ASSERT_TRUE(observer.bubble_deactivation_state()); - EXPECT_EQ(observer.close_on_deactivate(), absl::nullopt); + EXPECT_EQ(observer.close_on_deactivate(), std::nullopt); } TEST(WalletBubbleFocusObserverUnitTest, @@ -69,7 +70,7 @@ TEST(WalletBubbleFocusObserverUnitTest, TestWalletBubbleFocusObserver observer(nullptr, nullptr); ASSERT_TRUE(observer.subscribed()); ASSERT_FALSE(observer.IsBubbleLocked()); - EXPECT_EQ(observer.close_on_deactivate(), absl::nullopt); + EXPECT_EQ(observer.close_on_deactivate(), std::nullopt); ASSERT_TRUE(observer.bubble_deactivation_state()); ASSERT_FALSE(observer.close_buble_called()); // Focus out of view. @@ -81,7 +82,7 @@ TEST(WalletBubbleFocusObserverUnitTest, views::View view; observer.OnWillChangeFocus(nullptr, &view); ASSERT_TRUE(observer.bubble_deactivation_state()); - EXPECT_EQ(observer.close_on_deactivate(), absl::nullopt); + EXPECT_EQ(observer.close_on_deactivate(), std::nullopt); ASSERT_TRUE(observer.close_buble_called()); } @@ -89,7 +90,7 @@ TEST(WalletBubbleFocusObserverUnitTest, UpdatePanelStateWhenUnfocused) { TestWalletBubbleFocusObserver observer(nullptr, nullptr); ASSERT_TRUE(observer.subscribed()); ASSERT_FALSE(observer.IsBubbleLocked()); - EXPECT_EQ(observer.close_on_deactivate(), absl::nullopt); + EXPECT_EQ(observer.close_on_deactivate(), std::nullopt); ASSERT_TRUE(observer.bubble_deactivation_state()); ASSERT_FALSE(observer.close_buble_called()); // Focus out of view. @@ -106,12 +107,12 @@ TEST(WalletBubbleFocusObserverUnitTest, UpdatePanelStateWhenUnfocused) { views::View view; observer.OnWillChangeFocus(nullptr, &view); ASSERT_FALSE(observer.bubble_deactivation_state()); - EXPECT_EQ(observer.close_on_deactivate(), absl::nullopt); + EXPECT_EQ(observer.close_on_deactivate(), std::nullopt); // We should not close the bubble if user interacts with the browser window ASSERT_FALSE(observer.close_buble_called()); // Focus returned back to bubble view. observer.OnViewFocused(nullptr); ASSERT_FALSE(observer.bubble_deactivation_state()); - EXPECT_EQ(observer.close_on_deactivate(), absl::nullopt); + EXPECT_EQ(observer.close_on_deactivate(), std::nullopt); } diff --git a/browser/ui/wallet_bubble_manager_delegate_impl.cc b/browser/ui/wallet_bubble_manager_delegate_impl.cc index 40e4b34e409..4ea7990062d 100644 --- a/browser/ui/wallet_bubble_manager_delegate_impl.cc +++ b/browser/ui/wallet_bubble_manager_delegate_impl.cc @@ -6,6 +6,7 @@ #include "brave/browser/ui/wallet_bubble_manager_delegate_impl.h" #include +#include #include #include @@ -36,7 +37,7 @@ class WalletWebUIBubbleDialogView : public WebUIBubbleDialogView { WalletWebUIBubbleDialogView( views::View* anchor_view, BubbleContentsWrapper* contents_wrapper, - const absl::optional& anchor_rect = absl::nullopt, + const std::optional& anchor_rect = std::nullopt, views::BubbleBorder::Arrow arrow = views::BubbleBorder::TOP_RIGHT) : WebUIBubbleDialogView(anchor_view, contents_wrapper, @@ -73,7 +74,7 @@ class WalletWebUIBubbleManager : public BraveWebUIBubbleManager, anchor_view_(anchor_view) {} base::WeakPtr CreateWebUIBubbleDialog( - const absl::optional& anchor, + const std::optional& anchor, views::BubbleBorder::Arrow arrow) override { // This is prevent duplicate logic of cached_contents_wrapper creation // so we close WebUIBubbleDialogView and re-create bubble with diff --git a/browser/ui/webui/ai_chat/ai_chat_ui_page_handler.cc b/browser/ui/webui/ai_chat/ai_chat_ui_page_handler.cc index 59bd62d3120..f1a94b43426 100644 --- a/browser/ui/webui/ai_chat/ai_chat_ui_page_handler.cc +++ b/browser/ui/webui/ai_chat/ai_chat_ui_page_handler.cc @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -291,7 +292,7 @@ void AIChatUIPageHandler::RateMessage(bool is_liked, std::move(callback).Run(id); return; } - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(std::nullopt); }, std::move(callback)); @@ -315,7 +316,7 @@ void AIChatUIPageHandler::RateMessage(bool is_liked, } } - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(std::nullopt); } void AIChatUIPageHandler::SendFeedback(const std::string& category, @@ -379,7 +380,7 @@ void AIChatUIPageHandler::OnFaviconImageDataChanged() { if (page_.is_bound()) { auto on_favicon_data = [](base::SafeRef page_handler, - const absl::optional>& bytes) { + const std::optional>& bytes) { if (bytes.has_value()) { page_handler->page_->OnFaviconImageDataChanged(bytes.value()); } @@ -412,7 +413,7 @@ void AIChatUIPageHandler::OnPageHasContent(bool page_contents_is_truncated) { void AIChatUIPageHandler::GetFaviconImageData( GetFaviconImageDataCallback callback) { if (!active_chat_tab_helper_) { - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(std::nullopt); return; } @@ -425,7 +426,7 @@ void AIChatUIPageHandler::GetFaviconImageData( [](GetFaviconImageDataCallback callback, const favicon_base::FaviconRawBitmapResult& result) { if (!result.is_valid()) { - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(std::nullopt); return; } @@ -441,7 +442,7 @@ void AIChatUIPageHandler::GetFaviconImageData( &favicon_task_tracker_); } -absl::optional AIChatUIPageHandler::BuildSiteInfo() { +std::optional AIChatUIPageHandler::BuildSiteInfo() { if (active_chat_tab_helper_ && active_chat_tab_helper_->HasPageContent() == PageContentAssociation::HAS_CONTENT) { mojom::SiteInfo site_info; @@ -453,7 +454,7 @@ absl::optional AIChatUIPageHandler::BuildSiteInfo() { return site_info; } - return absl::nullopt; + return std::nullopt; } void AIChatUIPageHandler::OnVisibilityChanged(content::Visibility visibility) { diff --git a/browser/ui/webui/ai_chat/ai_chat_ui_page_handler.h b/browser/ui/webui/ai_chat/ai_chat_ui_page_handler.h index 244b0231476..e776b23029f 100644 --- a/browser/ui/webui/ai_chat/ai_chat_ui_page_handler.h +++ b/browser/ui/webui/ai_chat/ai_chat_ui_page_handler.h @@ -9,6 +9,7 @@ #include #include +#include #include #include @@ -92,7 +93,7 @@ class AIChatUIPageHandler : public ai_chat::mojom::PageHandler, void OnPageHasContent(bool page_contents_is_truncated) override; void GetFaviconImageData(GetFaviconImageDataCallback callback) override; - absl::optional BuildSiteInfo(); + std::optional BuildSiteInfo(); mojo::Remote page_; diff --git a/browser/ui/webui/brave_adblock_internals_ui.cc b/browser/ui/webui/brave_adblock_internals_ui.cc index ab574ba4556..4f8d01e3be6 100644 --- a/browser/ui/webui/brave_adblock_internals_ui.cc +++ b/browser/ui/webui/brave_adblock_internals_ui.cc @@ -6,6 +6,7 @@ #include "brave/browser/ui/webui/brave_adblock_internals_ui.h" #include +#include #include #include @@ -85,7 +86,7 @@ class BraveAdblockInternalsMessageHandler CHECK(!dump->process_dumps().empty()); const auto& pmd = dump->process_dumps().front(); for (const auto& metric : kCollectedMemoryMetrics) { - absl::optional value = + std::optional value = pmd.GetMetric(metric.dump_name, metric.metric); if (value) { diff --git a/browser/ui/webui/brave_rewards_internals_ui.cc b/browser/ui/webui/brave_rewards_internals_ui.cc index 153067ac901..d297c5d8d1f 100644 --- a/browser/ui/webui/brave_rewards_internals_ui.cc +++ b/browser/ui/webui/brave_rewards_internals_ui.cc @@ -6,6 +6,7 @@ #include "brave/browser/ui/webui/brave_rewards_internals_ui.h" #include +#include #include #include #include @@ -27,7 +28,6 @@ #include "components/prefs/pref_service.h" #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_message_handler.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace { @@ -71,7 +71,7 @@ class RewardsInternalsDOMHandler : public content::WebUIMessageHandler { void GetEventLogs(const base::Value::List& args); void OnGetEventLogs(std::vector logs); void GetAdDiagnostics(const base::Value::List& args); - void OnGetAdDiagnostics(absl::optional diagnostics); + void OnGetAdDiagnostics(std::optional diagnostics); void SetAdDiagnosticId(const base::Value::List& args); void GetEnvironment(const base::Value::List& args); void OnGetEnvironment(brave_rewards::mojom::Environment environment); @@ -446,7 +446,7 @@ void RewardsInternalsDOMHandler::GetAdDiagnostics( } void RewardsInternalsDOMHandler::OnGetAdDiagnostics( - absl::optional diagnosticsEntries) { + std::optional diagnosticsEntries) { if (!IsJavascriptAllowed()) { return; } diff --git a/browser/ui/webui/brave_wallet/wallet_common_ui.cc b/browser/ui/webui/brave_wallet/wallet_common_ui.cc index dc724e94f55..aeae9b5dc9d 100644 --- a/browser/ui/webui/brave_wallet/wallet_common_ui.cc +++ b/browser/ui/webui/brave_wallet/wallet_common_ui.cc @@ -21,7 +21,6 @@ #endif #include "components/favicon_base/favicon_url_parser.h" #include "components/sessions/content/session_tab_helper.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h" #include "url/origin.h" diff --git a/browser/ui/webui/ipfs_ui.cc b/browser/ui/webui/ipfs_ui.cc index 9997e6acf91..3e20cda6cb2 100644 --- a/browser/ui/webui/ipfs_ui.cc +++ b/browser/ui/webui/ipfs_ui.cc @@ -5,6 +5,7 @@ #include "brave/browser/ui/webui/ipfs_ui.h" +#include #include #include "brave/browser/ipfs/ipfs_service_factory.h" @@ -129,7 +130,7 @@ void IPFSDOMHandler::HandleGetConnectedPeers(const base::Value::List& args) { service->GetConnectedPeers( base::BindOnce(&IPFSDOMHandler::OnGetConnectedPeers, weak_ptr_factory_.GetWeakPtr()), - absl::nullopt); + std::nullopt); } void IPFSDOMHandler::OnGetConnectedPeers( diff --git a/browser/ui/webui/ipfs_ui.h b/browser/ui/webui/ipfs_ui.h index ff872825523..da82f2bf37f 100644 --- a/browser/ui/webui/ipfs_ui.h +++ b/browser/ui/webui/ipfs_ui.h @@ -7,6 +7,7 @@ #define BRAVE_BROWSER_UI_WEBUI_IPFS_UI_H_ #include +#include #include #include @@ -70,7 +71,7 @@ class IPFSDOMHandler : public content::WebUIMessageHandler, } std::string GetIpfsClientUpdaterVersion() const; - absl::optional client_updater_version_for_testing_; + std::optional client_updater_version_for_testing_; base::ScopedObservation service_observer_{this}; base::WeakPtrFactory weak_ptr_factory_; diff --git a/browser/ui/webui/new_tab_page/brave_new_tab_message_handler.cc b/browser/ui/webui/new_tab_page/brave_new_tab_message_handler.cc index e69e2168bb9..42e02135149 100644 --- a/browser/ui/webui/new_tab_page/brave_new_tab_message_handler.cc +++ b/browser/ui/webui/new_tab_page/brave_new_tab_message_handler.cc @@ -6,6 +6,7 @@ #include "brave/browser/ui/webui/new_tab_page/brave_new_tab_message_handler.h" #include +#include #include #include @@ -488,7 +489,7 @@ void BraveNewTabMessageHandler::HandleGetWallpaperData( return; } - absl::optional data = + std::optional data = service->GetCurrentWallpaperForDisplay(); if (!data) { diff --git a/browser/ui/webui/new_tab_page/brave_new_tab_page_handler.cc b/browser/ui/webui/new_tab_page/brave_new_tab_page_handler.cc index d8f670ac1a8..08c05707c88 100644 --- a/browser/ui/webui/new_tab_page/brave_new_tab_page_handler.cc +++ b/browser/ui/webui/new_tab_page/brave_new_tab_page_handler.cc @@ -5,6 +5,7 @@ #include "brave/browser/ui/webui/new_tab_page/brave_new_tab_page_handler.h" +#include #include #include "base/containers/span.h" @@ -57,7 +58,7 @@ bool IsNTPPromotionEnabled(Profile* profile) { return false; // Only show promotion if current wallpaper is not sponsored images. - absl::optional data = + std::optional data = service->GetCurrentWallpaperForDisplay(); if (data) { if (const auto is_background = diff --git a/browser/ui/webui/new_tab_page/brave_new_tab_page_handler.h b/browser/ui/webui/new_tab_page/brave_new_tab_page_handler.h index 303029198c4..884df83ba33 100644 --- a/browser/ui/webui/new_tab_page/brave_new_tab_page_handler.h +++ b/browser/ui/webui/new_tab_page/brave_new_tab_page_handler.h @@ -19,7 +19,6 @@ #include "components/search_engines/template_url_service_observer.h" #include "mojo/public/cpp/bindings/receiver.h" #include "mojo/public/cpp/bindings/remote.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/shell_dialogs/select_file_dialog.h" namespace base { diff --git a/browser/ui/webui/settings/brave_import_bulk_data_handler.cc b/browser/ui/webui/settings/brave_import_bulk_data_handler.cc index 6017d333176..506ccdf34d0 100644 --- a/browser/ui/webui/settings/brave_import_bulk_data_handler.cc +++ b/browser/ui/webui/settings/brave_import_bulk_data_handler.cc @@ -6,6 +6,7 @@ #include "brave/browser/ui/webui/settings/brave_import_bulk_data_handler.h" #include +#include #include #include #include @@ -119,7 +120,7 @@ void BraveImportBulkDataHandler::HandleImportDataBulk( } } -absl::optional BraveImportBulkDataHandler::GetProfileIndex( +std::optional BraveImportBulkDataHandler::GetProfileIndex( const importer::SourceProfile& source_profile) { for (auto index : importing_profiles_) { const auto& profile = GetSourceProfileAt(index); @@ -127,7 +128,7 @@ absl::optional BraveImportBulkDataHandler::GetProfileIndex( return index; } } - return absl::nullopt; + return std::nullopt; } void BraveImportBulkDataHandler::StartImport( diff --git a/browser/ui/webui/settings/brave_import_bulk_data_handler.h b/browser/ui/webui/settings/brave_import_bulk_data_handler.h index b287ddcef81..98d27fbced9 100644 --- a/browser/ui/webui/settings/brave_import_bulk_data_handler.h +++ b/browser/ui/webui/settings/brave_import_bulk_data_handler.h @@ -7,6 +7,7 @@ #define BRAVE_BROWSER_UI_WEBUI_SETTINGS_BRAVE_IMPORT_BULK_DATA_HANDLER_H_ #include +#include #include "base/containers/flat_set.h" #include "base/functional/callback.h" @@ -14,7 +15,6 @@ #include "brave/browser/ui/webui/settings/brave_import_data_handler.h" #include "brave/browser/ui/webui/settings/brave_importer_observer.h" #include "build/build_config.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace settings { @@ -34,7 +34,7 @@ class BraveImportBulkDataHandler : public BraveImportDataHandler { protected: void HandleImportDataBulk(const base::Value::List& args); - absl::optional GetProfileIndex( + std::optional GetProfileIndex( const importer::SourceProfile& source_profile); void PrepareProfile(const std::u16string& name, diff --git a/browser/ui/webui/settings/brave_wallet_handler.cc b/browser/ui/webui/settings/brave_wallet_handler.cc index e981d8f14c7..8a0ce0cc6f6 100644 --- a/browser/ui/webui/settings/brave_wallet_handler.cc +++ b/browser/ui/webui/settings/brave_wallet_handler.cc @@ -5,6 +5,7 @@ #include "brave/browser/ui/webui/settings/brave_wallet_handler.h" +#include #include #include #include @@ -41,10 +42,10 @@ base::Value::Dict MakeSelectValue(const std::u16string& name, return item; } -absl::optional ToCoinType( - absl::optional val) { +std::optional ToCoinType( + std::optional val) { if (!val) { - return absl::nullopt; + return std::nullopt; } auto result = static_cast(*val); if (result != brave_wallet::mojom::CoinType::ETH && @@ -52,7 +53,7 @@ absl::optional ToCoinType( result != brave_wallet::mojom::CoinType::SOL && result != brave_wallet::mojom::CoinType::BTC) { NOTREACHED(); - return absl::nullopt; + return std::nullopt; } return result; } @@ -186,7 +187,7 @@ void BraveWalletHandler::GetNetworksList(const base::Value::List& args) { } result.Set("defaultNetwork", - brave_wallet::GetCurrentChainId(prefs, *coin, absl::nullopt)); + brave_wallet::GetCurrentChainId(prefs, *coin, std::nullopt)); auto& networks = result.Set("networks", base::Value::List())->GetList(); for (const auto& it : brave_wallet::GetAllChains(prefs, *coin)) { @@ -287,7 +288,7 @@ void BraveWalletHandler::SetDefaultNetwork(const base::Value::List& args) { brave_wallet::JsonRpcServiceFactory::GetServiceForContext( Profile::FromWebUI(web_ui())); auto result = json_rpc_service ? json_rpc_service->SetNetwork( - *chain_id, *coin, absl::nullopt) + *chain_id, *coin, std::nullopt) : false; ResolveJavascriptCallback(args[0], base::Value(result)); } diff --git a/browser/ui/webui/settings/brave_wallet_handler_unittest.cc b/browser/ui/webui/settings/brave_wallet_handler_unittest.cc index e0dd2a6ec82..b1b08ac1bf4 100644 --- a/browser/ui/webui/settings/brave_wallet_handler_unittest.cc +++ b/browser/ui/webui/settings/brave_wallet_handler_unittest.cc @@ -3,7 +3,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include "brave/browser/ui/webui/settings/brave_wallet_handler.h" + #include +#include #include #include #include @@ -14,7 +17,6 @@ #include "base/test/bind.h" #include "base/values.h" #include "brave/browser/brave_wallet/json_rpc_service_factory.h" -#include "brave/browser/ui/webui/settings/brave_wallet_handler.h" #include "brave/components/brave_wallet/browser/brave_wallet_constants.h" #include "brave/components/brave_wallet/browser/brave_wallet_utils.h" #include "brave/components/brave_wallet/browser/json_rpc_service.h" @@ -32,7 +34,6 @@ #include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h" #include "services/network/test/test_url_loader_factory.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/base/l10n/l10n_util.h" using brave_wallet::mojom::CoinType; @@ -348,7 +349,7 @@ TEST(TestBraveWalletHandler, SetDefaultNetwork) { EXPECT_EQ(data.arg3()->GetBool(), true); EXPECT_EQ(brave_wallet::GetCurrentChainId(handler.prefs(), CoinType::ETH, - absl::nullopt), + std::nullopt), "chain_id2"); } { @@ -363,7 +364,7 @@ TEST(TestBraveWalletHandler, SetDefaultNetwork) { EXPECT_EQ(data.arg3()->GetBool(), false); EXPECT_EQ(brave_wallet::GetCurrentChainId(handler.prefs(), CoinType::ETH, - absl::nullopt), + std::nullopt), "chain_id2"); } } diff --git a/browser/ui/whats_new/whats_new_util.cc b/browser/ui/whats_new/whats_new_util.cc index b2fc3147987..a20a05d0adf 100644 --- a/browser/ui/whats_new/whats_new_util.cc +++ b/browser/ui/whats_new/whats_new_util.cc @@ -5,6 +5,7 @@ #include "brave/browser/ui/whats_new/whats_new_util.h" +#include #include #include "base/metrics/field_trial_params.h" @@ -35,20 +36,20 @@ double g_testing_major_version = 0; // First one is upstream's major version. // Brave's major version is second and third component like 1.51. // Ignored fourth number as it's build number. -absl::optional GetBraveMajorVersionAsDouble( +std::optional GetBraveMajorVersionAsDouble( const base::Version& version) { double brave_major_version; if (!base::StringToDouble(base::StringPrintf("%d.%d", version.components()[1], version.components()[2]), &brave_major_version)) { - return absl::nullopt; + return std::nullopt; } return brave_major_version; } // Returns 1.xx or 2.xx as double. -absl::optional GetCurrentBrowserVersion() { +std::optional GetCurrentBrowserVersion() { if (g_testing_major_version != 0) { return g_testing_major_version; } @@ -90,20 +91,20 @@ bool DoesUserGetMajorUpdateSinceInstall() { return current_version != profile_created_version; } -absl::optional GetTargetMajorVersion() { +std::optional GetTargetMajorVersion() { constexpr char kWhatsNewTrial[] = "WhatsNewStudy"; const std::string target_major_version_string = base::GetFieldTrialParamValue( kWhatsNewTrial, whats_new::GetTargetMajorVersionParamName()); // Field trial doesn't have this value. if (target_major_version_string.empty()) { - return absl::nullopt; + return std::nullopt; } double target_major_version; if (!base::StringToDouble(target_major_version_string, &target_major_version)) { - return absl::nullopt; + return std::nullopt; } return target_major_version; diff --git a/browser/web_discovery/web_discovery_cta_util.h b/browser/web_discovery/web_discovery_cta_util.h index cf58beca907..1967771c224 100644 --- a/browser/web_discovery/web_discovery_cta_util.h +++ b/browser/web_discovery/web_discovery_cta_util.h @@ -9,7 +9,6 @@ #include #include "base/time/time.h" -#include "third_party/abseil-cpp/absl/types/optional.h" class GURL; class PrefService; diff --git a/browser/web_package/signed_exchange_request_browsertest.cc b/browser/web_package/signed_exchange_request_browsertest.cc index 60619751abf..f8707368f0c 100644 --- a/browser/web_package/signed_exchange_request_browsertest.cc +++ b/browser/web_package/signed_exchange_request_browsertest.cc @@ -4,6 +4,7 @@ * You can obtain one at https://mozilla.org/MPL/2.0/. */ #include +#include #include "base/functional/bind.h" #include "base/synchronization/lock.h" @@ -113,12 +114,11 @@ class SignedExchangeRequestBrowserTest : public InProcessBrowserTest { : std::string(kDefaultAcceptHeaderValue)); } - absl::optional GetInterceptedAcceptHeader( - const GURL& url) const { + std::optional GetInterceptedAcceptHeader(const GURL& url) const { base::AutoLock lock(url_accept_header_map_lock_); const auto it = url_accept_header_map_.find(url); if (it == url_accept_header_map_.end()) - return absl::nullopt; + return std::nullopt; return it->second; } diff --git a/build/ios/mojom/mojom_objc_generator.py b/build/ios/mojom/mojom_objc_generator.py index 7c95dfedd11..fb1a65d04be 100644 --- a/build/ios/mojom/mojom_objc_generator.py +++ b/build/ios/mojom/mojom_objc_generator.py @@ -474,7 +474,7 @@ class Generator(generator.Generator): if (mojom.IsNullableKind(kind) and not (isinstance( typemap, (StructMojoTypemap, UnionMojoTypemap)))): - typestring = "absl::optional<%s>" % typestring + typestring = "std::optional<%s>" % typestring if should_pass_param_by_value: return typestring return "const %s&" % typestring @@ -582,7 +582,7 @@ class Generator(generator.Generator): kind)]["nullable_is_same_type"]) or not isinstance(typemap, (StructMojoTypemap, UnionMojoTypemap))): - cpp_assign = "%s ? absl::make_optional(%s) : absl::nullopt" % ( + cpp_assign = "%s ? std::make_optional(%s) : std::nullopt" % ( accessor, cpp_assign) else: cpp_assign = "%s ? %s : nullptr" % (accessor, cpp_assign) diff --git a/build/ios/mojom/public/base/base_values.mm b/build/ios/mojom/public/base/base_values.mm index a88a39b8113..c0143576c56 100644 --- a/build/ios/mojom/public/base/base_values.mm +++ b/build/ios/mojom/public/base/base_values.mm @@ -5,6 +5,8 @@ #include "brave/build/ios/mojom/public/base/base_values.h" +#include + #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/strings/sys_string_conversions.h" @@ -268,7 +270,7 @@ - (nullable instancetype)initWithJSONString:(NSString*)json { auto string = base::SysNSStringToUTF8(json); - absl::optional response = base::JSONReader::Read( + std::optional response = base::JSONReader::Read( string, base::JSON_PARSE_CHROMIUM_EXTENSIONS | base::JSONParserOptions::JSON_PARSE_RFC); if (response) { diff --git a/chromium_src/chrome/app/chrome_main_delegate.cc b/chromium_src/chrome/app/chrome_main_delegate.cc index 64e622724ac..05e708f444a 100644 --- a/chromium_src/chrome/app/chrome_main_delegate.cc +++ b/chromium_src/chrome/app/chrome_main_delegate.cc @@ -5,6 +5,8 @@ // This chromium_src override allows us to skip a lot of patching to // chrome/BUILD.gn +#include + #include "brave/app/brave_command_line_helper.cc" #include "brave/app/brave_main_delegate.cc" #include "brave/components/brave_sync/buildflags.h" @@ -53,7 +55,7 @@ void AdjustSyncServiceUrlForAndroid(std::string* brave_sync_service_url) { // Because of that, upstream tests won't get BraveMainDelegate instantiated and // therefore we won't get any of the features below disabled/enabled when // running those browser tests, which is not what we want. -absl::optional ChromeMainDelegate::BasicStartupComplete() { +std::optional ChromeMainDelegate::BasicStartupComplete() { BraveCommandLineHelper command_line(base::CommandLine::ForCurrentProcess()); command_line.AppendSwitch(switches::kDisableDomainReliability); command_line.AppendSwitch(switches::kEnableDomDistiller); diff --git a/chromium_src/chrome/app/chrome_main_delegate.h b/chromium_src/chrome/app/chrome_main_delegate.h index baf14b94026..1419875a457 100644 --- a/chromium_src/chrome/app/chrome_main_delegate.h +++ b/chromium_src/chrome/app/chrome_main_delegate.h @@ -6,6 +6,8 @@ #ifndef BRAVE_CHROMIUM_SRC_CHROME_APP_CHROME_MAIN_DELEGATE_H_ #define BRAVE_CHROMIUM_SRC_CHROME_APP_CHROME_MAIN_DELEGATE_H_ +#include + #include "brave/common/brave_content_client.h" #include "chrome/common/chrome_content_client.h" #include "content/public/app/content_main_delegate.h" @@ -14,7 +16,7 @@ #define BasicStartupComplete \ BasicStartupComplete_ChromiumImpl(); \ - absl::optional BasicStartupComplete + std::optional BasicStartupComplete #include "src/chrome/app/chrome_main_delegate.h" // IWYU pragma: export diff --git a/chromium_src/chrome/browser/component_updater/widevine_cdm_component_installer.cc b/chromium_src/chrome/browser/component_updater/widevine_cdm_component_installer.cc index 0899a744026..6b24f4c3d0a 100644 --- a/chromium_src/chrome/browser/component_updater/widevine_cdm_component_installer.cc +++ b/chromium_src/chrome/browser/component_updater/widevine_cdm_component_installer.cc @@ -3,6 +3,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include + #include "chrome/browser/component_updater/widevine_cdm_component_installer.h" #if BUILDFLAG(WIDEVINE_ARM64_DLL_FIX) @@ -339,7 +341,7 @@ bool WidevineArm64DllInstaller::AddArm64ArchToManifest() { return false; } - absl::optional root = base::JSONReader::Read(json_content); + std::optional root = base::JSONReader::Read(json_content); if (!root) { LOG(ERROR) << "Failed to parse JSON."; return false; diff --git a/chromium_src/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc b/chromium_src/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc index f5ac1a04d44..04f5bd40f95 100644 --- a/chromium_src/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc +++ b/chromium_src/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc @@ -3,10 +3,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include + #include "chrome/browser/extensions/api/identity/identity_get_auth_token_function.h" #include "chrome/browser/extensions/api/identity/identity_token_cache.h" #include "google_apis/google_api_keys.h" -#include "third_party/abseil-cpp/absl/types/optional.h" // Use the embedded Google OAuth flow only if Google Chrome API key is used. // Otherwise, fallback to the web OAuth flow. @@ -30,7 +31,7 @@ if (cache_entry.status() == \ IdentityTokenCacheValue::CACHE_STATUS_NOTFOUND) { \ if (type == IdentityMintRequestQueue::MINT_TYPE_INTERACTIVE) { \ - absl::optional params( \ + std::optional params( \ api::identity::GetAuthToken::Params::Create(args())); \ /* Forcing interactive mode if initial caller requested it. */ \ bool interactive = \ diff --git a/chromium_src/chrome/browser/external_protocol/external_protocol_handler.cc b/chromium_src/chrome/browser/external_protocol/external_protocol_handler.cc index 9bfc53d43ab..0324b1901a2 100644 --- a/chromium_src/chrome/browser/external_protocol/external_protocol_handler.cc +++ b/chromium_src/chrome/browser/external_protocol/external_protocol_handler.cc @@ -3,9 +3,10 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this file, // You can obtain one at https://mozilla.org/MPL/2.0/. -#include "chrome/browser/external_protocol/external_protocol_handler.h" +#include #include "brave/components/brave_webtorrent/browser/buildflags/buildflags.h" +#include "chrome/browser/external_protocol/external_protocol_handler.h" #if BUILDFLAG(ENABLE_BRAVE_WEBTORRENT) #include "brave/components/brave_webtorrent/browser/magnet_protocol_handler.h" @@ -24,7 +25,7 @@ void ExternalProtocolHandler::LaunchUrl( ui::PageTransition page_transition, bool has_user_gesture, bool is_in_fenced_frame_tree, - const absl::optional& initiating_origin, + const std::optional& initiating_origin, content::WeakDocumentPtr initiator_document #if BUILDFLAG(IS_ANDROID) , diff --git a/chromium_src/chrome/browser/net/stub_resolver_config_reader.cc b/chromium_src/chrome/browser/net/stub_resolver_config_reader.cc index a8b93649950..57497e378e1 100644 --- a/chromium_src/chrome/browser/net/stub_resolver_config_reader.cc +++ b/chromium_src/chrome/browser/net/stub_resolver_config_reader.cc @@ -13,7 +13,6 @@ #include "content/public/browser/network_service_instance.h" #include "net/dns/public/dns_over_https_config.h" #include "services/network/public/mojom/network_service.mojom.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #if BUILDFLAG(ENABLE_BRAVE_VPN) #include "brave/components/brave_vpn/common/features.h" diff --git a/chromium_src/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chromium_src/chrome/browser/renderer_context_menu/render_view_context_menu.cc index c07a3598152..355c9c30705 100644 --- a/chromium_src/chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ b/chromium_src/chrome/browser/renderer_context_menu/render_view_context_menu.cc @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "chrome/browser/renderer_context_menu/render_view_context_menu.h" +#include #include "brave/browser/autocomplete/brave_autocomplete_scheme_classifier.h" #include "brave/browser/ipfs/import/ipfs_import_controller.h" @@ -15,6 +15,7 @@ #include "brave/components/tor/buildflags/buildflags.h" #include "brave/grit/brave_theme_resources.h" #include "chrome/browser/autocomplete/chrome_autocomplete_provider_client.h" +#include "chrome/browser/renderer_context_menu/render_view_context_menu.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/common/channel_info.h" #include "components/omnibox/browser/autocomplete_classifier.h" @@ -65,11 +66,11 @@ GURL GetSelectionNavigationURL(Profile* profile, const std::u16string& text) { return GetAutocompleteMatchForText(profile, text).destination_url; } -absl::optional GetSelectedURL(Profile* profile, - const std::u16string& text) { +std::optional GetSelectedURL(Profile* profile, + const std::u16string& text) { auto match = GetAutocompleteMatchForText(profile, text); if (match.type != AutocompleteMatchType::URL_WHAT_YOU_TYPED) { - return absl::nullopt; + return std::nullopt; } return match.destination_url; } @@ -375,7 +376,7 @@ void BraveRenderViewContextMenu::SeIpfsIconAt(int index) { void BraveRenderViewContextMenu::BuildIPFSMenu() { if (!ipfs::IsIpfsMenuEnabled(GetProfile()->GetPrefs())) return; - absl::optional index = + std::optional index = menu_model_.GetIndexOfCommandId(IDC_CONTENT_CONTEXT_INSPECTELEMENT); if (!index.has_value()) return; @@ -435,7 +436,7 @@ void BraveRenderViewContextMenu::BuildIPFSMenu() { void BraveRenderViewContextMenu::InitMenu() { RenderViewContextMenu_Chromium::InitMenu(); - absl::optional index = menu_model_.GetIndexOfCommandId( + std::optional index = menu_model_.GetIndexOfCommandId( IDC_CONTENT_CONTEXT_PASTE_AND_MATCH_STYLE); if (index.has_value()) { menu_model_.InsertItemWithStringIdAt(index.value() + 1, @@ -474,7 +475,7 @@ void BraveRenderViewContextMenu::InitMenu() { } #endif if (!params_.link_url.is_empty() && params_.link_url.SchemeIsHTTPOrHTTPS()) { - absl::optional link_index = + std::optional link_index = menu_model_.GetIndexOfCommandId(IDC_CONTENT_CONTEXT_COPYLINKLOCATION); if (link_index.has_value()) { menu_model_.InsertItemWithStringIdAt( @@ -482,7 +483,7 @@ void BraveRenderViewContextMenu::InitMenu() { } } if (GetSelectedURL(GetProfile(), params_.selection_text).has_value()) { - absl::optional copy_index = + std::optional copy_index = menu_model_.GetIndexOfCommandId(IDC_CONTENT_CONTEXT_COPY); if (copy_index.has_value() && !menu_model_.GetIndexOfCommandId(IDC_COPY_CLEAN_LINK).has_value()) { diff --git a/chromium_src/chrome/browser/sync/prefs/chrome_syncable_prefs_database.cc b/chromium_src/chrome/browser/sync/prefs/chrome_syncable_prefs_database.cc index 9eba536054b..8d8f3256800 100644 --- a/chromium_src/chrome/browser/sync/prefs/chrome_syncable_prefs_database.cc +++ b/chromium_src/chrome/browser/sync/prefs/chrome_syncable_prefs_database.cc @@ -3,11 +3,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "chrome/browser/sync/prefs/chrome_syncable_prefs_database.h" - +#include #include #include "base/containers/fixed_flat_map.h" +#include "chrome/browser/sync/prefs/chrome_syncable_prefs_database.h" namespace browser_sync { namespace { @@ -147,7 +147,7 @@ const auto& BraveSyncablePreferences() { namespace browser_sync { -absl::optional +std::optional ChromeSyncablePrefsDatabase::GetSyncablePrefMetadata( const std::string& pref_name) const { const auto* it = BraveSyncablePreferences().find(pref_name); diff --git a/chromium_src/chrome/browser/sync/prefs/chrome_syncable_prefs_database.h b/chromium_src/chrome/browser/sync/prefs/chrome_syncable_prefs_database.h index 83c9d2a5bd1..f54215782f5 100644 --- a/chromium_src/chrome/browser/sync/prefs/chrome_syncable_prefs_database.h +++ b/chromium_src/chrome/browser/sync/prefs/chrome_syncable_prefs_database.h @@ -6,12 +6,14 @@ #ifndef BRAVE_CHROMIUM_SRC_CHROME_BROWSER_SYNC_PREFS_CHROME_SYNCABLE_PREFS_DATABASE_H_ #define BRAVE_CHROMIUM_SRC_CHROME_BROWSER_SYNC_PREFS_CHROME_SYNCABLE_PREFS_DATABASE_H_ +#include + #include "components/sync_preferences/common_syncable_prefs_database.h" #include "components/sync_preferences/syncable_prefs_database.h" #define GetSyncablePrefMetadata \ GetSyncablePrefMetadata_ChromiumImpl(const std::string& pref_name) const; \ - absl::optional GetSyncablePrefMetadata + std::optional GetSyncablePrefMetadata #include "src/chrome/browser/sync/prefs/chrome_syncable_prefs_database.h" // IWYU pragma: export #undef GetSyncablePrefMetadata diff --git a/chromium_src/chrome/browser/sync/sync_ui_util.cc b/chromium_src/chrome/browser/sync/sync_ui_util.cc index f02334a5782..5e72c39514d 100644 --- a/chromium_src/chrome/browser/sync/sync_ui_util.cc +++ b/chromium_src/chrome/browser/sync/sync_ui_util.cc @@ -4,12 +4,14 @@ * You can obtain one at https://mozilla.org/MPL/2.0/. */ #define GetAvatarSyncErrorType GetAvatarSyncErrorType_Unused +#include + #include "src/chrome/browser/sync/sync_ui_util.cc" #undef GetAvatarSyncErrorType -absl::optional GetAvatarSyncErrorType(Profile* profile) { +std::optional GetAvatarSyncErrorType(Profile* profile) { // Brave Sync works differently in that there is no sign-in // and nothing to prompt the user to manage once their sync // chain is setup. - return absl::nullopt; + return std::nullopt; } diff --git a/chromium_src/chrome/browser/ui/browser_tabrestore.cc b/chromium_src/chrome/browser/ui/browser_tabrestore.cc index 648dba366b4..13ee90a26e8 100644 --- a/chromium_src/chrome/browser/ui/browser_tabrestore.cc +++ b/chromium_src/chrome/browser/ui/browser_tabrestore.cc @@ -3,6 +3,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include + #include "brave/components/brave_webtorrent/browser/buildflags/buildflags.h" #include "chrome/browser/ui/browser_tabrestore.h" @@ -42,7 +44,7 @@ WebContents* AddRestoredTab( int tab_index, int selected_navigation, const std::string& extension_app_id, - absl::optional group, + std::optional group, bool select, bool pin, base::TimeTicks last_active_time, diff --git a/chromium_src/chrome/browser/ui/color/win/native_chrome_color_mixer_win.cc b/chromium_src/chrome/browser/ui/color/win/native_chrome_color_mixer_win.cc index 43efd3aaf9a..84ddbd7cce6 100644 --- a/chromium_src/chrome/browser/ui/color/win/native_chrome_color_mixer_win.cc +++ b/chromium_src/chrome/browser/ui/color/win/native_chrome_color_mixer_win.cc @@ -3,9 +3,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include + #include "base/callback_list.h" #include "base/no_destructor.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/color/win/accent_color_observer.h" @@ -27,11 +28,9 @@ class FakeAccentColorObserver { return callbacks_.Add(std::move(callback)); } - absl::optional accent_color() const { return absl::nullopt; } - absl::optional accent_color_inactive() const { - return absl::nullopt; - } - absl::optional accent_border_color() const { return absl::nullopt; } + std::optional accent_color() const { return std::nullopt; } + std::optional accent_color_inactive() const { return std::nullopt; } + std::optional accent_border_color() const { return std::nullopt; } bool use_dwm_frame_color() const { return false; } private: diff --git a/chromium_src/chrome/browser/ui/extensions/icon_with_badge_image_source.cc b/chromium_src/chrome/browser/ui/extensions/icon_with_badge_image_source.cc index 1b2cad98f6e..a2f6a8874dc 100644 --- a/chromium_src/chrome/browser/ui/extensions/icon_with_badge_image_source.cc +++ b/chromium_src/chrome/browser/ui/extensions/icon_with_badge_image_source.cc @@ -15,21 +15,22 @@ if (GetCustomGraphicYOffset().has_value()) \ y_offset = GetCustomGraphicYOffset().value(); +#include + #include "src/chrome/browser/ui/extensions/icon_with_badge_image_source.cc" #undef BRAVE_ICON_WITH_BADGE_IMAGE_SOURCE_DRAW_2 #undef BRAVE_ICON_WITH_BADGE_IMAGE_SOURCE_DRAW_1 -#include "third_party/abseil-cpp/absl/types/optional.h" // Implement default virtual methods -absl::optional IconWithBadgeImageSource::GetCustomGraphicSize() { - return absl::nullopt; +std::optional IconWithBadgeImageSource::GetCustomGraphicSize() { + return std::nullopt; } -absl::optional IconWithBadgeImageSource::GetCustomGraphicXOffset() { - return absl::nullopt; +std::optional IconWithBadgeImageSource::GetCustomGraphicXOffset() { + return std::nullopt; } -absl::optional IconWithBadgeImageSource::GetCustomGraphicYOffset() { - return absl::nullopt; +std::optional IconWithBadgeImageSource::GetCustomGraphicYOffset() { + return std::nullopt; } diff --git a/chromium_src/chrome/browser/ui/extensions/icon_with_badge_image_source.h b/chromium_src/chrome/browser/ui/extensions/icon_with_badge_image_source.h index c7e174aa843..e261a349d46 100644 --- a/chromium_src/chrome/browser/ui/extensions/icon_with_badge_image_source.h +++ b/chromium_src/chrome/browser/ui/extensions/icon_with_badge_image_source.h @@ -6,20 +6,20 @@ #ifndef BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_EXTENSIONS_ICON_WITH_BADGE_IMAGE_SOURCE_H_ #define BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_EXTENSIONS_ICON_WITH_BADGE_IMAGE_SOURCE_H_ -#include "third_party/abseil-cpp/absl/types/optional.h" +#include namespace brave { class BraveIconWithBadgeImageSource; } -#define BRAVE_ICON_WITH_BADGE_IMAGE_SOURCE_H_ \ - private: \ - friend class brave::BraveIconWithBadgeImageSource; \ - virtual absl::optional GetCustomGraphicSize(); \ - virtual absl::optional GetCustomGraphicXOffset(); \ - virtual absl::optional GetCustomGraphicYOffset(); \ - \ - public: \ +#define BRAVE_ICON_WITH_BADGE_IMAGE_SOURCE_H_ \ + private: \ + friend class brave::BraveIconWithBadgeImageSource; \ + virtual std::optional GetCustomGraphicSize(); \ + virtual std::optional GetCustomGraphicXOffset(); \ + virtual std::optional GetCustomGraphicYOffset(); \ + \ + public: \ // #define BRAVE_ICON_WITH_BADGE_IMAGE_SOURCE_H_ #define PaintBadge virtual PaintBadge diff --git a/chromium_src/chrome/browser/ui/hats/hats_service_browsertest.cc b/chromium_src/chrome/browser/ui/hats/hats_service_browsertest.cc index 0699205b87a..e9d66cb9a23 100644 --- a/chromium_src/chrome/browser/ui/hats/hats_service_browsertest.cc +++ b/chromium_src/chrome/browser/ui/hats/hats_service_browsertest.cc @@ -3,6 +3,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include + #include "base/metrics/field_trial_params.h" #include "base/test/scoped_feature_list.h" #include "base/time/time.h" @@ -18,7 +20,6 @@ #include "components/metrics_services_manager/metrics_services_manager.h" #include "content/public/test/browser_test.h" #include "net/dns/mock_host_resolver.h" -#include "third_party/abseil-cpp/absl/types/optional.h" // Simplified version of the upstream tests modified to reflect the change in // the HatsService chromium_src override. @@ -78,7 +79,7 @@ class HatsServiceBrowserTestBase : public InProcessBrowserTest { } private: - absl::optional scoped_metrics_consent_; + std::optional scoped_metrics_consent_; base::test::ScopedFeatureList scoped_feature_list_; }; diff --git a/chromium_src/chrome/browser/ui/layout_constants.cc b/chromium_src/chrome/browser/ui/layout_constants.cc index 963c564e7b2..f4bfc9b2678 100644 --- a/chromium_src/chrome/browser/ui/layout_constants.cc +++ b/chromium_src/chrome/browser/ui/layout_constants.cc @@ -3,20 +3,22 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include + #include "brave/browser/ui/brave_layout_constants.h" // Forward declaration int GetLayoutConstant_ChromiumImpl(LayoutConstant constant); -#define LayoutConstant LayoutConstant constant) { \ - const absl::optional braveOption = GetBraveLayoutConstant(constant); \ - if (braveOption) { \ - return braveOption.value(); \ - } \ - \ - return GetLayoutConstant_ChromiumImpl(constant); \ - } \ - \ +#define LayoutConstant LayoutConstant constant) { \ + const std::optional braveOption = GetBraveLayoutConstant(constant); \ + if (braveOption) { \ + return braveOption.value(); \ + } \ + \ + return GetLayoutConstant_ChromiumImpl(constant); \ + } \ + \ int GetLayoutConstant_ChromiumImpl(LayoutConstant #include "src/chrome/browser/ui/layout_constants.cc" diff --git a/chromium_src/chrome/browser/ui/views/download/download_item_view.h b/chromium_src/chrome/browser/ui/views/download/download_item_view.h index aa8acfd60f1..207cbda93ec 100644 --- a/chromium_src/chrome/browser/ui/views/download/download_item_view.h +++ b/chromium_src/chrome/browser/ui/views/download/download_item_view.h @@ -18,7 +18,6 @@ #include "chrome/browser/download/download_ui_model.h" #include "chrome/browser/icon_loader.h" #include "chrome/browser/ui/views/download/download_shelf_context_menu_view.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/base/metadata/metadata_header_macros.h" #include "ui/base/models/image_model.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chromium_src/chrome/browser/ui/views/location_bar/location_bar_view_browsertest.cc b/chromium_src/chrome/browser/ui/views/location_bar/location_bar_view_browsertest.cc index ad4fdf7e1eb..0eb11132f9b 100644 --- a/chromium_src/chrome/browser/ui/views/location_bar/location_bar_view_browsertest.cc +++ b/chromium_src/chrome/browser/ui/views/location_bar/location_bar_view_browsertest.cc @@ -3,11 +3,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "chrome/browser/ui/views/location_bar/location_bar_view.h" +#include #include "base/strings/string_util.h" #include "chrome/browser/ssl/security_state_tab_helper.h" #include "chrome/browser/ui/views/frame/browser_view.h" +#include "chrome/browser/ui/views/location_bar/location_bar_view.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "components/omnibox/browser/location_bar_model_impl.h" @@ -77,8 +78,7 @@ class SecurityIndicatorTest mojo::CreateDataPipe(nullptr, producer_handle, consumer_handle); params->client->OnReceiveResponse(std::move(resource_response), - std::move(consumer_handle), - absl::nullopt); + std::move(consumer_handle), std::nullopt); network::URLLoaderCompletionStatus completion_status; completion_status.ssl_info = ssl_info; diff --git a/chromium_src/chrome/browser/ui/views/side_panel/side_panel_coordinator.h b/chromium_src/chrome/browser/ui/views/side_panel/side_panel_coordinator.h index 416c16ccc31..5def18c984d 100644 --- a/chromium_src/chrome/browser/ui/views/side_panel/side_panel_coordinator.h +++ b/chromium_src/chrome/browser/ui/views/side_panel/side_panel_coordinator.h @@ -22,7 +22,6 @@ #include "chrome/browser/ui/views/side_panel/side_panel_registry_observer.h" #include "chrome/browser/ui/views/side_panel/side_panel_util.h" #include "chrome/browser/ui/views/side_panel/side_panel_view_state_observer.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/views/view_observer.h" #define CreateHeader \ diff --git a/chromium_src/chrome/renderer/worker_content_settings_client.cc b/chromium_src/chrome/renderer/worker_content_settings_client.cc index d54d47fb47d..b647f4a8da3 100644 --- a/chromium_src/chrome/renderer/worker_content_settings_client.cc +++ b/chromium_src/chrome/renderer/worker_content_settings_client.cc @@ -3,9 +3,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "chrome/renderer/worker_content_settings_client.h" +#include #include "brave/components/brave_shields/common/brave_shield_utils.h" +#include "chrome/renderer/worker_content_settings_client.h" #include "components/content_settings/renderer/content_settings_agent_impl.h" #include "net/base/features.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" @@ -58,7 +59,7 @@ WorkerContentSettingsClient::GetEphemeralStorageOriginSync() { EnsureContentSettingsManager(); - absl::optional optional_ephemeral_storage_origin; + std::optional optional_ephemeral_storage_origin; content_settings_manager_->AllowEphemeralStorageAccess( render_frame_id_, document_origin_, site_for_cookies_, top_frame_origin_, &optional_ephemeral_storage_origin); diff --git a/chromium_src/components/browsing_data/core/browsing_data_utils.cc b/chromium_src/components/browsing_data/core/browsing_data_utils.cc index d7d9daacdcf..733dba18c8e 100644 --- a/chromium_src/components/browsing_data/core/browsing_data_utils.cc +++ b/chromium_src/components/browsing_data/core/browsing_data_utils.cc @@ -5,6 +5,7 @@ #include "brave/chromium_src/components/browsing_data/core/browsing_data_utils.h" +#include #include #include "base/containers/fixed_flat_map.h" @@ -44,7 +45,7 @@ bool GetDeletionPreferenceFromDataType( data_type, clear_browsing_data_tab, out_pref); } -absl::optional GetDataTypeFromDeletionPreference( +std::optional GetDataTypeFromDeletionPreference( const std::string& pref_name) { static constexpr auto kPreferenceToDataType = base::MakeFixedFlatMap({ diff --git a/chromium_src/components/content_settings/browser/content_settings_manager_impl.cc b/chromium_src/components/content_settings/browser/content_settings_manager_impl.cc index e6eff5a95b9..49a51f23143 100644 --- a/chromium_src/components/content_settings/browser/content_settings_manager_impl.cc +++ b/chromium_src/components/content_settings/browser/content_settings_manager_impl.cc @@ -3,8 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "components/content_settings/browser/content_settings_manager_impl.h" +#include +#include "components/content_settings/browser/content_settings_manager_impl.h" #include "src/components/content_settings/browser/content_settings_manager_impl.cc" namespace content_settings { @@ -20,8 +21,8 @@ void ContentSettingsManagerImpl::AllowEphemeralStorageAccess( origin, site_for_cookies, top_frame_origin, net::CookieSettingOverrides(), storage_origin); std::move(callback).Run(should_use - ? absl::make_optional(storage_origin) - : absl::nullopt); + ? std::make_optional(storage_origin) + : std::nullopt); } } // namespace content_settings diff --git a/chromium_src/components/content_settings/core/browser/cookie_settings.cc b/chromium_src/components/content_settings/core/browser/cookie_settings.cc index 2f7ec97688c..56c1805d868 100644 --- a/chromium_src/components/content_settings/core/browser/cookie_settings.cc +++ b/chromium_src/components/content_settings/core/browser/cookie_settings.cc @@ -3,8 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "components/content_settings/core/browser/cookie_settings.h" +#include +#include "components/content_settings/core/browser/cookie_settings.h" #include "net/base/features.h" #include "net/base/url_util.h" @@ -27,7 +28,7 @@ void CookieSettings::ShutdownOnUIThread() { bool CookieSettings::ShouldUseEphemeralStorage( const url::Origin& origin, const net::SiteForCookies& site_for_cookies, - const absl::optional& top_frame_origin, + const std::optional& top_frame_origin, net::CookieSettingOverrides overrides, url::Origin& storage_origin) { const bool should_use = CookieSettingsBase::ShouldUseEphemeralStorage( diff --git a/chromium_src/components/content_settings/core/browser/cookie_settings.h b/chromium_src/components/content_settings/core/browser/cookie_settings.h index 5c2d3b3b991..d6a7c2d4a8d 100644 --- a/chromium_src/components/content_settings/core/browser/cookie_settings.h +++ b/chromium_src/components/content_settings/core/browser/cookie_settings.h @@ -6,6 +6,7 @@ #ifndef BRAVE_CHROMIUM_SRC_COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_COOKIE_SETTINGS_H_ #define BRAVE_CHROMIUM_SRC_COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_COOKIE_SETTINGS_H_ +#include #include #include "base/containers/flat_map.h" @@ -19,7 +20,7 @@ ShutdownOnUIThread_ChromiumImpl(); \ bool ShouldUseEphemeralStorage( \ const url::Origin& origin, const net::SiteForCookies& site_for_cookies, \ - const absl::optional& top_frame_origin, \ + const std::optional& top_frame_origin, \ net::CookieSettingOverrides overrides, url::Origin& storage_origin); \ std::vector TakeEphemeralStorageOpaqueOrigins( \ const std::string& ephemeral_storage_domain); \ diff --git a/chromium_src/components/content_settings/core/common/cookie_settings_base.cc b/chromium_src/components/content_settings/core/common/cookie_settings_base.cc index d6a16390311..e57c153f7d0 100644 --- a/chromium_src/components/content_settings/core/common/cookie_settings_base.cc +++ b/chromium_src/components/content_settings/core/common/cookie_settings_base.cc @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "components/content_settings/core/common/cookie_settings_base.h" +#include #include "base/auto_reset.h" #include "base/compiler_specific.h" @@ -12,12 +12,12 @@ #include "base/types/optional_util.h" #include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_pattern.h" +#include "components/content_settings/core/common/cookie_settings_base.h" #include "components/content_settings/core/common/features.h" #include "net/base/features.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "net/cookies/site_for_cookies.h" #include "third_party/abseil-cpp/absl/base/attributes.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h" #include "url/origin.h" @@ -96,7 +96,7 @@ bool CookieSettingsBase::ShouldUseEphemeralStorage( const GURL& url, const net::SiteForCookies& site_for_cookies, net::CookieSettingOverrides overrides, - const absl::optional& top_frame_origin) const { + const std::optional& top_frame_origin) const { if (!base::FeatureList::IsEnabled(net::features::kBraveEphemeralStorage)) return false; @@ -108,7 +108,7 @@ bool CookieSettingsBase::ShouldUseEphemeralStorage( // Enable ephemeral storage for a first party URL if SESSION_ONLY cookie // setting is set and the feature is enabled. - absl::optional first_party_setting; + std::optional first_party_setting; if (base::FeatureList::IsEnabled( net::features::kBraveFirstPartyEphemeralStorage)) { first_party_setting = GetCookieSettingWithBraveMetadata( @@ -137,7 +137,7 @@ bool CookieSettingsBase::ShouldUseEphemeralStorage( bool CookieSettingsBase::IsEphemeralCookieAccessAllowed( const GURL& url, const net::SiteForCookies& site_for_cookies, - const absl::optional& top_frame_origin, + const std::optional& top_frame_origin, net::CookieSettingOverrides overrides) const { if (ShouldUseEphemeralStorage(url, site_for_cookies, overrides, top_frame_origin)) { @@ -151,7 +151,7 @@ bool CookieSettingsBase::IsEphemeralCookieAccessAllowed( bool CookieSettingsBase::IsFullCookieAccessAllowed( const GURL& url, const net::SiteForCookies& site_for_cookies, - const absl::optional& top_frame_origin, + const std::optional& top_frame_origin, net::CookieSettingOverrides overrides, CookieSettingWithMetadata* cookie_settings) const { return IsCookieAccessAllowedImpl(url, site_for_cookies, top_frame_origin, @@ -161,7 +161,7 @@ bool CookieSettingsBase::IsFullCookieAccessAllowed( bool CookieSettingsBase::IsCookieAccessAllowedImpl( const GURL& url, const net::SiteForCookies& site_for_cookies, - const absl::optional& top_frame_origin, + const std::optional& top_frame_origin, net::CookieSettingOverrides overrides, CookieSettingWithMetadata* cookie_settings) const { bool allow = IsChromiumFullCookieAccessAllowed( diff --git a/chromium_src/components/content_settings/core/common/cookie_settings_base.h b/chromium_src/components/content_settings/core/common/cookie_settings_base.h index 95b82037369..040cc99074c 100644 --- a/chromium_src/components/content_settings/core/common/cookie_settings_base.h +++ b/chromium_src/components/content_settings/core/common/cookie_settings_base.h @@ -6,6 +6,8 @@ #ifndef BRAVE_CHROMIUM_SRC_COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_COOKIE_SETTINGS_BASE_H_ #define BRAVE_CHROMIUM_SRC_COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_COOKIE_SETTINGS_BASE_H_ +#include + #include "components/content_settings/core/common/content_settings.h" namespace content_settings { @@ -36,14 +38,14 @@ struct CookieSettingWithBraveMetadata { ShouldUseEphemeralStorage( \ const GURL& url, const net::SiteForCookies& site_for_cookies, \ net::CookieSettingOverrides overrides, \ - const absl::optional& top_frame_origin) const; \ + const std::optional& top_frame_origin) const; \ bool IsEphemeralCookieAccessAllowed( \ const GURL& url, const net::SiteForCookies& site_for_cookies, \ - const absl::optional& top_frame_origin, \ + const std::optional& top_frame_origin, \ net::CookieSettingOverrides overrides) const; \ bool IsChromiumFullCookieAccessAllowed( \ const GURL& url, const net::SiteForCookies& site_for_cookies, \ - const absl::optional& top_frame_origin, \ + const std::optional& top_frame_origin, \ net::CookieSettingOverrides overrides, \ CookieSettingWithMetadata* cookie_settings) const; \ bool ShouldBlockThirdPartyIfSettingIsExplicit( \ @@ -58,7 +60,7 @@ struct CookieSettingWithBraveMetadata { private: \ bool IsCookieAccessAllowedImpl( \ const GURL& url, const net::SiteForCookies& site_for_cookies, \ - const absl::optional& top_frame_origin, \ + const std::optional& top_frame_origin, \ net::CookieSettingOverrides overrides, \ CookieSettingWithMetadata* cookie_settings) const; \ \ diff --git a/chromium_src/components/os_crypt/sync/key_storage_kwallet.cc b/chromium_src/components/os_crypt/sync/key_storage_kwallet.cc index e5d96ed27e8..3d624ed4ed5 100644 --- a/chromium_src/components/os_crypt/sync/key_storage_kwallet.cc +++ b/chromium_src/components/os_crypt/sync/key_storage_kwallet.cc @@ -3,11 +3,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "components/os_crypt/sync/key_storage_kwallet.h" - +#include #include #include "base/command_line.h" +#include "components/os_crypt/sync/key_storage_kwallet.h" namespace { void Dummy(const int handle, @@ -20,7 +20,7 @@ void Dummy(const int handle, if (kwallet_dbus_->ReadPassword(handle_, GetFolderName(), GetKeyName(), \ app_name_, \ &password) != KWalletDBus::SUCCESS) { \ - return absl::nullopt; \ + return std::nullopt; \ /* NOLINTNEXTLINE */ \ } else if (false) diff --git a/chromium_src/components/permissions/bluetooth_chooser_controller.cc b/chromium_src/components/permissions/bluetooth_chooser_controller.cc index 25ede941b1b..05c3d767fef 100644 --- a/chromium_src/components/permissions/bluetooth_chooser_controller.cc +++ b/chromium_src/components/permissions/bluetooth_chooser_controller.cc @@ -3,11 +3,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include + #include "src/components/permissions/bluetooth_chooser_controller.cc" namespace permissions { -absl::optional BluetoothChooserController::GetType() +std::optional BluetoothChooserController::GetType() const { return ChooserControllerType::kBluetooth; } diff --git a/chromium_src/components/permissions/bluetooth_chooser_controller.h b/chromium_src/components/permissions/bluetooth_chooser_controller.h index 65680c6864f..a08dc8b196e 100644 --- a/chromium_src/components/permissions/bluetooth_chooser_controller.h +++ b/chromium_src/components/permissions/bluetooth_chooser_controller.h @@ -6,11 +6,13 @@ #ifndef BRAVE_CHROMIUM_SRC_COMPONENTS_PERMISSIONS_BLUETOOTH_CHOOSER_CONTROLLER_H_ #define BRAVE_CHROMIUM_SRC_COMPONENTS_PERMISSIONS_BLUETOOTH_CHOOSER_CONTROLLER_H_ +#include + #include "components/permissions/chooser_controller.h" #define GetThrobberLabelAndTooltip(...) \ GetThrobberLabelAndTooltip(__VA_ARGS__) const override; \ - absl::optional GetType() + std::optional GetType() #include "src/components/permissions/bluetooth_chooser_controller.h" // IWYU pragma: export diff --git a/chromium_src/components/permissions/bluetooth_scanning_prompt_controller.cc b/chromium_src/components/permissions/bluetooth_scanning_prompt_controller.cc index a47c2827a72..ee0a8069c77 100644 --- a/chromium_src/components/permissions/bluetooth_scanning_prompt_controller.cc +++ b/chromium_src/components/permissions/bluetooth_scanning_prompt_controller.cc @@ -3,11 +3,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include + #include "src/components/permissions/bluetooth_scanning_prompt_controller.cc" namespace permissions { -absl::optional +std::optional BluetoothScanningPromptController::GetType() const { return ChooserControllerType::kBluetooth; } diff --git a/chromium_src/components/permissions/bluetooth_scanning_prompt_controller.h b/chromium_src/components/permissions/bluetooth_scanning_prompt_controller.h index f9a4aabd0f7..9f6fd37fa03 100644 --- a/chromium_src/components/permissions/bluetooth_scanning_prompt_controller.h +++ b/chromium_src/components/permissions/bluetooth_scanning_prompt_controller.h @@ -6,11 +6,13 @@ #ifndef BRAVE_CHROMIUM_SRC_COMPONENTS_PERMISSIONS_BLUETOOTH_SCANNING_PROMPT_CONTROLLER_H_ #define BRAVE_CHROMIUM_SRC_COMPONENTS_PERMISSIONS_BLUETOOTH_SCANNING_PROMPT_CONTROLLER_H_ +#include + #include "components/permissions/chooser_controller.h" #define GetThrobberLabelAndTooltip(...) \ GetThrobberLabelAndTooltip(__VA_ARGS__) const override; \ - absl::optional GetType() + std::optional GetType() #include "src/components/permissions/bluetooth_scanning_prompt_controller.h" // IWYU pragma: export diff --git a/chromium_src/components/permissions/chooser_controller.cc b/chromium_src/components/permissions/chooser_controller.cc index 3951ba45be8..9784617462d 100644 --- a/chromium_src/components/permissions/chooser_controller.cc +++ b/chromium_src/components/permissions/chooser_controller.cc @@ -3,14 +3,15 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "components/permissions/chooser_controller.h" +#include +#include "components/permissions/chooser_controller.h" #include "src/components/permissions/chooser_controller.cc" namespace permissions { -absl::optional ChooserController::GetType() const { - return absl::nullopt; +std::optional ChooserController::GetType() const { + return std::nullopt; } } // namespace permissions diff --git a/chromium_src/components/permissions/chooser_controller.h b/chromium_src/components/permissions/chooser_controller.h index a82286cf915..a3b1804ca27 100644 --- a/chromium_src/components/permissions/chooser_controller.h +++ b/chromium_src/components/permissions/chooser_controller.h @@ -6,7 +6,7 @@ #ifndef BRAVE_CHROMIUM_SRC_COMPONENTS_PERMISSIONS_CHOOSER_CONTROLLER_H_ #define BRAVE_CHROMIUM_SRC_COMPONENTS_PERMISSIONS_CHOOSER_CONTROLLER_H_ -#include "third_party/abseil-cpp/absl/types/optional.h" +#include namespace permissions { @@ -18,7 +18,7 @@ enum class ChooserControllerType { #define GetSelectAllCheckboxLabel(...) \ GetSelectAllCheckboxLabel(__VA_ARGS__) const; \ - virtual absl::optional GetType() + virtual std::optional GetType() #include "src/components/permissions/chooser_controller.h" // IWYU pragma: export diff --git a/chromium_src/components/permissions/permission_request.cc b/chromium_src/components/permissions/permission_request.cc index d09f42e824f..72e9498a564 100644 --- a/chromium_src/components/permissions/permission_request.cc +++ b/chromium_src/components/permissions/permission_request.cc @@ -3,13 +3,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "components/permissions/permission_request.h" - +#include #include #include "base/containers/contains.h" #include "build/build_config.h" #include "components/grit/brave_components_strings.h" +#include "components/permissions/permission_request.h" #include "components/strings/grit/components_strings.h" #include "third_party/widevine/cdm/buildflags.h" @@ -121,12 +121,12 @@ bool PermissionRequest::SupportsLifetime() const { return !base::Contains(kExcludedTypes, request_type()); } -void PermissionRequest::SetLifetime(absl::optional lifetime) { +void PermissionRequest::SetLifetime(std::optional lifetime) { DCHECK(SupportsLifetime()); lifetime_ = std::move(lifetime); } -const absl::optional& PermissionRequest::GetLifetime() const { +const std::optional& PermissionRequest::GetLifetime() const { DCHECK(SupportsLifetime()); return lifetime_; } diff --git a/chromium_src/components/permissions/permission_request.h b/chromium_src/components/permissions/permission_request.h index 478fd6dc4fc..3f3fb9ceafb 100644 --- a/chromium_src/components/permissions/permission_request.h +++ b/chromium_src/components/permissions/permission_request.h @@ -6,6 +6,8 @@ #ifndef BRAVE_CHROMIUM_SRC_COMPONENTS_PERMISSIONS_PERMISSION_REQUEST_H_ #define BRAVE_CHROMIUM_SRC_COMPONENTS_PERMISSIONS_PERMISSION_REQUEST_H_ +#include + #include "base/memory/weak_ptr.h" #include "base/time/time.h" @@ -35,8 +37,8 @@ class PermissionRequest : public PermissionRequest_ChromiumImpl { ~PermissionRequest() override; bool SupportsLifetime() const; - void SetLifetime(absl::optional lifetime); - const absl::optional& GetLifetime() const; + void SetLifetime(std::optional lifetime); + const std::optional& GetLifetime() const; void set_dont_ask_again(bool dont_ask_again) { dont_ask_again_ = dont_ask_again; @@ -52,7 +54,7 @@ class PermissionRequest : public PermissionRequest_ChromiumImpl { base::WeakPtr GetWeakPtr(); private: - absl::optional lifetime_; + std::optional lifetime_; bool dont_ask_again_ = false; diff --git a/chromium_src/components/permissions/permission_request_data.cc b/chromium_src/components/permissions/permission_request_data.cc index 477a89ddf4d..981030bb2b1 100644 --- a/chromium_src/components/permissions/permission_request_data.cc +++ b/chromium_src/components/permissions/permission_request_data.cc @@ -3,12 +3,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "components/permissions/permission_request_data.h" +#include + #include "components/permissions/permission_context_base.h" +#include "components/permissions/permission_request_data.h" namespace permissions { -absl::optional ContentSettingsTypeToRequestTypeIfExists_BraveImpl( +std::optional ContentSettingsTypeToRequestTypeIfExists_BraveImpl( ContentSettingsType content_settings_type) { switch (content_settings_type) { case ContentSettingsType::BRAVE_ETHEREUM: diff --git a/chromium_src/components/permissions/request_type.cc b/chromium_src/components/permissions/request_type.cc index 7f097647d8d..c9c9156c40e 100644 --- a/chromium_src/components/permissions/request_type.cc +++ b/chromium_src/components/permissions/request_type.cc @@ -3,9 +3,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "components/permissions/request_type.h" +#include #include "build/build_config.h" +#include "components/permissions/request_type.h" #if BUILDFLAG(IS_ANDROID) #include "components/resources/android/theme_resources.h" @@ -99,7 +100,7 @@ RequestType ContentSettingsTypeToRequestType( } } -absl::optional RequestTypeToContentSettingsType( +std::optional RequestTypeToContentSettingsType( RequestType request_type) { switch (request_type) { case RequestType::kBraveGoogleSignInPermission: diff --git a/chromium_src/components/permissions/request_type.h b/chromium_src/components/permissions/request_type.h index 48159693ad2..db0c865a41b 100644 --- a/chromium_src/components/permissions/request_type.h +++ b/chromium_src/components/permissions/request_type.h @@ -18,6 +18,8 @@ #define IsRequestablePermissionType IsRequestablePermissionType_ChromiumImpl +#include + #include "src/components/permissions/request_type.h" // IWYU pragma: export #undef kStorageAccess @@ -30,7 +32,7 @@ namespace permissions { RequestType ContentSettingsTypeToRequestType( ContentSettingsType content_settings_type); -absl::optional RequestTypeToContentSettingsType( +std::optional RequestTypeToContentSettingsType( RequestType request_type); bool IsRequestablePermissionType(ContentSettingsType content_settings_type); diff --git a/chromium_src/components/send_tab_to_self/entry_point_display_reason.cc b/chromium_src/components/send_tab_to_self/entry_point_display_reason.cc index c0caab278fc..2a65d2dc494 100644 --- a/chromium_src/components/send_tab_to_self/entry_point_display_reason.cc +++ b/chromium_src/components/send_tab_to_self/entry_point_display_reason.cc @@ -3,6 +3,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include + #include "components/send_tab_to_self/entry_point_display_reason.h" #define GetEntryPointDisplayReason GetEntryPointDisplayReason_ChromiumImpl @@ -13,12 +15,12 @@ namespace send_tab_to_self { namespace internal { -absl::optional GetEntryPointDisplayReason( +std::optional GetEntryPointDisplayReason( const GURL& url_to_share, syncer::SyncService* sync_service, SendTabToSelfModel* send_tab_to_self_model, PrefService* pref_service) { - absl::optional reason = + std::optional reason = GetEntryPointDisplayReason_ChromiumImpl( url_to_share, sync_service, send_tab_to_self_model, pref_service); if (!reason) { @@ -31,7 +33,7 @@ absl::optional GetEntryPointDisplayReason( // still want to prevent the UI from showing. if (*reason == EntryPointDisplayReason::kInformNoTargetDevice || *reason == EntryPointDisplayReason::kOfferSignIn) { - return absl::nullopt; + return std::nullopt; } return reason; diff --git a/chromium_src/components/send_tab_to_self/entry_point_display_reason.h b/chromium_src/components/send_tab_to_self/entry_point_display_reason.h index 3bf16fdb55e..438f8883faa 100644 --- a/chromium_src/components/send_tab_to_self/entry_point_display_reason.h +++ b/chromium_src/components/send_tab_to_self/entry_point_display_reason.h @@ -7,6 +7,8 @@ #define BRAVE_CHROMIUM_SRC_COMPONENTS_SEND_TAB_TO_SELF_ENTRY_POINT_DISPLAY_REASON_H_ #define GetEntryPointDisplayReason GetEntryPointDisplayReason_ChromiumImpl +#include + #include "src/components/send_tab_to_self/entry_point_display_reason.h" // IWYU pragma: export #undef GetEntryPointDisplayReason @@ -14,7 +16,7 @@ namespace send_tab_to_self { namespace internal { -absl::optional GetEntryPointDisplayReason( +std::optional GetEntryPointDisplayReason( const GURL& url_to_share, syncer::SyncService* sync_service, SendTabToSelfModel* send_tab_to_self_model, diff --git a/chromium_src/components/sync_device_info/device_info_sync_bridge_unittest.cc b/chromium_src/components/sync_device_info/device_info_sync_bridge_unittest.cc index ba69bd18f3e..126da1aefb5 100644 --- a/chromium_src/components/sync_device_info/device_info_sync_bridge_unittest.cc +++ b/chromium_src/components/sync_device_info/device_info_sync_bridge_unittest.cc @@ -3,6 +3,7 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this file, // you can obtain one at http://mozilla.org/MPL/2.0/. +#include #include #include "base/system/sys_info.h" @@ -187,7 +188,7 @@ TEST_F(DeviceInfoSyncBridgeTest, // An incoming deletion for the local device info should not cause a reupload EXPECT_CALL(*processor(), Put(CacheGuidForSuffix(kLocalSuffix), _, _)) .Times(0); - absl::optional error = bridge()->ApplyIncrementalSyncChanges( + std::optional error = bridge()->ApplyIncrementalSyncChanges( bridge()->CreateMetadataChangeList(), std::move(changes)); ASSERT_FALSE(error); diff --git a/chromium_src/components/sync_preferences/common_syncable_prefs_database.cc b/chromium_src/components/sync_preferences/common_syncable_prefs_database.cc index 500ae19a975..813ba045896 100644 --- a/chromium_src/components/sync_preferences/common_syncable_prefs_database.cc +++ b/chromium_src/components/sync_preferences/common_syncable_prefs_database.cc @@ -3,12 +3,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "components/sync_preferences/common_syncable_prefs_database.h" - +#include #include #include "base/containers/fixed_flat_map.h" #include "components/search_engines/search_engines_pref_names.h" +#include "components/sync_preferences/common_syncable_prefs_database.h" // "//components/sync_preferences:common_syncable_prefs_database" already // depends on "//components/search_engines" @@ -43,7 +43,7 @@ const auto& BraveSyncablePreferences() { namespace sync_preferences { -absl::optional +std::optional CommonSyncablePrefsDatabase::GetSyncablePrefMetadata( const std::string& pref_name) const { const auto* it = BraveSyncablePreferences().find(pref_name); @@ -53,7 +53,7 @@ CommonSyncablePrefsDatabase::GetSyncablePrefMetadata( return GetSyncablePrefMetadata_ChromiumOriginalImpl(pref_name); } -absl::optional +std::optional CommonSyncablePrefsDatabase::GetSyncablePrefMetadata_ChromiumImpl( const std::string& pref_name) const { return GetSyncablePrefMetadata(pref_name); diff --git a/chromium_src/components/sync_preferences/common_syncable_prefs_database.h b/chromium_src/components/sync_preferences/common_syncable_prefs_database.h index c1b9c92def1..c5cd626f277 100644 --- a/chromium_src/components/sync_preferences/common_syncable_prefs_database.h +++ b/chromium_src/components/sync_preferences/common_syncable_prefs_database.h @@ -6,6 +6,8 @@ #ifndef BRAVE_CHROMIUM_SRC_COMPONENTS_SYNC_PREFERENCES_COMMON_SYNCABLE_PREFS_DATABASE_H_ #define BRAVE_CHROMIUM_SRC_COMPONENTS_SYNC_PREFERENCES_COMMON_SYNCABLE_PREFS_DATABASE_H_ +#include + #include "components/sync_preferences/syncable_prefs_database.h" // To accommodate ChromeSyncablePrefsDatabase::GetSyncablePrefMetadata having @@ -15,10 +17,10 @@ // will become GetSyncablePrefMetadata_ChromiumOriginalImpl. #define GetSyncablePrefMetadata \ GetSyncablePrefMetadata_ChromiumImpl(const std::string& pref_name) const; \ - absl::optional \ + std::optional \ GetSyncablePrefMetadata_ChromiumOriginalImpl(const std::string& pref_name) \ const; \ - absl::optional GetSyncablePrefMetadata + std::optional GetSyncablePrefMetadata #include "src/components/sync_preferences/common_syncable_prefs_database.h" // IWYU pragma: export #undef GetSyncablePrefMetadata diff --git a/chromium_src/components/update_client/protocol_serializer.cc b/chromium_src/components/update_client/protocol_serializer.cc index c3040831cca..987ff37e582 100644 --- a/chromium_src/components/update_client/protocol_serializer.cc +++ b/chromium_src/components/update_client/protocol_serializer.cc @@ -3,11 +3,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "components/update_client/protocol_serializer.h" +#include #include "base/check.h" #include "brave/components/constants/brave_services_key.h" #include "brave/components/widevine/static_buildflags.h" +#include "components/update_client/protocol_serializer.h" #if BUILDFLAG(WIDEVINE_ARM64_DLL_FIX) #include "brave/components/widevine/constants.h" @@ -49,7 +50,7 @@ protocol_request::Request MakeProtocolRequest( const std::string& channel, const std::string& os_long_name, const std::string& download_preference, - absl::optional domain_joined, + std::optional domain_joined, const base::flat_map& additional_attributes, const base::flat_map& updater_state_attributes, std::vector apps) { diff --git a/chromium_src/components/update_client/update_checker.cc b/chromium_src/components/update_client/update_checker.cc index 4b533d87267..39515432b0d 100644 --- a/chromium_src/components/update_client/update_checker.cc +++ b/chromium_src/components/update_client/update_checker.cc @@ -3,6 +3,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include + #include "src/components/update_client/update_checker.cc" #if BUILDFLAG(WIDEVINE_ARM64_DLL_FIX) @@ -110,7 +112,7 @@ void SequentialUpdateChecker::UpdateResultAvailable( #if BUILDFLAG(WIDEVINE_ARM64_DLL_FIX) std::string fake_architecture, #endif - const absl::optional& results, + const std::optional& results, ErrorCategory error_category, int error, int retry_after_sec) { @@ -159,8 +161,8 @@ void SequentialUpdateChecker::UpdateResultAvailable( FROM_HERE, base::BindOnce( std::move(update_check_callback_), - error ? absl::nullopt - : absl::make_optional(results_), + error ? std::nullopt + : std::make_optional(results_), error_category, error, retry_after_sec)); remaining_ids_.clear(); diff --git a/chromium_src/components/update_client/update_checker.h b/chromium_src/components/update_client/update_checker.h index a2656d3f47f..95274e6e02a 100644 --- a/chromium_src/components/update_client/update_checker.h +++ b/chromium_src/components/update_client/update_checker.h @@ -6,9 +6,8 @@ #ifndef BRAVE_CHROMIUM_SRC_COMPONENTS_UPDATE_CLIENT_UPDATE_CHECKER_H_ #define BRAVE_CHROMIUM_SRC_COMPONENTS_UPDATE_CLIENT_UPDATE_CHECKER_H_ -#include "src/components/update_client/update_checker.h" // IWYU pragma: export - #include +#include #include #include @@ -21,7 +20,7 @@ #include "components/update_client/configurator.h" #include "components/update_client/persisted_data.h" #include "components/update_client/update_client_errors.h" -#include "third_party/abseil-cpp/absl/types/optional.h" +#include "src/components/update_client/update_checker.h" // IWYU pragma: export namespace update_client { @@ -65,7 +64,7 @@ class SequentialUpdateChecker : public UpdateChecker { #if BUILDFLAG(WIDEVINE_ARM64_DLL_FIX) std::string fake_architecture, #endif - const absl::optional& results, + const std::optional& results, ErrorCategory error_category, int error, int retry_after_sec); diff --git a/chromium_src/content/browser/attribution_reporting/attribution_storage_delegate_impl.cc b/chromium_src/content/browser/attribution_reporting/attribution_storage_delegate_impl.cc index d638284a6e8..625e3a4a74c 100644 --- a/chromium_src/content/browser/attribution_reporting/attribution_storage_delegate_impl.cc +++ b/chromium_src/content/browser/attribution_reporting/attribution_storage_delegate_impl.cc @@ -3,6 +3,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include + #include "content/browser/attribution_reporting/attribution_storage_delegate_impl.h" #define GetNullAggregatableReports GetNullAggregatableReports_ChromiumImpl @@ -15,7 +17,7 @@ std::vector AttributionStorageDelegateImpl::GetNullAggregatableReports( const AttributionTrigger& trigger, base::Time trigger_time, - absl::optional attributed_source_time) const { + std::optional attributed_source_time) const { return {}; } diff --git a/chromium_src/content/browser/browser_context.cc b/chromium_src/content/browser/browser_context.cc index e473f04bf09..bd33d4d489e 100644 --- a/chromium_src/content/browser/browser_context.cc +++ b/chromium_src/content/browser/browser_context.cc @@ -3,8 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "content/public/browser/browser_context.h" - +#include #include #include "base/memory/ref_counted.h" @@ -14,11 +13,11 @@ #include "content/browser/renderer_host/navigation_controller_impl.h" #include "content/browser/renderer_host/render_view_host_delegate.h" #include "content/browser/site_instance_impl.h" +#include "content/public/browser/browser_context.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/session_storage_namespace.h" #include "content/public/browser/storage_partition.h" #include "content/public/browser/web_contents.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace content { @@ -30,7 +29,7 @@ GetRemoteBlobStorageContextFor(BrowserContext* browser_context) { scoped_refptr CreateSessionStorageNamespace( content::StoragePartition* partition, const std::string& namespace_id, - absl::optional clone_from_namespace_id) { + std::optional clone_from_namespace_id) { content::DOMStorageContextWrapper* context_wrapper = static_cast( partition->GetDOMStorageContext()); diff --git a/chromium_src/content/public/browser/browser_context.h b/chromium_src/content/public/browser/browser_context.h index b827e3f0b86..7aaa71bae90 100644 --- a/chromium_src/content/public/browser/browser_context.h +++ b/chromium_src/content/public/browser/browser_context.h @@ -9,6 +9,8 @@ #define IsOffTheRecord \ IsTor() const; \ virtual bool IsOffTheRecord +#include + #include "src/content/public/browser/browser_context.h" // IWYU pragma: export #undef IsOffTheRecord @@ -17,7 +19,6 @@ #include "components/services/storage/public/mojom/blob_storage_context.mojom.h" #include "content/common/content_export.h" #include "mojo/public/cpp/bindings/pending_receiver.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace content { @@ -32,7 +33,7 @@ CONTENT_EXPORT scoped_refptr CreateSessionStorageNamespace( content::StoragePartition* partition, const std::string& namespace_id, - absl::optional clone_from_namespace_id); + std::optional clone_from_namespace_id); CONTENT_EXPORT std::string GetSessionStorageNamespaceId(WebContents*); diff --git a/chromium_src/net/cookies/brave_canonical_cookie_unittest.cc b/chromium_src/net/cookies/brave_canonical_cookie_unittest.cc index 352ab51abdd..599a0830fdd 100644 --- a/chromium_src/net/cookies/brave_canonical_cookie_unittest.cc +++ b/chromium_src/net/cookies/brave_canonical_cookie_unittest.cc @@ -3,9 +3,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "net/cookies/canonical_cookie.h" +#include #include "base/time/time.h" +#include "net/cookies/canonical_cookie.h" #include "net/cookies/cookie_constants.h" #include "net/cookies/cookie_options.h" #include "testing/gtest/include/gtest/gtest.h" @@ -35,19 +36,19 @@ TEST(BraveCanonicalCookieTest, SetMaxExpiration) { std::unique_ptr cookie(CanonicalCookie::Create( url, max_expires_date_cookie, creation_time, - /*server_time=*/absl::nullopt, /*cookie_partition_key=*/absl::nullopt)); + /*server_time=*/std::nullopt, /*cookie_partition_key=*/std::nullopt)); EXPECT_TRUE(cookie.get()); EXPECT_EQ(cookie->ExpiryDate(), creation_time + kMaxCookieExpiration); cookie = CanonicalCookie::Create(url, max_age_cookie, creation_time, - /*server_time=*/absl::nullopt, - /*cookie_partition_key=*/absl::nullopt); + /*server_time=*/std::nullopt, + /*cookie_partition_key=*/std::nullopt); EXPECT_TRUE(cookie.get()); EXPECT_EQ(cookie->ExpiryDate(), creation_time + kMaxCookieExpiration); cookie = CanonicalCookie::Create(url, max_expires_and_max_age_cookie, - creation_time, /*server_time=*/absl::nullopt, - /*cookie_partition_key=*/absl::nullopt); + creation_time, /*server_time=*/std::nullopt, + /*cookie_partition_key=*/std::nullopt); EXPECT_TRUE(cookie.get()); EXPECT_EQ(cookie->ExpiryDate(), creation_time + kMaxCookieExpiration); } @@ -57,7 +58,7 @@ TEST(BraveCanonicalCookieTest, AllowShorterThanMaxExpiration) { // Short-lived cookies get to keep their shorter expiration. std::unique_ptr cookie = CanonicalCookie::Create( url, short_expiration_cookie, creation_time, - /*server_time=*/absl::nullopt, /*cookie_partition_key=*/absl::nullopt); + /*server_time=*/std::nullopt, /*cookie_partition_key=*/std::nullopt); EXPECT_TRUE(cookie.get()); EXPECT_EQ(cookie->ExpiryDate(), creation_time + base::Days(2)); } @@ -67,8 +68,8 @@ TEST(BraveCanonicalCookieTest, SetHTTPOnlyMaxExpiration) { // HTTP cookies with 'httponly' work as expected. std::unique_ptr cookie = CanonicalCookie::Create( - url, cookie_line5, creation_time, /*server_time=*/absl::nullopt, - /*cookie_partition_key=*/absl::nullopt); + url, cookie_line5, creation_time, /*server_time=*/std::nullopt, + /*cookie_partition_key=*/std::nullopt); EXPECT_TRUE(cookie.get()); EXPECT_EQ(cookie->ExpiryDate(), creation_time + kMaxCookieExpiration); } @@ -77,8 +78,8 @@ TEST(BraveCanonicalCookieTest, NoExpirationCookie) { GURL url("https://www.example.com/test"); std::unique_ptr cookie(CanonicalCookie::Create( - url, no_expiration_cookie, creation_time, /*server_time=*/absl::nullopt, - /*cookie_partition_key=*/absl::nullopt)); + url, no_expiration_cookie, creation_time, /*server_time=*/std::nullopt, + /*cookie_partition_key=*/std::nullopt)); EXPECT_TRUE(cookie.get()); EXPECT_EQ(cookie->IsPersistent(), false); } diff --git a/chromium_src/net/cookies/cookie_access_delegate.cc b/chromium_src/net/cookies/cookie_access_delegate.cc index 96e5b185082..c81ba5e2e72 100644 --- a/chromium_src/net/cookies/cookie_access_delegate.cc +++ b/chromium_src/net/cookies/cookie_access_delegate.cc @@ -3,10 +3,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "net/cookies/cookie_access_delegate.h" +#include #include "base/notreached.h" - +#include "net/cookies/cookie_access_delegate.h" #include "src/net/cookies/cookie_access_delegate.cc" namespace net { @@ -19,7 +19,7 @@ bool CookieAccessDelegate::ShouldUseEphemeralStorage( const GURL& url, const net::SiteForCookies& site_for_cookies, net::CookieSettingOverrides overrides, - const absl::optional& top_frame_origin) const { + const std::optional& top_frame_origin) const { NOTREACHED() << "Should be overridden"; return false; } diff --git a/chromium_src/net/cookies/cookie_access_delegate.h b/chromium_src/net/cookies/cookie_access_delegate.h index d0eb10c09ec..3f93fafae6a 100644 --- a/chromium_src/net/cookies/cookie_access_delegate.h +++ b/chromium_src/net/cookies/cookie_access_delegate.h @@ -6,9 +6,10 @@ #ifndef BRAVE_CHROMIUM_SRC_NET_COOKIES_COOKIE_ACCESS_DELEGATE_H_ #define BRAVE_CHROMIUM_SRC_NET_COOKIES_COOKIE_ACCESS_DELEGATE_H_ +#include + #include "net/cookies/cookie_setting_override.h" #include "net/cookies/site_for_cookies.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h" #include "url/origin.h" @@ -17,7 +18,7 @@ virtual bool ShouldUseEphemeralStorage( \ const GURL& url, const net::SiteForCookies& site_for_cookies, \ net::CookieSettingOverrides overrides, \ - const absl::optional& top_frame_origin) const; \ + const std::optional& top_frame_origin) const; \ virtual bool ShouldTreatUrlAsTrustworthy #include "src/net/cookies/cookie_access_delegate.h" // IWYU pragma: export diff --git a/chromium_src/net/cookies/cookie_deletion_info.h b/chromium_src/net/cookies/cookie_deletion_info.h index 9e685eeeb96..61300661621 100644 --- a/chromium_src/net/cookies/cookie_deletion_info.h +++ b/chromium_src/net/cookies/cookie_deletion_info.h @@ -7,7 +7,9 @@ #define BRAVE_CHROMIUM_SRC_NET_COOKIES_COOKIE_DELETION_INFO_H_ #define BRAVE_COOKIE_DELETION_INFO_H \ - absl::optional ephemeral_storage_domain; + std::optional ephemeral_storage_domain; + +#include #include "src/net/cookies/cookie_deletion_info.h" // IWYU pragma: export diff --git a/chromium_src/net/cookies/cookie_monster.cc b/chromium_src/net/cookies/cookie_monster.cc index a011e94bbab..f336feec1df 100644 --- a/chromium_src/net/cookies/cookie_monster.cc +++ b/chromium_src/net/cookies/cookie_monster.cc @@ -3,10 +3,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "net/cookies/cookie_monster.h" - #include +#include + #include "net/base/url_util.h" +#include "net/cookies/cookie_monster.h" #define CookieMonster ChromiumCookieMonster #include "src/net/cookies/cookie_monster.cc" @@ -99,7 +100,7 @@ void CookieMonster::SetCanonicalCookieAsync( const GURL& source_url, const CookieOptions& options, SetCookiesCallback callback, - absl::optional cookie_access_result) { + std::optional cookie_access_result) { if (options.should_use_ephemeral_storage()) { if (!options.top_frame_origin()) { // Shouldn't happen, but don't do anything in this case. diff --git a/chromium_src/net/cookies/cookie_monster.h b/chromium_src/net/cookies/cookie_monster.h index 9542a6fb3c0..1fee5ee9ae0 100644 --- a/chromium_src/net/cookies/cookie_monster.h +++ b/chromium_src/net/cookies/cookie_monster.h @@ -7,6 +7,8 @@ #define BRAVE_CHROMIUM_SRC_NET_COOKIES_COOKIE_MONSTER_H_ #define CookieMonster ChromiumCookieMonster +#include + #include "src/net/cookies/cookie_monster.h" // IWYU pragma: export #undef CookieMonster @@ -42,8 +44,8 @@ class NET_EXPORT CookieMonster : public ChromiumCookieMonster { const GURL& source_url, const CookieOptions& options, SetCookiesCallback callback, - absl::optional cookie_access_result = - absl::nullopt) override; + std::optional cookie_access_result = + std::nullopt) override; void GetCookieListWithOptionsAsync( const GURL& url, const CookieOptions& options, diff --git a/chromium_src/net/cookies/cookie_options.cc b/chromium_src/net/cookies/cookie_options.cc index a95d3bdf036..e8cd060a575 100644 --- a/chromium_src/net/cookies/cookie_options.cc +++ b/chromium_src/net/cookies/cookie_options.cc @@ -3,9 +3,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "net/cookies/cookie_options.h" +#include #include "net/cookies/cookie_access_delegate.h" +#include "net/cookies/cookie_options.h" #define CookieOptions CookieOptions_ChromiumImpl #include "src/net/cookies/cookie_options.cc" @@ -28,7 +29,7 @@ CookieOptions::CookieOptions(CookieOptions_ChromiumImpl&& rhs) void FillEphemeralStorageParams( const GURL& url, const SiteForCookies& site_for_cookies, - const absl::optional& top_frame_origin, + const std::optional& top_frame_origin, const CookieAccessDelegate* cookie_access_delegate, CookieOptions* cookie_options) { DCHECK(cookie_options); diff --git a/chromium_src/net/cookies/cookie_options.h b/chromium_src/net/cookies/cookie_options.h index 4454d76ad24..6d5dcd32e90 100644 --- a/chromium_src/net/cookies/cookie_options.h +++ b/chromium_src/net/cookies/cookie_options.h @@ -6,6 +6,8 @@ #ifndef BRAVE_CHROMIUM_SRC_NET_COOKIES_COOKIE_OPTIONS_H_ #define BRAVE_CHROMIUM_SRC_NET_COOKIES_COOKIE_OPTIONS_H_ +#include + #include "net/cookies/site_for_cookies.h" #include "url/gurl.h" #include "url/origin.h" @@ -38,11 +40,11 @@ class NET_EXPORT CookieOptions : public CookieOptions_ChromiumImpl { site_for_cookies_ = site_for_cookies; } - const absl::optional& top_frame_origin() const { + const std::optional& top_frame_origin() const { return top_frame_origin_; } void set_top_frame_origin( - const absl::optional& top_frame_origin) { + const std::optional& top_frame_origin) { top_frame_origin_ = top_frame_origin; } @@ -55,7 +57,7 @@ class NET_EXPORT CookieOptions : public CookieOptions_ChromiumImpl { private: net::SiteForCookies site_for_cookies_; - absl::optional top_frame_origin_; + std::optional top_frame_origin_; bool should_use_ephemeral_storage_ = false; }; @@ -63,7 +65,7 @@ class NET_EXPORT CookieOptions : public CookieOptions_ChromiumImpl { void NET_EXPORT FillEphemeralStorageParams(const GURL& url, const SiteForCookies& site_for_cookies, - const absl::optional& top_frame_origin, + const std::optional& top_frame_origin, const CookieAccessDelegate* cookie_access_delegate, CookieOptions* cookie_options); diff --git a/chromium_src/net/http/transport_security_state.cc b/chromium_src/net/http/transport_security_state.cc index ba033087c51..d94d67ee927 100644 --- a/chromium_src/net/http/transport_security_state.cc +++ b/chromium_src/net/http/transport_security_state.cc @@ -3,11 +3,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "net/http/transport_security_state.h" +#include #include "build/build_config.h" #include "net/base/network_anonymization_key.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" +#include "net/http/transport_security_state.h" #include "url/gurl.h" #include "url/url_util.h" @@ -94,10 +95,10 @@ TransportSecurityState::HashedHost GetHSTSPartitionHash( // HSTS state storage. Check top frame site for equality with site for cookies, // don't store HSTS if it differs. IsolationInfo is not available everywhere, // that's why we're using it only when parsing new HSTS state. -absl::optional -GetPartitionHashForAddingHSTS(const IsolationInfo& isolation_info) { +std::optional GetPartitionHashForAddingHSTS( + const IsolationInfo& isolation_info) { if (!base::FeatureList::IsEnabled(features::kBravePartitionHSTS)) { - return absl::nullopt; + return std::nullopt; } // If the top frame scheme is secure and SiteForCookies doesn't match @@ -114,10 +115,10 @@ GetPartitionHashForAddingHSTS(const IsolationInfo& isolation_info) { } // Use NetworkIsolationKey to create PartitionHash for accessing/storing data. -absl::optional GetPartitionHashForHSTS( +std::optional GetPartitionHashForHSTS( const NetworkAnonymizationKey& network_anonymization_key) { if (!base::FeatureList::IsEnabled(features::kBravePartitionHSTS)) { - return absl::nullopt; + return std::nullopt; } return GetHSTSPartitionHash(network_anonymization_key); } @@ -125,10 +126,10 @@ absl::optional GetPartitionHashForHSTS( // Use host-bound NetworkIsolationKey in cases when no NetworkIsolationKey is // available. Such cases may include net-internals page, PasswordManager. // All network::NetworkContext HSTS-related public methods will use this. -absl::optional +std::optional GetHostBoundPartitionHashForHSTS(const std::string& host) { if (!base::FeatureList::IsEnabled(features::kBravePartitionHSTS)) { - return absl::nullopt; + return std::nullopt; } SchemefulSite schemeful_site(url::Origin::Create(GURL("https://" + host))); auto network_anonymization_key = diff --git a/chromium_src/net/url_request/redirect_util.cc b/chromium_src/net/url_request/redirect_util.cc index 04b6ed76e5c..f05c4b4f02d 100644 --- a/chromium_src/net/url_request/redirect_util.cc +++ b/chromium_src/net/url_request/redirect_util.cc @@ -3,9 +3,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "net/url_request/redirect_util.h" +#include #include "base/containers/contains.h" +#include "net/url_request/redirect_util.h" #include "net/url_request/url_request_job.h" #define UpdateHttpRequest UpdateHttpRequest_ChromiumImpl @@ -18,8 +19,8 @@ void RedirectUtil::UpdateHttpRequest( const GURL& original_url, const std::string& original_method, const RedirectInfo& redirect_info, - const absl::optional>& removed_headers, - const absl::optional& modified_headers, + const std::optional>& removed_headers, + const std::optional& modified_headers, HttpRequestHeaders* request_headers, bool* should_clear_upload) { UpdateHttpRequest_ChromiumImpl(original_url, diff --git a/chromium_src/net/url_request/redirect_util.h b/chromium_src/net/url_request/redirect_util.h index 9a13afa6957..88112d26630 100644 --- a/chromium_src/net/url_request/redirect_util.h +++ b/chromium_src/net/url_request/redirect_util.h @@ -10,11 +10,13 @@ UpdateHttpRequest_ChromiumImpl( \ const GURL& original_url, const std::string& original_method, \ const RedirectInfo& redirect_info, \ - const absl::optional>& removed_headers, \ - const absl::optional& modified_headers, \ + const std::optional>& removed_headers, \ + const std::optional& modified_headers, \ HttpRequestHeaders* request_headers, bool* should_clear_upload); \ NET_EXPORT static void UpdateHttpRequest +#include + #include "src/net/url_request/redirect_util.h" // IWYU pragma: export #undef UpdateHttpRequest diff --git a/chromium_src/services/network/cookie_access_delegate_impl.cc b/chromium_src/services/network/cookie_access_delegate_impl.cc index ec44ea76ce1..060c111c54f 100644 --- a/chromium_src/services/network/cookie_access_delegate_impl.cc +++ b/chromium_src/services/network/cookie_access_delegate_impl.cc @@ -3,8 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "services/network/cookie_access_delegate_impl.h" +#include +#include "services/network/cookie_access_delegate_impl.h" #include "src/services/network/cookie_access_delegate_impl.cc" namespace network { @@ -17,7 +18,7 @@ bool CookieAccessDelegateImpl::ShouldUseEphemeralStorage( const GURL& url, const net::SiteForCookies& site_for_cookies, net::CookieSettingOverrides overrides, - const absl::optional& top_frame_origin) const { + const std::optional& top_frame_origin) const { if (!cookie_settings_) return false; return cookie_settings_->ShouldUseEphemeralStorage( diff --git a/chromium_src/services/network/cookie_access_delegate_impl.h b/chromium_src/services/network/cookie_access_delegate_impl.h index f46dc190d46..8d91fd2ec5b 100644 --- a/chromium_src/services/network/cookie_access_delegate_impl.h +++ b/chromium_src/services/network/cookie_access_delegate_impl.h @@ -6,14 +6,16 @@ #ifndef BRAVE_CHROMIUM_SRC_SERVICES_NETWORK_COOKIE_ACCESS_DELEGATE_IMPL_H_ #define BRAVE_CHROMIUM_SRC_SERVICES_NETWORK_COOKIE_ACCESS_DELEGATE_IMPL_H_ +#include + #include "net/cookies/cookie_access_delegate.h" -#define ShouldTreatUrlAsTrustworthy \ - NotUsed() const override; \ - bool ShouldUseEphemeralStorage( \ - const GURL& url, const net::SiteForCookies& site_for_cookies, \ - net::CookieSettingOverrides overrides, \ - const absl::optional& top_frame_origin) const override; \ +#define ShouldTreatUrlAsTrustworthy \ + NotUsed() const override; \ + bool ShouldUseEphemeralStorage( \ + const GURL& url, const net::SiteForCookies& site_for_cookies, \ + net::CookieSettingOverrides overrides, \ + const std::optional& top_frame_origin) const override; \ bool ShouldTreatUrlAsTrustworthy #include "src/services/network/cookie_access_delegate_impl.h" // IWYU pragma: export diff --git a/chromium_src/services/network/cookie_settings.cc b/chromium_src/services/network/cookie_settings.cc index fc8b8a10809..50a1b57b728 100644 --- a/chromium_src/services/network/cookie_settings.cc +++ b/chromium_src/services/network/cookie_settings.cc @@ -3,12 +3,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "services/network/cookie_settings.h" +#include #include "net/base/features.h" -#include "url/origin.h" - +#include "services/network/cookie_settings.h" #include "src/services/network/cookie_settings.cc" +#include "url/origin.h" namespace network { @@ -16,7 +16,7 @@ bool CookieSettings::IsEphemeralCookieAccessible( const net::CanonicalCookie& cookie, const GURL& url, const net::SiteForCookies& site_for_cookies, - const absl::optional& top_frame_origin, + const std::optional& top_frame_origin, net::CookieSettingOverrides overrides, net::CookieInclusionStatus* cookie_inclusion_status) const { // Upstream now do single cookie-specific checks in some places to determine @@ -37,7 +37,7 @@ net::NetworkDelegate::PrivacySetting CookieSettings::IsEphemeralPrivacyModeEnabled( const GURL& url, const net::SiteForCookies& site_for_cookies, - const absl::optional& top_frame_origin, + const std::optional& top_frame_origin, net::CookieSettingOverrides overrides) const { if (IsEphemeralCookieAccessAllowed(url, site_for_cookies, top_frame_origin, overrides)) { @@ -56,7 +56,7 @@ bool CookieSettings::AnnotateAndMoveUserBlockedEphemeralCookies( net::CookieSettingOverrides overrides, net::CookieAccessResultList& maybe_included_cookies, net::CookieAccessResultList& excluded_cookies) const { - absl::optional top_frame_origin_opt; + std::optional top_frame_origin_opt; if (top_frame_origin) top_frame_origin_opt = *top_frame_origin; diff --git a/chromium_src/services/network/cookie_settings.h b/chromium_src/services/network/cookie_settings.h index 1f1032a665a..631b458cb2b 100644 --- a/chromium_src/services/network/cookie_settings.h +++ b/chromium_src/services/network/cookie_settings.h @@ -11,12 +11,12 @@ bool IsEphemeralCookieAccessible( \ const net::CanonicalCookie& cookie, const GURL& url, \ const net::SiteForCookies& site_for_cookies, \ - const absl::optional& top_frame_origin, \ + const std::optional& top_frame_origin, \ net::CookieSettingOverrides overrides, \ net::CookieInclusionStatus* cookie_inclusion_status) const; \ net::NetworkDelegate::PrivacySetting IsEphemeralPrivacyModeEnabled( \ const GURL& url, const net::SiteForCookies& site_for_cookies, \ - const absl::optional& top_frame_origin, \ + const std::optional& top_frame_origin, \ net::CookieSettingOverrides overrides) const; \ bool AnnotateAndMoveUserBlockedEphemeralCookies( \ const GURL& url, const net::SiteForCookies& site_for_cookies, \ @@ -27,6 +27,8 @@ net::CookieAccessResultList& excluded_cookies) const; \ DeleteCookiePredicate CreateDeleteCookieOnExitPredicate +#include + #include "src/services/network/cookie_settings.h" // IWYU pragma: export #undef CreateDeleteCookieOnExitPredicate diff --git a/chromium_src/services/network/public/cpp/cookie_manager_mojom_traits.cc b/chromium_src/services/network/public/cpp/cookie_manager_mojom_traits.cc index 1840619d7fe..f650a3b24e6 100644 --- a/chromium_src/services/network/public/cpp/cookie_manager_mojom_traits.cc +++ b/chromium_src/services/network/public/cpp/cookie_manager_mojom_traits.cc @@ -3,8 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "services/network/public/cpp/cookie_manager_mojom_traits.h" +#include +#include "services/network/public/cpp/cookie_manager_mojom_traits.h" #include "services/network/public/mojom/cookie_manager.mojom.h" #define CookieOptions CookieOptions_ChromiumImpl @@ -27,7 +28,7 @@ bool StructTraits:: return false; out->set_site_for_cookies(site_for_cookies); - absl::optional top_frame_origin; + std::optional top_frame_origin; if (!data.ReadTopFrameOrigin(&top_frame_origin)) return false; out->set_top_frame_origin(top_frame_origin); diff --git a/chromium_src/services/network/public/cpp/cookie_manager_mojom_traits.h b/chromium_src/services/network/public/cpp/cookie_manager_mojom_traits.h index 909cce3cbb7..127450d7f0b 100644 --- a/chromium_src/services/network/public/cpp/cookie_manager_mojom_traits.h +++ b/chromium_src/services/network/public/cpp/cookie_manager_mojom_traits.h @@ -6,6 +6,8 @@ #ifndef BRAVE_CHROMIUM_SRC_SERVICES_NETWORK_PUBLIC_CPP_COOKIE_MANAGER_MOJOM_TRAITS_H_ #define BRAVE_CHROMIUM_SRC_SERVICES_NETWORK_PUBLIC_CPP_COOKIE_MANAGER_MOJOM_TRAITS_H_ +#include + #include "net/cookies/canonical_cookie.h" #include "net/cookies/cookie_access_result.h" #include "net/cookies/cookie_change_dispatcher.h" @@ -29,7 +31,7 @@ struct StructTraits const net::CookieOptions& o) { return o.site_for_cookies(); } - static const absl::optional& top_frame_origin( + static const std::optional& top_frame_origin( const net::CookieOptions& o) { return o.top_frame_origin(); } diff --git a/chromium_src/storage/browser/blob/blob_url_store_impl.cc b/chromium_src/storage/browser/blob/blob_url_store_impl.cc index 4968d8feba6..c9df3dded75 100644 --- a/chromium_src/storage/browser/blob/blob_url_store_impl.cc +++ b/chromium_src/storage/browser/blob/blob_url_store_impl.cc @@ -3,11 +3,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "storage/browser/blob/blob_url_store_impl.h" +#include #include "base/strings/strcat.h" #include "net/base/features.h" #include "net/base/url_util.h" +#include "storage/browser/blob/blob_url_store_impl.h" #include "url/gurl.h" #include "url/origin.h" @@ -67,7 +68,7 @@ void BlobURLStoreImpl::Register( mojo::PendingRemote blob, const GURL& url, const base::UnguessableToken& unsafe_agent_cluster_id, - const absl::optional& unsafe_top_level_site, + const std::optional& unsafe_top_level_site, RegisterCallback callback) { BlobURLStoreImpl_ChromiumImpl::Register( std::move(blob), GetPartitionedOrOriginalUrl(url), @@ -89,7 +90,7 @@ void BlobURLStoreImpl::ResolveAsURLLoaderFactory( ResolveAsURLLoaderFactoryCallback callback) { if (!registry_) { BlobURLLoaderFactory::Create(mojo::NullRemote(), url, std::move(receiver)); - std::move(callback).Run(absl::nullopt, absl::nullopt); + std::move(callback).Run(std::nullopt, std::nullopt); return; } @@ -107,7 +108,7 @@ void BlobURLStoreImpl::ResolveForNavigation( mojo::PendingReceiver token, ResolveForNavigationCallback callback) { if (!registry_) { - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(std::nullopt); return; } @@ -117,7 +118,7 @@ void BlobURLStoreImpl::ResolveForNavigation( mojo::PendingRemote blob = registry_->GetBlobFromUrl(ephemeral_url); if (!blob) { - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(std::nullopt); return; } new BlobURLTokenImpl(registry_, url, std::move(blob), std::move(token)); diff --git a/chromium_src/storage/browser/blob/blob_url_store_impl.h b/chromium_src/storage/browser/blob/blob_url_store_impl.h index 0259c598d7f..ca30edd1061 100644 --- a/chromium_src/storage/browser/blob/blob_url_store_impl.h +++ b/chromium_src/storage/browser/blob/blob_url_store_impl.h @@ -17,6 +17,8 @@ using BlobURLStoreImpl_BraveImpl = BlobURLStoreImpl; friend BlobURLStoreImpl_BraveImpl; \ bool BlobUrlIsValid +#include + #include "src/storage/browser/blob/blob_url_store_impl.h" // IWYU pragma: export #undef BlobUrlIsValid @@ -35,7 +37,7 @@ class COMPONENT_EXPORT(STORAGE_BROWSER) BlobURLStoreImpl void Register(mojo::PendingRemote blob, const GURL& url, const base::UnguessableToken& unsafe_agent_cluster_id, - const absl::optional& unsafe_top_level_site, + const std::optional& unsafe_top_level_site, RegisterCallback callback) override; void Revoke(const GURL& url) override; void Resolve(const GURL& url, ResolveCallback callback) override; diff --git a/chromium_src/third_party/blink/common/permissions/permission_utils.cc b/chromium_src/third_party/blink/common/permissions/permission_utils.cc index e91fb7a4b9d..f5baf50f24a 100644 --- a/chromium_src/third_party/blink/common/permissions/permission_utils.cc +++ b/chromium_src/third_party/blink/common/permissions/permission_utils.cc @@ -3,6 +3,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include + #include "third_party/blink/public/mojom/permissions_policy/permissions_policy_feature.mojom.h" #define PERMISSION_UTIL_GET_PERMISSION_STRING \ @@ -50,7 +52,7 @@ case PermissionType::BRAVE_SPEEDREADER: \ case PermissionType::BRAVE_GOOGLE_SIGN_IN: \ case PermissionType::BRAVE_LOCALHOST_ACCESS: \ - return absl::nullopt + return std::nullopt #include "src/third_party/blink/common/permissions/permission_utils.cc" diff --git a/chromium_src/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py b/chromium_src/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py index c9d916dec62..2ce6163f4e3 100644 --- a/chromium_src/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py +++ b/chromium_src/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py @@ -220,7 +220,7 @@ def _append_report_page_graph_api_call_event(cg_context, expr): or cg_context.return_type.unwrap().is_void) and not cg_context.does_override_idl_return_type) if is_return_type_void or hasattr(cg_context, _IS_OBSERVABLE_ARRAY_SETTER): - return_value = "absl::nullopt" + return_value = "std::nullopt" else: return_value = _to_page_graph_blink_arg("return_value") diff --git a/chromium_src/third_party/blink/renderer/build/scripts/make_instrumenting_probes.py b/chromium_src/third_party/blink/renderer/build/scripts/make_instrumenting_probes.py index b65cf6a508d..0b399a2a5d7 100644 --- a/chromium_src/third_party/blink/renderer/build/scripts/make_instrumenting_probes.py +++ b/chromium_src/third_party/blink/renderer/build/scripts/make_instrumenting_probes.py @@ -78,7 +78,7 @@ def _add_page_graph_events_to_pidl_source(source): if _IS_PG_WEBAPI_PROBES_ENABLED: ext += """ void RegisterPageGraphBindingEvent([Keep] ExecutionContext*, const char* name, PageGraphBindingType type, PageGraphBindingEvent event); - void RegisterPageGraphWebAPICallWithResult([Keep] ExecutionContext*, const char* name, const PageGraphBlinkReceiverData& receiver_data, const PageGraphBlinkArgs& args, const ExceptionState* exception_state, const absl::optional& result); + void RegisterPageGraphWebAPICallWithResult([Keep] ExecutionContext*, const char* name, const PageGraphBlinkReceiverData& receiver_data, const PageGraphBlinkArgs& args, const ExceptionState* exception_state, const std::optional& result); """ return source[:idx] + ext + source[idx:] diff --git a/chromium_src/third_party/blink/renderer/core/frame/local_dom_window.h b/chromium_src/third_party/blink/renderer/core/frame/local_dom_window.h index 1b213ddb927..68b819496e1 100644 --- a/chromium_src/third_party/blink/renderer/core/frame/local_dom_window.h +++ b/chromium_src/third_party/blink/renderer/core/frame/local_dom_window.h @@ -6,7 +6,7 @@ #ifndef BRAVE_CHROMIUM_SRC_THIRD_PARTY_BLINK_RENDERER_CORE_FRAME_LOCAL_DOM_WINDOW_H_ #define BRAVE_CHROMIUM_SRC_THIRD_PARTY_BLINK_RENDERER_CORE_FRAME_LOCAL_DOM_WINDOW_H_ -#include "third_party/abseil-cpp/absl/types/optional.h" +#include #define SetStorageKey \ SetEphemeralStorageOrigin(const SecurityOrigin* ephemeral_storage_origin); \ @@ -15,7 +15,7 @@ const SecurityOrigin* GetEphemeralStorageOriginOrSecurityOrigin() const; \ \ private: \ - absl::optional ephemeral_storage_key_; \ + std::optional ephemeral_storage_key_; \ \ public: \ void SetStorageKey diff --git a/chromium_src/third_party/blink/renderer/core/loader/mixed_content_checker.cc b/chromium_src/third_party/blink/renderer/core/loader/mixed_content_checker.cc index 3e0532049be..ec36db191be 100644 --- a/chromium_src/third_party/blink/renderer/core/loader/mixed_content_checker.cc +++ b/chromium_src/third_party/blink/renderer/core/loader/mixed_content_checker.cc @@ -3,6 +3,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include + #include "third_party/blink/renderer/core/loader/mixed_content_checker.h" namespace blink { @@ -35,11 +37,11 @@ bool IsOnion(const T& obj) { namespace blink { // static -absl::optional MixedContentChecker::IsMixedContentForOnion( +std::optional MixedContentChecker::IsMixedContentForOnion( const SecurityOrigin* security_origin, const KURL& resource_url) { if (!IsOnion(*security_origin)) { - return absl::nullopt; + return std::nullopt; } if (IsOnion(resource_url)) { // onion -> onion: not blocked diff --git a/chromium_src/third_party/blink/renderer/core/loader/mixed_content_checker.h b/chromium_src/third_party/blink/renderer/core/loader/mixed_content_checker.h index 408aaf80bb3..d3ba7775f0d 100644 --- a/chromium_src/third_party/blink/renderer/core/loader/mixed_content_checker.h +++ b/chromium_src/third_party/blink/renderer/core/loader/mixed_content_checker.h @@ -6,28 +6,28 @@ #ifndef BRAVE_CHROMIUM_SRC_THIRD_PARTY_BLINK_RENDERER_CORE_LOADER_MIXED_CONTENT_CHECKER_H_ #define BRAVE_CHROMIUM_SRC_THIRD_PARTY_BLINK_RENDERER_CORE_LOADER_MIXED_CONTENT_CHECKER_H_ -#include "third_party/abseil-cpp/absl/types/optional.h" +#include // We are hiding IsMixedContent(const String& origin_protocol, const KURL&) // because we want to enforce mixed content checks on .onion origins. // Publicly available protocol-only overload of this method allows to skip // .onion specific checks which we don't want. -#define UpgradeInsecureRequest \ - NotUsed(); \ - \ - private: \ - static bool IsMixedContent(const String& origin_protocol, const KURL&); \ - static absl::optional IsMixedContentForOnion(const SecurityOrigin*, \ - const KURL& url); \ - \ - public: \ - static void UpgradeInsecureRequest( \ - ResourceRequest&, \ - const FetchClientSettingsObject* fetch_client_settings_object, \ - ExecutionContext* execution_context_for_logging, \ - mojom::RequestContextFrameType, \ - WebContentSettingsClient* settings_client); \ +#define UpgradeInsecureRequest \ + NotUsed(); \ + \ + private: \ + static bool IsMixedContent(const String& origin_protocol, const KURL&); \ + static std::optional IsMixedContentForOnion(const SecurityOrigin*, \ + const KURL& url); \ + \ + public: \ + static void UpgradeInsecureRequest( \ + ResourceRequest&, \ + const FetchClientSettingsObject* fetch_client_settings_object, \ + ExecutionContext* execution_context_for_logging, \ + mojom::RequestContextFrameType, \ + WebContentSettingsClient* settings_client); \ static void UpgradeInsecureRequest_ChromiumImpl #include "src/third_party/blink/renderer/core/loader/mixed_content_checker.h" // IWYU pragma: export diff --git a/chromium_src/third_party/blink/renderer/modules/webaudio/realtime_analyser.h b/chromium_src/third_party/blink/renderer/modules/webaudio/realtime_analyser.h index 2d634f43873..77b77d70b03 100644 --- a/chromium_src/third_party/blink/renderer/modules/webaudio/realtime_analyser.h +++ b/chromium_src/third_party/blink/renderer/modules/webaudio/realtime_analyser.h @@ -6,21 +6,22 @@ #ifndef BRAVE_CHROMIUM_SRC_THIRD_PARTY_BLINK_RENDERER_MODULES_WEBAUDIO_REALTIME_ANALYSER_H_ #define BRAVE_CHROMIUM_SRC_THIRD_PARTY_BLINK_RENDERER_MODULES_WEBAUDIO_REALTIME_ANALYSER_H_ +#include #include #include "brave/third_party/blink/renderer/platform/brave_audio_farbling_helper.h" -#define analysis_frame_ \ - analysis_frame_; \ - \ - public: \ - void set_audio_farbling_helper( \ - absl::optional helper) { \ - audio_farbling_helper_ = std::move(helper); \ - } \ - \ - private: \ - absl::optional audio_farbling_helper_ +#define analysis_frame_ \ + analysis_frame_; \ + \ + public: \ + void set_audio_farbling_helper( \ + std::optional helper) { \ + audio_farbling_helper_ = std::move(helper); \ + } \ + \ + private: \ + std::optional audio_farbling_helper_ #include "src/third_party/blink/renderer/modules/webaudio/realtime_analyser.h" // IWYU pragma: export diff --git a/chromium_src/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc b/chromium_src/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc index c8fe6cbf672..43da6c4b3c1 100644 --- a/chromium_src/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc +++ b/chromium_src/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h" +#include #include "brave/third_party/blink/renderer/core/farbling/brave_session_cache.h" #include "third_party/blink/renderer/core/dom/document.h" @@ -11,6 +11,7 @@ #include "third_party/blink/renderer/core/frame/local_frame.h" #include "third_party/blink/renderer/core/html/canvas/canvas_rendering_context_host.h" #include "third_party/blink/renderer/core/workers/worker_global_scope.h" +#include "third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h" namespace { @@ -32,7 +33,7 @@ bool AllowFingerprintingForHost(blink::CanvasRenderingContextHost* host) { #define BRAVE_WEBGL_RENDERING_CONTEXT_BASE_NULLOPT \ if (!AllowFingerprintingForHost(Host())) \ - return absl::nullopt; + return std::nullopt; #define BRAVE_WEBGL_RENDERING_CONTEXT_BASE_ZERO \ if (!AllowFingerprintingForHost(Host())) \ @@ -85,12 +86,13 @@ namespace blink { // If fingerprinting is disallowed, claim that the only supported extension is // WebGLDebugRendererInfo. -absl::optional> +std::optional> WebGLRenderingContextBase::getSupportedExtensions() { - absl::optional> real_extensions = + std::optional> real_extensions = getSupportedExtensions_ChromiumImpl(); - if (real_extensions == absl::nullopt) + if (real_extensions == std::nullopt) { return real_extensions; + } if (AllowFingerprintingForHost(Host())) return real_extensions; diff --git a/chromium_src/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h b/chromium_src/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h index 438848b047d..bd60be4e6e5 100644 --- a/chromium_src/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h +++ b/chromium_src/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h @@ -12,7 +12,9 @@ #define getSupportedExtensions \ getSupportedExtensions_ChromiumImpl(); \ - absl::optional> getSupportedExtensions + std::optional> getSupportedExtensions + +#include #include "src/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h" // IWYU pragma: export diff --git a/chromium_src/third_party/blink/renderer/platform/loader/fetch/https_state.cc b/chromium_src/third_party/blink/renderer/platform/loader/fetch/https_state.cc index ab37b6003e5..61e6da93a6a 100644 --- a/chromium_src/third_party/blink/renderer/platform/loader/fetch/https_state.cc +++ b/chromium_src/third_party/blink/renderer/platform/loader/fetch/https_state.cc @@ -3,6 +3,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include + #include "third_party/blink/renderer/platform/loader/fetch/https_state.h" #define CalculateHttpsState CalculateHttpsState_ChromiumImpl @@ -14,7 +16,7 @@ namespace blink { HttpsState CalculateHttpsState(const SecurityOrigin* security_origin, - absl::optional parent_https_state) { + std::optional parent_https_state) { if (security_origin && (security_origin->Protocol() == "http" && security_origin->Host().EndsWith(".onion"))) { // MixedContentChecker::ShouldAutoupgrade upgrades resource only on the diff --git a/chromium_src/ui/views/controls/button/md_text_button.cc b/chromium_src/ui/views/controls/button/md_text_button.cc index 4de42983837..a3252436c85 100644 --- a/chromium_src/ui/views/controls/button/md_text_button.cc +++ b/chromium_src/ui/views/controls/button/md_text_button.cc @@ -3,15 +3,13 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this file, // you can obtain one at http://mozilla.org/MPL/2.0/. -#include "ui/views/controls/button/md_text_button.h" - +#include #include #include "base/containers/flat_map.h" #include "base/no_destructor.h" #include "base/notreached.h" #include "build/build_config.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/base/models/image_model.h" #include "ui/color/color_id.h" @@ -22,6 +20,7 @@ #include "ui/native_theme/native_theme.h" #include "ui/views/background.h" #include "ui/views/controls/button/button.h" +#include "ui/views/controls/button/md_text_button.h" #include "ui/views/controls/highlight_path_generator.h" #include "ui/views/view_class_properties.h" @@ -44,8 +43,8 @@ using ColorScheme = ui::NativeTheme::PreferredColorScheme; using ButtonState = views::Button::ButtonState; struct ButtonStyle { - absl::optional background_color; - absl::optional border_color; + std::optional background_color; + std::optional border_color; SkColor text_color; }; @@ -68,71 +67,71 @@ const base::flat_map& GetButtonThemes() { button_themes( {{{Kind::kPrimary, ColorScheme::kLight, ButtonState::STATE_NORMAL}, {.background_color = kBravePrimaryColor, - .border_color = absl::nullopt, + .border_color = std::nullopt, .text_color = SK_ColorWHITE}}, {{Kind::kPrimary, ColorScheme::kDark, ButtonState::STATE_NORMAL}, {.background_color = kBravePrimaryColor, - .border_color = absl::nullopt, + .border_color = std::nullopt, .text_color = SK_ColorWHITE}}, {{Kind::kPrimary, ColorScheme::kLight, ButtonState::STATE_HOVERED}, {.background_color = SkColorSetRGB(24, 56, 172), - .border_color = absl::nullopt, + .border_color = std::nullopt, .text_color = SK_ColorWHITE}}, {{Kind::kPrimary, ColorScheme::kDark, ButtonState::STATE_HOVERED}, {.background_color = SkColorSetRGB(77, 92, 253), - .border_color = absl::nullopt, + .border_color = std::nullopt, .text_color = SK_ColorWHITE}}, {{Kind::kSecondary, ColorScheme::kLight, ButtonState::STATE_NORMAL}, - {.background_color = absl::nullopt, + {.background_color = std::nullopt, .border_color = SK_ColorBLACK, .text_color = SK_ColorBLACK}}, {{Kind::kSecondary, ColorScheme::kDark, ButtonState::STATE_NORMAL}, - {.background_color = absl::nullopt, + {.background_color = std::nullopt, .border_color = SK_ColorWHITE, .text_color = SK_ColorWHITE}}, {{Kind::kSecondary, ColorScheme::kLight, ButtonState::STATE_HOVERED}, - {.background_color = absl::nullopt, + {.background_color = std::nullopt, .border_color = kBravePrimaryColor, .text_color = kBravePrimaryColor}}, {{Kind::kSecondary, ColorScheme::kDark, ButtonState::STATE_HOVERED}, - {.background_color = absl::nullopt, + {.background_color = std::nullopt, .border_color = kBravePrimaryColor, .text_color = kBravePrimaryColor}}, {{Kind::kTertiary, ColorScheme::kLight, ButtonState::STATE_NORMAL}, - {.background_color = absl::nullopt, - .border_color = absl::nullopt, + {.background_color = std::nullopt, + .border_color = std::nullopt, .text_color = SkColorSetRGB(32, 74, 227)}}, {{Kind::kTertiary, ColorScheme::kDark, ButtonState::STATE_NORMAL}, - {.background_color = absl::nullopt, - .border_color = absl::nullopt, + {.background_color = std::nullopt, + .border_color = std::nullopt, .text_color = SkColorSetRGB(153, 173, 243)}}, {{Kind::kTertiary, ColorScheme::kLight, ButtonState::STATE_HOVERED}, - {.background_color = absl::nullopt, - .border_color = absl::nullopt, + {.background_color = std::nullopt, + .border_color = std::nullopt, .text_color = SkColorSetRGB(24, 56, 172)}}, {{Kind::kTertiary, ColorScheme::kDark, ButtonState::STATE_HOVERED}, - {.background_color = absl::nullopt, - .border_color = absl::nullopt, + {.background_color = std::nullopt, + .border_color = std::nullopt, .text_color = SkColorSetRGB(186, 199, 247)}}, {{Kind::kQuaternary, ColorScheme::kLight, ButtonState::STATE_NORMAL}, - {.background_color = absl::nullopt, - .border_color = absl::nullopt, + {.background_color = std::nullopt, + .border_color = std::nullopt, .text_color = SkColorSetRGB(84, 96, 113)}}, {{Kind::kQuaternary, ColorScheme::kDark, ButtonState::STATE_NORMAL}, - {.background_color = absl::nullopt, - .border_color = absl::nullopt, + {.background_color = std::nullopt, + .border_color = std::nullopt, .text_color = SkColorSetRGB(195, 201, 211)}}, {{Kind::kQuaternary, ColorScheme::kLight, ButtonState::STATE_HOVERED}, - {.background_color = absl::nullopt, - .border_color = absl::nullopt, + {.background_color = std::nullopt, + .border_color = std::nullopt, .text_color = SkColorSetRGB(63, 72, 85)}}, {{Kind::kQuaternary, ColorScheme::kDark, ButtonState::STATE_HOVERED}, - {.background_color = absl::nullopt, - .border_color = absl::nullopt, + {.background_color = std::nullopt, + .border_color = std::nullopt, .text_color = SkColorSetRGB(195, 201, 211)}}}); return *button_themes; diff --git a/chromium_src/ui/views/controls/button/md_text_button.h b/chromium_src/ui/views/controls/button/md_text_button.h index b727af5c0b1..b16bc2def41 100644 --- a/chromium_src/ui/views/controls/button/md_text_button.h +++ b/chromium_src/ui/views/controls/button/md_text_button.h @@ -6,7 +6,6 @@ #ifndef BRAVE_CHROMIUM_SRC_UI_VIEWS_CONTROLS_BUTTON_MD_TEXT_BUTTON_H_ #define BRAVE_CHROMIUM_SRC_UI_VIEWS_CONTROLS_BUTTON_MD_TEXT_BUTTON_H_ -#include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/gfx/vector_icon_types.h" #include "ui/views/controls/button/label_button.h" diff --git a/chromium_src/ui/views/widget/native_widget_mac.h b/chromium_src/ui/views/widget/native_widget_mac.h index 0f484e071f7..e8b873e18b5 100644 --- a/chromium_src/ui/views/widget/native_widget_mac.h +++ b/chromium_src/ui/views/widget/native_widget_mac.h @@ -6,6 +6,8 @@ #ifndef BRAVE_CHROMIUM_SRC_UI_VIEWS_WIDGET_NATIVE_WIDGET_MAC_H_ #define BRAVE_CHROMIUM_SRC_UI_VIEWS_WIDGET_NATIVE_WIDGET_MAC_H_ +#include + #include "ui/views/widget/native_widget_private.h" #define SetWindowIcons \ @@ -18,7 +20,7 @@ void UpdateWindowTitleColor(SkColor color); \ \ private: \ - absl::optional overridden_window_title_visibility_; \ + std::optional overridden_window_title_visibility_; \ \ public: \ void SetWindowIcons diff --git a/common/importer/chrome_importer_utils.cc b/common/importer/chrome_importer_utils.cc index 3a6cec7b6a0..fbe89b4e264 100644 --- a/common/importer/chrome_importer_utils.cc +++ b/common/importer/chrome_importer_utils.cc @@ -6,6 +6,7 @@ #include "brave/common/importer/chrome_importer_utils.h" #include +#include #include #include "base/files/file_path.h" @@ -32,15 +33,15 @@ using extensions::Manifest; namespace { #if BUILDFLAG(ENABLE_EXTENSIONS) -absl::optional GetChromeExtensionsListFromFile( +std::optional GetChromeExtensionsListFromFile( const base::FilePath& preference_path) { if (!base::PathExists(preference_path)) - return absl::nullopt; + return std::nullopt; std::string preference_content; base::ReadFileToString(preference_path, &preference_content); - absl::optional preference = + std::optional preference = base::JSONReader::Read(preference_content); DCHECK(preference); DCHECK(preference->is_dict()); @@ -48,7 +49,7 @@ absl::optional GetChromeExtensionsListFromFile( kChromeExtensionsListPath)) { return std::move(*extensions); } - return absl::nullopt; + return std::nullopt; } bool HasImportableExtensions(const base::FilePath& profile_path) { @@ -84,7 +85,7 @@ std::vector GetImportableListFromChromeExtensionsList( return extensions; } -absl::optional GetChromeExtensionsList( +std::optional GetChromeExtensionsList( const base::FilePath& profile_path) { auto list_from_secure_preference = GetChromeExtensionsListFromFile( profile_path.AppendASCII(kChromeSecurePreferencesFile)); @@ -142,7 +143,7 @@ base::Value::List GetChromeSourceProfiles( if (base::PathExists(local_state_path)) { std::string local_state_content; base::ReadFileToString(local_state_path, &local_state_content); - absl::optional local_state = + std::optional local_state = base::JSONReader::Read(local_state_content); if (!local_state) return profiles; @@ -225,11 +226,11 @@ bool ChromeImporterCanImport(const base::FilePath& profile, } #if BUILDFLAG(ENABLE_EXTENSIONS) -absl::optional> GetImportableChromeExtensionsList( +std::optional> GetImportableChromeExtensionsList( const base::FilePath& profile_path) { if (auto extensions = GetChromeExtensionsList(profile_path)) { return GetImportableListFromChromeExtensionsList(extensions.value()); } - return absl::nullopt; + return std::nullopt; } #endif diff --git a/common/importer/chrome_importer_utils.h b/common/importer/chrome_importer_utils.h index f1e28c5ac0d..f37ab57e3bd 100644 --- a/common/importer/chrome_importer_utils.h +++ b/common/importer/chrome_importer_utils.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMMON_IMPORTER_CHROME_IMPORTER_UTILS_H_ #define BRAVE_COMMON_IMPORTER_CHROME_IMPORTER_UTILS_H_ +#include #include #include @@ -43,7 +44,7 @@ bool ChromeImporterCanImport(const base::FilePath& profile, uint16_t* services_supported); #if BUILDFLAG(ENABLE_EXTENSIONS) -absl::optional> GetImportableChromeExtensionsList( +std::optional> GetImportableChromeExtensionsList( const base::FilePath& profile_path); #endif diff --git a/components/ai_chat/core/browser/ai_chat_credential_manager.cc b/components/ai_chat/core/browser/ai_chat_credential_manager.cc index 3af7dc56ecb..b46f149beb8 100644 --- a/components/ai_chat/core/browser/ai_chat_credential_manager.cc +++ b/components/ai_chat/core/browser/ai_chat_credential_manager.cc @@ -5,6 +5,7 @@ #include "brave/components/ai_chat/core/browser/ai_chat_credential_manager.h" +#include #include #include @@ -45,7 +46,7 @@ void AIChatCredentialManager::GetPremiumStatus( const auto& cached_creds_dict = prefs_service_->GetDict(ai_chat::prefs::kBraveChatPremiumCredentialCache); for (const auto [credential, expires_at_value] : cached_creds_dict) { - absl::optional expires_at = base::ValueToTime(expires_at_value); + std::optional expires_at = base::ValueToTime(expires_at_value); if (!expires_at) { continue; } @@ -89,7 +90,7 @@ void AIChatCredentialManager::OnCredentialSummary( return; } - absl::optional records_v = base::JSONReader::Read( + std::optional records_v = base::JSONReader::Read( summary_string, base::JSONParserOptions::JSON_PARSE_RFC); if (!records_v || !records_v->is_dict()) { @@ -120,7 +121,7 @@ void AIChatCredentialManager::OnCredentialSummary( } void AIChatCredentialManager::FetchPremiumCredential( - base::OnceCallback credential)> + base::OnceCallback credential)> callback) { // Loop through credentials looking for a valid credential and remove it. If // there is more than one valid credential, use the one that is expiring @@ -138,7 +139,7 @@ void AIChatCredentialManager::FetchPremiumCredential( for (auto it = dict.begin(); it != dict.end(); ++it) { base::Value& expires_at_value = it->second; - absl::optional expires_at = base::ValueToTime(expires_at_value); + std::optional expires_at = base::ValueToTime(expires_at_value); // Remove expired credentials from the cache. if (!expires_at || *expires_at < now) { @@ -178,11 +179,11 @@ void AIChatCredentialManager::FetchPremiumCredential( } void AIChatCredentialManager::OnGetPremiumStatus( - base::OnceCallback credential)> + base::OnceCallback credential)> callback, ai_chat::mojom::PremiumStatus status) { if (status != ai_chat::mojom::PremiumStatus::Active) { - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(std::nullopt); return; } const std::string leo_sku_domain = @@ -201,7 +202,7 @@ void AIChatCredentialManager::OnGetPremiumStatus( } void AIChatCredentialManager::OnPrepareCredentialsPresentation( - base::OnceCallback credential)> + base::OnceCallback credential)> callback, const std::string& domain, const std::string& credential_as_cookie) { @@ -210,17 +211,17 @@ void AIChatCredentialManager::OnPrepareCredentialsPresentation( net::ParsedCookie credential_cookie(credential_as_cookie, /*block_truncated=*/true, &status); if (!credential_cookie.IsValid()) { - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(std::nullopt); return; } if (!status.IsInclude()) { - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(std::nullopt); return; } if (!credential_cookie.HasExpires()) { - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(std::nullopt); return; } @@ -228,7 +229,7 @@ void AIChatCredentialManager::OnPrepareCredentialsPresentation( net::cookie_util::ParseCookieExpirationTime(credential_cookie.Expires()); // Early return when it's already expired. if (time < base::Time::Now()) { - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(std::nullopt); return; } @@ -242,7 +243,7 @@ void AIChatCredentialManager::OnPrepareCredentialsPresentation( base::UTF16ToUTF8(unescaped.data(), unescaped.length(), &credential); if (credential.empty()) { // Not purchased. - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(std::nullopt); return; } diff --git a/components/ai_chat/core/browser/ai_chat_credential_manager.h b/components/ai_chat/core/browser/ai_chat_credential_manager.h index 7e518b1be8c..59d69fe925c 100644 --- a/components/ai_chat/core/browser/ai_chat_credential_manager.h +++ b/components/ai_chat/core/browser/ai_chat_credential_manager.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_AI_CHAT_CORE_BROWSER_AI_CHAT_CREDENTIAL_MANAGER_H_ #define BRAVE_COMPONENTS_AI_CHAT_CORE_BROWSER_AI_CHAT_CREDENTIAL_MANAGER_H_ +#include #include #include "base/functional/callback.h" @@ -42,7 +43,7 @@ class AIChatCredentialManager { ai_chat::mojom::PageHandler::GetPremiumStatusCallback callback); void FetchPremiumCredential( - base::OnceCallback credential)> + base::OnceCallback credential)> callback); void PutCredentialInCache(CredentialCacheEntry credential); @@ -58,12 +59,12 @@ class AIChatCredentialManager { const std::string& summary_string); void OnGetPremiumStatus( - base::OnceCallback credential)> + base::OnceCallback credential)> callback, ai_chat::mojom::PremiumStatus); void OnPrepareCredentialsPresentation( - base::OnceCallback credential)> + base::OnceCallback credential)> callback, const std::string& domain, const std::string& credential_as_cookie); diff --git a/components/ai_chat/core/browser/ai_chat_credential_manager_unittest.cc b/components/ai_chat/core/browser/ai_chat_credential_manager_unittest.cc index f4fc5bb9ad3..abded84c78a 100644 --- a/components/ai_chat/core/browser/ai_chat_credential_manager_unittest.cc +++ b/components/ai_chat/core/browser/ai_chat_credential_manager_unittest.cc @@ -3,12 +3,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include "brave/components/ai_chat/core/browser/ai_chat_credential_manager.h" + #include +#include #include "base/json/values_util.h" #include "base/test/bind.h" #include "base/test/scoped_feature_list.h" -#include "brave/components/ai_chat/core/browser/ai_chat_credential_manager.h" #include "brave/components/ai_chat/core/common/mojom/ai_chat.mojom.h" #include "brave/components/ai_chat/core/common/pref_names.h" #include "brave/components/skus/browser/pref_names.h" @@ -68,11 +70,11 @@ class AIChatCredentialManagerUnitTest : public testing::Test { } void TestFetchPremiumCredential( - absl::optional expected_credential) { + std::optional expected_credential) { base::RunLoop run_loop; ai_chat_credential_manager_->FetchPremiumCredential( base::BindLambdaForTesting( - [&](absl::optional credential) { + [&](std::optional credential) { ASSERT_EQ(credential.has_value(), expected_credential.has_value()); if (credential && expected_credential) { @@ -135,7 +137,7 @@ TEST_F(AIChatCredentialManagerUnitTest, GetPremiumStatus) { TEST_F(AIChatCredentialManagerUnitTest, FetchPremiumCredential) { // If cache is empty, it should return nullopt. - TestFetchPremiumCredential(absl::nullopt); + TestFetchPremiumCredential(std::nullopt); // Add an invalid credential to the cache. FetchPremiumCredential should // not return it and should remove the invalid value from the cache. @@ -146,7 +148,7 @@ TEST_F(AIChatCredentialManagerUnitTest, FetchPremiumCredential) { const auto& cached_creds_dict = prefs_service_.GetDict(ai_chat::prefs::kBraveChatPremiumCredentialCache); EXPECT_EQ(cached_creds_dict.size(), 1u); - TestFetchPremiumCredential(absl::nullopt); + TestFetchPremiumCredential(std::nullopt); const auto& cached_creds_list2 = prefs_service_.GetDict(ai_chat::prefs::kBraveChatPremiumCredentialCache); EXPECT_EQ(cached_creds_list2.size(), 0u); diff --git a/components/ai_chat/core/browser/ai_chat_metrics.h b/components/ai_chat/core/browser/ai_chat_metrics.h index 2eb68b81bad..619b1916dbf 100644 --- a/components/ai_chat/core/browser/ai_chat_metrics.h +++ b/components/ai_chat/core/browser/ai_chat_metrics.h @@ -6,9 +6,10 @@ #ifndef BRAVE_COMPONENTS_AI_CHAT_CORE_BROWSER_AI_CHAT_METRICS_H_ #define BRAVE_COMPONENTS_AI_CHAT_CORE_BROWSER_AI_CHAT_METRICS_H_ +#include + #include "base/timer/wall_clock_timer.h" #include "brave/components/time_period_storage/weekly_storage.h" -#include "third_party/abseil-cpp/absl/types/optional.h" class PrefRegistrySimple; class PrefService; @@ -58,7 +59,7 @@ class AIChatMetrics { void ReportOmniboxCounts(); bool is_enabled_ = false; - absl::optional acquisition_source_ = absl::nullopt; + std::optional acquisition_source_ = std::nullopt; WeeklyStorage chat_count_storage_; WeeklyStorage prompt_count_storage_; diff --git a/components/ai_chat/core/browser/engine/engine_consumer_llama.cc b/components/ai_chat/core/browser/engine/engine_consumer_llama.cc index d489c801b8c..6c2c225e7da 100644 --- a/components/ai_chat/core/browser/engine/engine_consumer_llama.cc +++ b/components/ai_chat/core/browser/engine/engine_consumer_llama.cc @@ -6,6 +6,7 @@ #include "brave/components/ai_chat/core/browser/engine/engine_consumer_llama.h" #include +#include #include #include #include @@ -27,7 +28,6 @@ #include "brave/components/ai_chat/core/common/features.h" #include "brave/components/ai_chat/core/common/mojom/ai_chat.mojom.h" #include "components/grit/brave_components_strings.h" - #include "services/network/public/cpp/shared_url_loader_factory.h" #include "ui/base/l10n/l10n_util.h" @@ -53,8 +53,8 @@ std::string BuildLlama2InstructionPrompt(const std::string& instruction) { std::string BuildLlama2FirstSequence( const std::string& system_message, const std::string& user_message, - absl::optional assistant_response, - absl::optional assistant_response_seed) { + std::optional assistant_response, + std::optional assistant_response_seed) { // Generates a partial sequence if there is no assistant_response: // [INST] <> @@ -111,8 +111,8 @@ std::string BuildLlama2FirstSequence( std::string BuildLlama2SubsequentSequence( std::string user_message, - absl::optional assistant_response, - absl::optional assistant_response_seed) { + std::optional assistant_response, + std::optional assistant_response_seed) { // Builds a prompt segment that looks like this: // [INST] Give me the first few numbers in the fibonacci sequence [/INST] @@ -153,7 +153,7 @@ std::string BuildLlama2GenerateQuestionsPrompt(bool is_video, return BuildLlama2FirstSequence( l10n_util::GetStringUTF8( IDS_AI_CHAT_LLAMA2_SYSTEM_MESSAGE_GENERATE_QUESTIONS), - user_message, absl::nullopt, + user_message, std::nullopt, l10n_util::GetStringUTF8( IDS_AI_CHAT_LLAMA2_SYSTEM_MESSAGE_GENERATE_QUESTIONS_RESPONSE_SEED)); } @@ -205,7 +205,7 @@ std::string BuildLlama2Prompt( // first sequence. if (conversation_history.empty() || conversation_history.size() <= 1) { return BuildLlama2FirstSequence( - today_system_message, first_user_message, absl::nullopt, + today_system_message, first_user_message, std::nullopt, l10n_util::GetStringUTF8(IDS_AI_CHAT_LLAMA2_GENERAL_SEED)); } @@ -213,7 +213,7 @@ std::string BuildLlama2Prompt( // which includes the system prompt. std::string prompt = BuildLlama2FirstSequence(today_system_message, first_user_message, - conversation_history[1].text, absl::nullopt); + conversation_history[1].text, std::nullopt); // Loop through the rest of the history two at a time building subsequent // sequences. @@ -221,12 +221,12 @@ std::string BuildLlama2Prompt( const std::string& prev_user_message = conversation_history[i].text; const std::string& assistant_message = conversation_history[i + 1].text; prompt += BuildLlama2SubsequentSequence(prev_user_message, - assistant_message, absl::nullopt); + assistant_message, std::nullopt); } // Build the final subsequent exchange using the current turn. prompt += BuildLlama2SubsequentSequence( - user_message, absl::nullopt, + user_message, std::nullopt, l10n_util::GetStringUTF8(IDS_AI_CHAT_LLAMA2_GENERAL_SEED)); // Trimming recommended by Meta diff --git a/components/ai_chat/core/browser/engine/remote_completion_client.cc b/components/ai_chat/core/browser/engine/remote_completion_client.cc index 10714f1d09d..35c2c218ab0 100644 --- a/components/ai_chat/core/browser/engine/remote_completion_client.cc +++ b/components/ai_chat/core/browser/engine/remote_completion_client.cc @@ -7,6 +7,7 @@ #include +#include #include #include @@ -143,7 +144,7 @@ void RemoteCompletionClient::OnFetchPremiumCredential( const std::vector extra_stop_sequences, EngineConsumer::GenerationCompletedCallback data_completed_callback, EngineConsumer::GenerationDataCallback data_received_callback, - absl::optional credential) { + std::optional credential) { bool premium_enabled = credential.has_value(); const GURL api_url = GetEndpointUrl(premium_enabled, kAIChatCompletionPath); base::flat_map headers; @@ -208,7 +209,7 @@ void RemoteCompletionClient::OnQueryDataReceived( } void RemoteCompletionClient::OnQueryCompleted( - absl::optional credential, + std::optional credential, EngineConsumer::GenerationCompletedCallback callback, APIRequestResult result) { const bool success = result.Is2XXResponseCode(); diff --git a/components/ai_chat/core/browser/engine/remote_completion_client.h b/components/ai_chat/core/browser/engine/remote_completion_client.h index 49f57b29f15..75e181ba587 100644 --- a/components/ai_chat/core/browser/engine/remote_completion_client.h +++ b/components/ai_chat/core/browser/engine/remote_completion_client.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_AI_CHAT_CORE_BROWSER_ENGINE_REMOTE_COMPLETION_CLIENT_H_ #include +#include #include #include #include @@ -54,7 +55,7 @@ class RemoteCompletionClient { private: void OnQueryDataReceived(EngineConsumer::GenerationDataCallback callback, base::expected result); - void OnQueryCompleted(absl::optional credential, + void OnQueryCompleted(std::optional credential, EngineConsumer::GenerationCompletedCallback callback, APIRequestResult result); @@ -63,7 +64,7 @@ class RemoteCompletionClient { const std::vector extra_stop_sequences, EngineConsumer::GenerationCompletedCallback data_completed_callback, EngineConsumer::GenerationDataCallback data_received_callback, - absl::optional credential); + std::optional credential); const std::string model_name_; const base::flat_set stop_sequences_; diff --git a/components/ai_chat/renderer/page_content_extractor.cc b/components/ai_chat/renderer/page_content_extractor.cc index 3d547014efc..ec5084e7120 100644 --- a/components/ai_chat/renderer/page_content_extractor.cc +++ b/components/ai_chat/renderer/page_content_extractor.cc @@ -5,6 +5,7 @@ #include "brave/components/ai_chat/renderer/page_content_extractor.h" +#include #include #include #include @@ -20,7 +21,6 @@ #include "content/public/renderer/render_frame.h" #include "content/public/renderer/render_frame_observer.h" #include "net/base/url_util.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/blink/public/platform/web_string.h" #include "third_party/blink/public/web/web_local_frame.h" #include "third_party/blink/public/web/web_script_source.h" @@ -191,7 +191,7 @@ void PageContentExtractor::BindReceiver( void PageContentExtractor::OnDistillResult( mojom::PageContentExtractor::ExtractPageContentCallback callback, - const absl::optional& content) { + const std::optional& content) { // Validate if (!content.has_value()) { VLOG(1) << "null content"; @@ -214,7 +214,7 @@ void PageContentExtractor::OnDistillResult( void PageContentExtractor::OnJSTranscriptUrlResult( ai_chat::mojom::PageContentExtractor::ExtractPageContentCallback callback, ai_chat::mojom::PageContentType type, - absl::optional value, + std::optional value, base::TimeTicks start_time) { DVLOG(2) << "Video transcript Url extraction script completed and took" << (base::TimeTicks::Now() - start_time).InMillisecondsF() << "ms" diff --git a/components/ai_chat/renderer/page_content_extractor.h b/components/ai_chat/renderer/page_content_extractor.h index 7bca4978fd4..6bb71921f4a 100644 --- a/components/ai_chat/renderer/page_content_extractor.h +++ b/components/ai_chat/renderer/page_content_extractor.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_AI_CHAT_RENDERER_PAGE_CONTENT_EXTRACTOR_H_ #include +#include #include #include "base/values.h" @@ -14,7 +15,6 @@ #include "content/public/renderer/render_frame.h" #include "content/public/renderer/render_frame_observer.h" #include "mojo/public/cpp/bindings/receiver.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace ai_chat { @@ -33,11 +33,11 @@ class PageContentExtractor : public ai_chat::mojom::PageContentExtractor, void OnJSTranscriptUrlResult( mojom::PageContentExtractor::ExtractPageContentCallback callback, ai_chat::mojom::PageContentType type, - absl::optional value, + std::optional value, base::TimeTicks start_time); void OnDistillResult( mojom::PageContentExtractor::ExtractPageContentCallback callback, - const absl::optional& content); + const std::optional& content); // RenderFrameObserver implementation: void OnDestruct() override; diff --git a/components/ai_chat/renderer/page_text_distilling.cc b/components/ai_chat/renderer/page_text_distilling.cc index 797f62413ab..b8b47e3b25e 100644 --- a/components/ai_chat/renderer/page_text_distilling.cc +++ b/components/ai_chat/renderer/page_text_distilling.cc @@ -5,6 +5,7 @@ #include "brave/components/ai_chat/renderer/page_text_distilling.h" +#include #include #include #include @@ -16,7 +17,6 @@ #include "base/time/time.h" #include "brave/components/ai_chat/core/common/mojom/page_content_extractor.mojom.h" #include "content/public/renderer/render_frame.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/blink/public/web/web_local_frame.h" #include "third_party/blink/public/web/web_script_source.h" #include "ui/accessibility/ax_node.h" @@ -115,7 +115,7 @@ void AddTextNodesToVector(const ui::AXNode* node, void DistillPageText( content::RenderFrame* render_frame, int32_t isolated_world_id, - base::OnceCallback&)> callback) { + base::OnceCallback&)> callback) { auto snapshotter = render_frame->CreateAXTreeSnapshotter( ui::AXMode::kWebContents | ui::AXMode::kHTML | ui::AXMode::kScreenReader); ui::AXTreeUpdate snapshot; @@ -144,9 +144,8 @@ void DistillPageText( blink::WebString::FromASCII("document.body.innerText")); auto on_script_executed = - [](base::OnceCallback&)> - callback, - absl::optional value, base::TimeTicks start_time) { + [](base::OnceCallback&)> callback, + std::optional value, base::TimeTicks start_time) { if (value->is_string()) { std::move(callback).Run(value->GetString()); return; diff --git a/components/ai_chat/renderer/page_text_distilling.h b/components/ai_chat/renderer/page_text_distilling.h index e09755a1eb7..72edfd49db2 100644 --- a/components/ai_chat/renderer/page_text_distilling.h +++ b/components/ai_chat/renderer/page_text_distilling.h @@ -6,10 +6,10 @@ #ifndef BRAVE_COMPONENTS_AI_CHAT_RENDERER_PAGE_TEXT_DISTILLING_H_ #define BRAVE_COMPONENTS_AI_CHAT_RENDERER_PAGE_TEXT_DISTILLING_H_ +#include #include #include "base/functional/callback_forward.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace content { class RenderFrame; @@ -20,7 +20,7 @@ namespace ai_chat { void DistillPageText( content::RenderFrame* render_frame, int32_t isolated_world_id, - base::OnceCallback&)>); + base::OnceCallback&)>); } // namespace ai_chat diff --git a/components/api_request_helper/api_request_helper.h b/components/api_request_helper/api_request_helper.h index d925d52ac07..a11cc886b11 100644 --- a/components/api_request_helper/api_request_helper.h +++ b/components/api_request_helper/api_request_helper.h @@ -8,6 +8,7 @@ #include #include +#include #include #include @@ -22,7 +23,6 @@ #include "services/data_decoder/public/cpp/data_decoder.h" #include "services/network/public/cpp/simple_url_loader.h" #include "services/network/public/cpp/simple_url_loader_stream_consumer.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h" namespace network { @@ -83,7 +83,7 @@ struct APIRequestOptions { bool auto_retry_on_network_change = false; bool enable_cache = false; size_t max_body_size = -1u; - absl::optional timeout; + std::optional timeout; }; // Anyone is welcome to use APIRequestHelper to reduce boilerplate @@ -96,7 +96,7 @@ class APIRequestHelper { data_decoder::DataDecoder::ValueOrError result)>; using ResultCallback = base::OnceCallback; using ResponseConversionCallback = - base::OnceCallback( + base::OnceCallback( const std::string& raw_response)>; class URLLoaderHandler : public network::SimpleURLLoaderStreamConsumer { diff --git a/components/api_request_helper/api_request_helper_unittest.cc b/components/api_request_helper/api_request_helper_unittest.cc index e0b7eb37e5b..9912f5c5476 100644 --- a/components/api_request_helper/api_request_helper_unittest.cc +++ b/components/api_request_helper/api_request_helper_unittest.cc @@ -6,6 +6,7 @@ #include "brave/components/api_request_helper/api_request_helper.h" #include +#include #include #include @@ -33,9 +34,9 @@ MATCHER_P(MatchesAPIRequestResult, request_result, "") { return arg == *request_result; } -absl::optional ConversionCallback( +std::optional ConversionCallback( const std::string& expected_raw_response, - const absl::optional& converted_response, + const std::optional& converted_response, const std::string& raw_response) { EXPECT_EQ(expected_raw_response, raw_response); return converted_response; @@ -111,7 +112,7 @@ class ApiRequestHelperUnitTest : public testing::Test { SetInterceptor("POST", network_url, server_raw_response, enable_cache); api_request_helper_->Request( "POST", network_url, "", "application/json", callback.Get(), {}, - APIRequestOptions(false, enable_cache, -1u, absl::nullopt), + APIRequestOptions(false, enable_cache, -1u, std::nullopt), std::move(conversion_callback)); base::RunLoop().RunUntilIdle(); } @@ -177,11 +178,11 @@ TEST_F(ApiRequestHelperUnitTest, RequestWithConversion) { SendRequest(server_raw_response, "", base::Value(), 200, net::OK, base::BindOnce(&ConversionCallback, server_raw_response, "")); - // Returning absl::nullopt in conversion callback results in empty response + // Returning std::nullopt in conversion callback results in empty response server_raw_response = "{}"; SendRequest( server_raw_response, "", base::Value(), 422, net::OK, - base::BindOnce(&ConversionCallback, server_raw_response, absl::nullopt)); + base::BindOnce(&ConversionCallback, server_raw_response, std::nullopt)); } TEST_F(ApiRequestHelperUnitTest, Is2XXResponseCode) { diff --git a/components/body_sniffer/body_sniffer_url_loader.cc b/components/body_sniffer/body_sniffer_url_loader.cc index 705410b0702..51ea8ab5740 100644 --- a/components/body_sniffer/body_sniffer_url_loader.cc +++ b/components/body_sniffer/body_sniffer_url_loader.cc @@ -5,6 +5,7 @@ #include "brave/components/body_sniffer/body_sniffer_url_loader.h" +#include #include #include "base/functional/bind.h" @@ -67,7 +68,7 @@ void BodySnifferURLLoader::OnReceiveEarlyHints( void BodySnifferURLLoader::OnReceiveResponse( network::mojom::URLResponseHeadPtr response_head, mojo::ScopedDataPipeConsumerHandle body, - absl::optional cached_metadata) { + std::optional cached_metadata) { // OnReceiveResponse() shouldn't be called because BodySnifferURLLoader is // created by WillProcessResponse(), which is equivalent // to OnReceiveResponse(). @@ -128,7 +129,7 @@ void BodySnifferURLLoader::FollowRedirect( const std::vector& removed_headers, const net::HttpRequestHeaders& modified_headers, const net::HttpRequestHeaders& modified_cors_exempt_headers, - const absl::optional& new_url) { + const std::optional& new_url) { // BodySnifferURLLoader starts handling the request after // OnReceivedResponse(). A redirect response is not expected. NOTREACHED(); diff --git a/components/body_sniffer/body_sniffer_url_loader.h b/components/body_sniffer/body_sniffer_url_loader.h index a0756efd2fe..990fd8d9182 100644 --- a/components/body_sniffer/body_sniffer_url_loader.h +++ b/components/body_sniffer/body_sniffer_url_loader.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BODY_SNIFFER_BODY_SNIFFER_URL_LOADER_H_ #define BRAVE_COMPONENTS_BODY_SNIFFER_BODY_SNIFFER_URL_LOADER_H_ +#include #include #include @@ -22,7 +23,6 @@ #include "services/network/public/mojom/early_hints.mojom-forward.h" #include "services/network/public/mojom/url_loader.mojom.h" #include "services/network/public/mojom/url_response_head.mojom-forward.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h" namespace net { @@ -71,7 +71,7 @@ class BodySnifferURLLoader : public network::mojom::URLLoaderClient, void OnReceiveResponse( network::mojom::URLResponseHeadPtr response_head, mojo::ScopedDataPipeConsumerHandle body, - absl::optional cached_metadata) override; + std::optional cached_metadata) override; void OnReceiveRedirect( const net::RedirectInfo& redirect_info, network::mojom::URLResponseHeadPtr response_head) override; @@ -87,7 +87,7 @@ class BodySnifferURLLoader : public network::mojom::URLLoaderClient, const std::vector& removed_headers, const net::HttpRequestHeaders& modified_headers, const net::HttpRequestHeaders& modified_cors_exempt_headers, - const absl::optional& new_url) override; + const std::optional& new_url) override; void SetPriority(net::RequestPriority priority, int32_t intra_priority_value) override; void PauseReadingBodyFromNet() override; @@ -118,7 +118,7 @@ class BodySnifferURLLoader : public network::mojom::URLLoaderClient, enum class State { kWaitForBody, kLoading, kSending, kCompleted, kAborted }; State state_ = State::kWaitForBody; - absl::optional complete_status_; + std::optional complete_status_; std::string buffered_body_; size_t bytes_remaining_in_buffer_; diff --git a/components/brave_adaptive_captcha/get_adaptive_captcha_challenge.cc b/components/brave_adaptive_captcha/get_adaptive_captcha_challenge.cc index d947d967a82..3dd8501ffce 100644 --- a/components/brave_adaptive_captcha/get_adaptive_captcha_challenge.cc +++ b/components/brave_adaptive_captcha/get_adaptive_captcha_challenge.cc @@ -14,7 +14,6 @@ #include "brave/components/api_request_helper/api_request_helper.h" #include "brave/components/brave_adaptive_captcha/server_util.h" #include "net/http/http_status_code.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h" namespace brave_adaptive_captcha { diff --git a/components/brave_ads/browser/ads_service.h b/components/brave_ads/browser/ads_service.h index 650a5dc8c0a..3a5ee2f99ec 100644 --- a/components/brave_ads/browser/ads_service.h +++ b/components/brave_ads/browser/ads_service.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_BROWSER_ADS_SERVICE_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_BROWSER_ADS_SERVICE_H_ +#include #include #include @@ -18,7 +19,6 @@ #include "brave/components/services/bat_ads/public/interfaces/bat_ads.mojom.h" #include "components/keyed_service/core/keyed_service.h" #include "mojo/public/cpp/bindings/pending_remote.h" -#include "third_party/abseil-cpp/absl/types/optional.h" class GURL; @@ -97,7 +97,7 @@ class AdsService : public KeyedService { virtual void PrefetchNewTabPageAd() = 0; // Called to get the prefetched new tab page ad for display. - virtual absl::optional + virtual std::optional GetPrefetchedNewTabPageAdForDisplay() = 0; // Called when failing to prefetch a new tab page ad for the specified diff --git a/components/brave_ads/browser/ads_service_callback.h b/components/brave_ads/browser/ads_service_callback.h index d9d66b1754a..832a88b1799 100644 --- a/components/brave_ads/browser/ads_service_callback.h +++ b/components/brave_ads/browser/ads_service_callback.h @@ -6,24 +6,24 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_BROWSER_ADS_SERVICE_CALLBACK_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_BROWSER_ADS_SERVICE_CALLBACK_H_ +#include #include #include "base/functional/callback.h" #include "base/values.h" #include "brave/components/brave_ads/core/mojom/brave_ads.mojom-forward.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { using GetDiagnosticsCallback = - base::OnceCallback diagnostics)>; + base::OnceCallback diagnostics)>; using GetStatementOfAccountsCallback = base::OnceCallback; using MaybeServeInlineContentAdAsDictCallback = base::OnceCallback ads)>; + std::optional ads)>; using PurgeOrphanedAdEventsForTypeCallback = base::OnceCallback; diff --git a/components/brave_ads/browser/ads_service_impl.cc b/components/brave_ads/browser/ads_service_impl.cc index 6f805261c31..0f41d996a16 100644 --- a/components/brave_ads/browser/ads_service_impl.cc +++ b/components/brave_ads/browser/ads_service_impl.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/browser/ads_service_impl.h" +#include #include #include "base/base64.h" @@ -127,10 +128,10 @@ std::string URLMethodToRequestType(mojom::UrlRequestMethodType method) { } } -absl::optional LoadOnFileTaskRunner(const base::FilePath& path) { +std::optional LoadOnFileTaskRunner(const base::FilePath& path) { std::string value; if (!base::ReadFileToString(path, &value)) { - return absl::nullopt; + return std::nullopt; } return value; @@ -912,7 +913,7 @@ void AdsServiceImpl::CloseAllNotificationAds() { } void AdsServiceImpl::PrefetchNewTabPageAdCallback( - absl::optional dict) { + std::optional dict) { CHECK(!prefetched_new_tab_page_ad_); CHECK(is_prefetching_new_tab_page_ad_); @@ -955,7 +956,7 @@ void AdsServiceImpl::OpenNewTabWithAd(const std::string& placement_id) { } void AdsServiceImpl::OpenNewTabWithAdCallback( - absl::optional dict) { + std::optional dict) { if (!dict) { return VLOG(1) << "Failed to get notification ad"; } @@ -1148,7 +1149,7 @@ void AdsServiceImpl::OnNotificationAdClicked(const std::string& placement_id) { void AdsServiceImpl::GetDiagnostics(GetDiagnosticsCallback callback) { if (!bat_ads_associated_remote_.is_bound()) { - return std::move(callback).Run(/*diagnostics*/ absl::nullopt); + return std::move(callback).Run(/*diagnostics*/ std::nullopt); } bat_ads_associated_remote_->GetDiagnostics(std::move(callback)); @@ -1168,7 +1169,7 @@ void AdsServiceImpl::MaybeServeInlineContentAd( MaybeServeInlineContentAdAsDictCallback callback) { if (!bat_ads_associated_remote_.is_bound()) { return std::move(callback).Run(dimensions, - /*inline_content_ad*/ absl::nullopt); + /*inline_content_ad*/ std::nullopt); } bat_ads_associated_remote_->MaybeServeInlineContentAd(dimensions, @@ -1203,13 +1204,13 @@ void AdsServiceImpl::PrefetchNewTabPageAd() { } } -absl::optional +std::optional AdsServiceImpl::GetPrefetchedNewTabPageAdForDisplay() { if (!bat_ads_associated_remote_.is_bound()) { - return absl::nullopt; + return std::nullopt; } - absl::optional ad; + std::optional ad; if (prefetched_new_tab_page_ad_ && prefetched_new_tab_page_ad_->IsValid()) { ad = prefetched_new_tab_page_ad_; prefetched_new_tab_page_ad_.reset(); @@ -1619,7 +1620,7 @@ void AdsServiceImpl::Load(const std::string& name, LoadCallback callback) { FROM_HERE, base::BindOnce(&LoadOnFileTaskRunner, base_path_.AppendASCII(name)), base::BindOnce( - [](LoadCallback callback, const absl::optional& value) { + [](LoadCallback callback, const std::optional& value) { std::move(callback).Run(value); }, std::move(callback))); @@ -1629,7 +1630,7 @@ void AdsServiceImpl::LoadComponentResource( const std::string& id, const int version, LoadComponentResourceCallback callback) { - absl::optional file_path = + std::optional file_path = g_brave_browser_process->resource_component()->GetPath(id, version); if (!file_path) { return std::move(callback).Run({}); diff --git a/components/brave_ads/browser/ads_service_impl.h b/components/brave_ads/browser/ads_service_impl.h index 46c7300e6ac..14e2fca813b 100644 --- a/components/brave_ads/browser/ads_service_impl.h +++ b/components/brave_ads/browser/ads_service_impl.h @@ -10,6 +10,7 @@ #include #include #include +#include #include #include @@ -34,7 +35,6 @@ #include "mojo/public/cpp/bindings/associated_remote.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/remote.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/base/idle/idle.h" class GURL; @@ -179,13 +179,13 @@ class AdsServiceImpl : public AdsService, // TODO(https://github.com/brave/brave-browser/issues/26192) Decouple new // tab page ad business logic. - void PrefetchNewTabPageAdCallback(absl::optional dict); + void PrefetchNewTabPageAdCallback(std::optional dict); // TODO(https://github.com/brave/brave-browser/issues/26193) Decouple open // new tab with ad business logic. void MaybeOpenNewTabWithAd(); void OpenNewTabWithAd(const std::string& placement_id); - void OpenNewTabWithAdCallback(absl::optional dict); + void OpenNewTabWithAdCallback(std::optional dict); void RetryOpeningNewTabWithAd(const std::string& placement_id); void OpenNewTabWithUrl(const GURL& url); @@ -225,7 +225,7 @@ class AdsServiceImpl : public AdsService, mojom::InlineContentAdEventType event_type, TriggerAdEventCallback callback) override; - absl::optional GetPrefetchedNewTabPageAdForDisplay() + std::optional GetPrefetchedNewTabPageAdForDisplay() override; void PrefetchNewTabPageAd() override; void OnFailedToPrefetchNewTabPageAd( @@ -414,7 +414,7 @@ class AdsServiceImpl : public AdsService, std::map> notification_ad_timers_; - absl::optional prefetched_new_tab_page_ad_; + std::optional prefetched_new_tab_page_ad_; bool is_prefetching_new_tab_page_ad_ = false; std::string retry_opening_new_tab_for_ad_with_placement_id_; diff --git a/components/brave_ads/browser/ads_service_mock.h b/components/brave_ads/browser/ads_service_mock.h index 305f12c898b..dfa9d91e8de 100644 --- a/components/brave_ads/browser/ads_service_mock.h +++ b/components/brave_ads/browser/ads_service_mock.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_BROWSER_ADS_SERVICE_MOCK_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_BROWSER_ADS_SERVICE_MOCK_H_ +#include #include #include @@ -55,7 +56,7 @@ class AdsServiceMock : public AdsService { TriggerAdEventCallback)); MOCK_METHOD0(GetPrefetchedNewTabPageAdForDisplay, - absl::optional()); + std::optional()); MOCK_METHOD0(PrefetchNewTabPageAd, void()); MOCK_METHOD4(TriggerNewTabPageAdEvent, void(const std::string&, diff --git a/components/brave_ads/browser/component_updater/component_util.cc b/components/brave_ads/browser/component_updater/component_util.cc index 83bac6c6fce..8de69196457 100644 --- a/components/brave_ads/browser/component_updater/component_util.cc +++ b/components/brave_ads/browser/component_updater/component_util.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/browser/component_updater/component_util.h" +#include #include #include "base/containers/fixed_flat_map.h" @@ -4171,10 +4172,10 @@ constexpr auto kComponents = base::MakeFixedFlatMapSorted GetComponentInfo(const std::string& id) { +std::optional GetComponentInfo(const std::string& id) { const auto* const iter = kComponents.find(id); if (iter == kComponents.cend()) { - return absl::nullopt; + return std::nullopt; } return iter->second; diff --git a/components/brave_ads/browser/component_updater/component_util.h b/components/brave_ads/browser/component_updater/component_util.h index c799bec4f59..78264333db0 100644 --- a/components/brave_ads/browser/component_updater/component_util.h +++ b/components/brave_ads/browser/component_updater/component_util.h @@ -6,14 +6,14 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_BROWSER_COMPONENT_UPDATER_COMPONENT_UTIL_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_BROWSER_COMPONENT_UPDATER_COMPONENT_UTIL_H_ +#include #include #include "brave/components/brave_ads/browser/component_updater/component_info.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { -absl::optional GetComponentInfo(const std::string& id); +std::optional GetComponentInfo(const std::string& id); } // namespace brave_ads diff --git a/components/brave_ads/browser/component_updater/resource_component.cc b/components/brave_ads/browser/component_updater/resource_component.cc index d5fa41f9441..5087155b3e6 100644 --- a/components/brave_ads/browser/component_updater/resource_component.cc +++ b/components/brave_ads/browser/component_updater/resource_component.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/browser/component_updater/resource_component.h" +#include + #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/functional/bind.h" @@ -71,12 +73,12 @@ void ResourceComponent::RegisterComponentForLanguageCode( language_code); } -absl::optional ResourceComponent::GetPath(const std::string& id, - const int version) { +std::optional ResourceComponent::GetPath(const std::string& id, + const int version) { const std::string index = GetResourceKey(id, version); const auto iter = resources_.find(index); if (iter == resources_.cend()) { - return absl::nullopt; + return std::nullopt; } const auto& [_, resource] = *iter; @@ -117,7 +119,7 @@ void ResourceComponent::LoadManifestCallback(const std::string& component_id, const std::string& json) { VLOG(8) << "Manifest JSON: " << json; - const absl::optional root = base::JSONReader::Read(json); + const std::optional root = base::JSONReader::Read(json); if (!root || !root->is_dict()) { return VLOG(1) << "Failed to parse manifest"; } @@ -144,13 +146,13 @@ void ResourceComponent::LoadResourceCallback( const std::string& json) { VLOG(8) << "Resource JSON: " << json; - const absl::optional root = base::JSONReader::Read(json); + const std::optional root = base::JSONReader::Read(json); if (!root || !root->is_dict()) { return VLOG(1) << "Failed to parse resource"; } const base::Value::Dict& dict = root->GetDict(); - const absl::optional schema_version = dict.FindInt(kSchemaVersionKey); + const std::optional schema_version = dict.FindInt(kSchemaVersionKey); if (!schema_version) { return VLOG(1) << "Resource schema version is missing"; } @@ -177,7 +179,7 @@ void ResourceComponent::LoadResourceCallback( continue; } - const absl::optional version = item_dict->FindInt(kResourceVersionKey); + const std::optional version = item_dict->FindInt(kResourceVersionKey); if (!version) { VLOG(1) << *resource_id << " resource version is missing"; continue; diff --git a/components/brave_ads/browser/component_updater/resource_component.h b/components/brave_ads/browser/component_updater/resource_component.h index 2572b692853..fcc52781e1d 100644 --- a/components/brave_ads/browser/component_updater/resource_component.h +++ b/components/brave_ads/browser/component_updater/resource_component.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_ADS_BROWSER_COMPONENT_UPDATER_RESOURCE_COMPONENT_H_ #include +#include #include #include "base/files/file_path.h" @@ -17,7 +18,6 @@ #include "brave/components/brave_ads/browser/component_updater/resource_component_registrar_delegate.h" #include "brave/components/brave_ads/browser/component_updater/resource_info.h" #include "brave/components/brave_component_updater/browser/brave_component.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -40,7 +40,7 @@ class ResourceComponent : public ResourceComponentRegistrarDelegate { void RegisterComponentForCountryCode(const std::string& country_code); void RegisterComponentForLanguageCode(const std::string& language_code); - absl::optional GetPath(const std::string& id, int version); + std::optional GetPath(const std::string& id, int version); private: void LoadManifestCallback(const std::string& component_id, diff --git a/components/brave_ads/browser/component_updater/resource_component_registrar.cc b/components/brave_ads/browser/component_updater/resource_component_registrar.cc index abcecdc909b..6c6d65775c9 100644 --- a/components/brave_ads/browser/component_updater/resource_component_registrar.cc +++ b/components/brave_ads/browser/component_updater/resource_component_registrar.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/browser/component_updater/resource_component_registrar.h" +#include + #include "base/files/file_path.h" #include "base/logging.h" #include "base/strings/string_util.h" @@ -32,7 +34,7 @@ void ResourceComponentRegistrar::RegisterResourceComponent( const std::string& resource_id) { CHECK(!resource_id.empty()); - const absl::optional component = GetComponentInfo(resource_id); + const std::optional component = GetComponentInfo(resource_id); if (!component) { return VLOG(1) << "Ads resource not supported for " << resource_id; } diff --git a/components/brave_ads/browser/component_updater/resource_component_registrar.h b/components/brave_ads/browser/component_updater/resource_component_registrar.h index a8d65fad930..57d4c19bca6 100644 --- a/components/brave_ads/browser/component_updater/resource_component_registrar.h +++ b/components/brave_ads/browser/component_updater/resource_component_registrar.h @@ -6,10 +6,10 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_BROWSER_COMPONENT_UPDATER_RESOURCE_COMPONENT_REGISTRAR_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_BROWSER_COMPONENT_UPDATER_RESOURCE_COMPONENT_REGISTRAR_H_ +#include #include #include "brave/components/brave_component_updater/browser/brave_component.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace base { class FilePath; @@ -48,7 +48,7 @@ class ResourceComponentRegistrar raw_ref resource_component_registrar_delegate_; - absl::optional resource_component_id_; + std::optional resource_component_id_; }; } // namespace brave_ads diff --git a/components/brave_ads/content/browser/units/search_result_ad/search_result_ad_handler.cc b/components/brave_ads/content/browser/units/search_result_ad/search_result_ad_handler.cc index d9b01e7f8de..eaa287f31ae 100644 --- a/components/brave_ads/content/browser/units/search_result_ad/search_result_ad_handler.cc +++ b/components/brave_ads/content/browser/units/search_result_ad/search_result_ad_handler.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_ads/content/browser/units/search_result_ad/search_result_ad_handler.h" #include +#include #include #include "base/functional/callback_helpers.h" @@ -18,7 +19,6 @@ #include "brave/components/brave_search/common/brave_search_utils.h" #include "content/public/browser/render_frame_host.h" #include "services/service_manager/public/cpp/interface_provider.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h" namespace brave_ads { @@ -75,7 +75,7 @@ void SearchResultAdHandler::MaybeTriggerSearchResultAdClickedEvent( return; } - const absl::optional placement_id = + const std::optional placement_id = GetPlacementIdFromSearchResultAdClickedUrl(navigation_url); if (!placement_id || placement_id->empty()) { return; diff --git a/components/brave_ads/content/browser/units/search_result_ad/search_result_ad_handler.h b/components/brave_ads/content/browser/units/search_result_ad/search_result_ad_handler.h index a75621a6b86..33eb94bf202 100644 --- a/components/brave_ads/content/browser/units/search_result_ad/search_result_ad_handler.h +++ b/components/brave_ads/content/browser/units/search_result_ad/search_result_ad_handler.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_ADS_CONTENT_BROWSER_UNITS_SEARCH_RESULT_AD_SEARCH_RESULT_AD_HANDLER_H_ #include +#include #include #include @@ -15,7 +16,6 @@ #include "base/memory/weak_ptr.h" #include "brave/components/brave_ads/core/mojom/brave_ads.mojom-forward.h" #include "mojo/public/cpp/bindings/remote.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/blink/public/mojom/document_metadata/document_metadata.mojom.h" class GURL; @@ -63,8 +63,8 @@ class SearchResultAdHandler final { raw_ptr ads_service_ = nullptr; // NOT OWNED bool should_trigger_viewed_event_ = true; - absl::optional> + std::optional> search_result_ads_; base::WeakPtrFactory weak_factory_{this}; diff --git a/components/brave_ads/content/browser/units/search_result_ad/search_result_ad_util.cc b/components/brave_ads/content/browser/units/search_result_ad/search_result_ad_util.cc index 5ab3032fcac..f156d668873 100644 --- a/components/brave_ads/content/browser/units/search_result_ad/search_result_ad_util.cc +++ b/components/brave_ads/content/browser/units/search_result_ad/search_result_ad_util.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/content/browser/units/search_result_ad/search_result_ad_util.h" +#include #include #include "brave/components/brave_search/common/brave_search_utils.h" @@ -20,7 +21,7 @@ constexpr char kPlacementIdQueryKey[] = "placement_id"; } // namespace -absl::optional GetPlacementIdFromSearchResultAdClickedUrl( +std::optional GetPlacementIdFromSearchResultAdClickedUrl( const GURL& url) { if (!url.is_valid() || !url.SchemeIs(url::kHttpsScheme) || url.path_piece() != kSearchResultAdClickedPath || !url.has_query() || diff --git a/components/brave_ads/content/browser/units/search_result_ad/search_result_ad_util.h b/components/brave_ads/content/browser/units/search_result_ad/search_result_ad_util.h index 5c5602a19db..8937ac904c1 100644 --- a/components/brave_ads/content/browser/units/search_result_ad/search_result_ad_util.h +++ b/components/brave_ads/content/browser/units/search_result_ad/search_result_ad_util.h @@ -6,15 +6,15 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CONTENT_BROWSER_UNITS_SEARCH_RESULT_AD_SEARCH_RESULT_AD_UTIL_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CONTENT_BROWSER_UNITS_SEARCH_RESULT_AD_SEARCH_RESULT_AD_UTIL_H_ +#include #include -#include "third_party/abseil-cpp/absl/types/optional.h" class GURL; namespace brave_ads { -absl::optional GetPlacementIdFromSearchResultAdClickedUrl( +std::optional GetPlacementIdFromSearchResultAdClickedUrl( const GURL& url); } // namespace brave_ads diff --git a/components/brave_ads/core/internal/account/account.cc b/components/brave_ads/core/internal/account/account.cc index 2fb5a2051c2..53a0d7dcefb 100644 --- a/components/brave_ads/core/internal/account/account.cc +++ b/components/brave_ads/core/internal/account/account.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/account/account.h" +#include #include #include "base/check_op.h" @@ -78,7 +79,7 @@ void Account::RemoveObserver(AccountObserver* observer) { void Account::SetWallet(const std::string& payment_id, const std::string& recovery_seed) { - const absl::optional wallet = ToWallet(payment_id, recovery_seed); + const std::optional wallet = ToWallet(payment_id, recovery_seed); if (!wallet) { BLOG(0, "Failed to initialize wallet"); return NotifyFailedToInitializeWallet(); diff --git a/components/brave_ads/core/internal/account/account.h b/components/brave_ads/core/internal/account/account.h index f6243c2aa05..7fa71a53929 100644 --- a/components/brave_ads/core/internal/account/account.h +++ b/components/brave_ads/core/internal/account/account.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_ACCOUNT_H_ #include +#include #include #include "base/memory/raw_ptr.h" @@ -23,7 +24,6 @@ #include "brave/components/brave_ads/core/public/ads_callback.h" #include "brave/components/brave_ads/core/public/client/ads_client_notifier_observer.h" #include "brave/components/brave_ads/core/public/units/ad_type.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -56,7 +56,7 @@ class Account final : public AdsClientNotifierObserver, void SetWallet(const std::string& payment_id, const std::string& recovery_seed); - const absl::optional& GetWallet() const { return wallet_; } + const std::optional& GetWallet() const { return wallet_; } void Deposit(const std::string& creative_instance_id, const std::string& segment, @@ -164,7 +164,7 @@ class Account final : public AdsClientNotifierObserver, std::unique_ptr refill_confirmation_tokens_; std::unique_ptr redeem_payment_tokens_; - absl::optional wallet_; + std::optional wallet_; base::WeakPtrFactory weak_factory_{this}; }; diff --git a/components/brave_ads/core/internal/account/account_unittest.cc b/components/brave_ads/core/internal/account/account_unittest.cc index aa9352296c2..23dc79cd2df 100644 --- a/components/brave_ads/core/internal/account/account_unittest.cc +++ b/components/brave_ads/core/internal/account/account_unittest.cc @@ -38,7 +38,6 @@ #include "brave/components/brave_ads/core/internal/settings/settings_unittest_util.h" #include "brave/components/brave_ads/core/internal/units/ad_unittest_constants.h" #include "net/http/http_status_code.h" -#include "third_party/abseil-cpp/absl/types/optional.h" // npm run test -- brave_unit_tests --filter=BraveAds diff --git a/components/brave_ads/core/internal/account/confirmations/confirmation_info.h b/components/brave_ads/core/internal/account/confirmations/confirmation_info.h index 7354ff2676a..6ef8cda0d22 100644 --- a/components/brave_ads/core/internal/account/confirmations/confirmation_info.h +++ b/components/brave_ads/core/internal/account/confirmations/confirmation_info.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_CONFIRMATIONS_CONFIRMATION_INFO_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_CONFIRMATIONS_CONFIRMATION_INFO_H_ +#include #include #include @@ -14,7 +15,6 @@ #include "brave/components/brave_ads/core/internal/account/user_data/user_data_info.h" #include "brave/components/brave_ads/core/public/account/confirmations/confirmation_type.h" #include "brave/components/brave_ads/core/public/units/ad_type.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -36,7 +36,7 @@ struct ConfirmationInfo final { ConfirmationType type = ConfirmationType::kUndefined; AdType ad_type = AdType::kUndefined; base::Time created_at; - absl::optional reward; + std::optional reward; UserDataInfo user_data; }; diff --git a/components/brave_ads/core/internal/account/confirmations/confirmations.cc b/components/brave_ads/core/internal/account/confirmations/confirmations.cc index 948cdf174fe..2f643cfb923 100644 --- a/components/brave_ads/core/internal/account/confirmations/confirmations.cc +++ b/components/brave_ads/core/internal/account/confirmations/confirmations.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/account/confirmations/confirmations.h" +#include + #include "base/functional/bind.h" #include "base/time/time.h" #include "brave/components/brave_ads/core/internal/account/confirmations/confirmation_info.h" @@ -19,7 +21,6 @@ #include "brave/components/brave_ads/core/internal/common/logging_util.h" #include "brave/components/brave_ads/core/internal/common/time/time_formatting_util.h" #include "brave/components/brave_ads/core/internal/settings/settings.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -53,7 +54,7 @@ void Confirmations::ConfirmCallback(const TransactionInfo& transaction, const UserDataInfo& user_data) { CHECK(transaction.IsValid()); - const absl::optional confirmation = + const std::optional confirmation = UserHasJoinedBraveRewards() ? BuildRewardConfirmation(token_generator_, transaction, user_data) : BuildNonRewardConfirmation(transaction, user_data); diff --git a/components/brave_ads/core/internal/account/confirmations/confirmations_unittest.cc b/components/brave_ads/core/internal/account/confirmations/confirmations_unittest.cc index eb3d54298f9..1e174e1fcf9 100644 --- a/components/brave_ads/core/internal/account/confirmations/confirmations_unittest.cc +++ b/components/brave_ads/core/internal/account/confirmations/confirmations_unittest.cc @@ -15,7 +15,6 @@ #include "brave/components/brave_ads/core/internal/account/transactions/transactions_unittest_util.h" #include "brave/components/brave_ads/core/internal/common/unittest/unittest_base.h" #include "brave/components/brave_ads/core/internal/settings/settings_unittest_util.h" -#include "third_party/abseil-cpp/absl/types/optional.h" // npm run test -- brave_unit_tests --filter=BraveAds* diff --git a/components/brave_ads/core/internal/account/confirmations/confirmations_util.cc b/components/brave_ads/core/internal/account/confirmations/confirmations_util.cc index 1ed2befd03b..bbe3e1720a5 100644 --- a/components/brave_ads/core/internal/account/confirmations/confirmations_util.cc +++ b/components/brave_ads/core/internal/account/confirmations/confirmations_util.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/account/confirmations/confirmations_util.h" +#include #include #include "base/base64url.h" @@ -31,7 +32,7 @@ constexpr char kVerificationSignatureKey[] = "signature"; bool Verify(const ConfirmationInfo& confirmation) { CHECK(confirmation.reward); - absl::optional verification_key = + std::optional verification_key = confirmation.reward->unblinded_token.DeriveVerificationKey(); if (!verification_key) { return false; @@ -44,7 +45,7 @@ bool Verify(const ConfirmationInfo& confirmation) { return false; } - const absl::optional dict = + const std::optional dict = base::JSONReader::ReadDict(credential); if (!dict) { return false; diff --git a/components/brave_ads/core/internal/account/confirmations/confirmations_util_unittest.cc b/components/brave_ads/core/internal/account/confirmations/confirmations_util_unittest.cc index 33fc9e99b9a..f51f310356d 100644 --- a/components/brave_ads/core/internal/account/confirmations/confirmations_util_unittest.cc +++ b/components/brave_ads/core/internal/account/confirmations/confirmations_util_unittest.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/account/confirmations/confirmations_util.h" +#include + #include "brave/components/brave_ads/core/internal/account/confirmations/reward/reward_confirmation_util.h" #include "brave/components/brave_ads/core/internal/account/tokens/confirmation_tokens/confirmation_tokens_unittest_util.h" #include "brave/components/brave_ads/core/internal/account/tokens/confirmation_tokens/confirmation_tokens_util.h" @@ -46,7 +48,7 @@ TEST_F(BraveAdsConfirmationsUtilTest, ResetTokens) { const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/true); - const absl::optional confirmation = + const std::optional confirmation = BuildRewardConfirmation(&token_generator_mock_, transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); diff --git a/components/brave_ads/core/internal/account/confirmations/non_reward/non_reward_confirmation_util.cc b/components/brave_ads/core/internal/account/confirmations/non_reward/non_reward_confirmation_util.cc index 5b16008416e..e6a843bd681 100644 --- a/components/brave_ads/core/internal/account/confirmations/non_reward/non_reward_confirmation_util.cc +++ b/components/brave_ads/core/internal/account/confirmations/non_reward/non_reward_confirmation_util.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/account/confirmations/non_reward/non_reward_confirmation_util.h" +#include + #include "base/check.h" #include "base/time/time.h" #include "brave/components/brave_ads/core/internal/account/confirmations/confirmation_info.h" @@ -16,7 +18,7 @@ namespace brave_ads { -absl::optional BuildNonRewardConfirmation( +std::optional BuildNonRewardConfirmation( const TransactionInfo& transaction, const UserDataInfo& user_data) { CHECK(transaction.IsValid()); diff --git a/components/brave_ads/core/internal/account/confirmations/non_reward/non_reward_confirmation_util.h b/components/brave_ads/core/internal/account/confirmations/non_reward/non_reward_confirmation_util.h index 318b3bc33c6..2d87d54b257 100644 --- a/components/brave_ads/core/internal/account/confirmations/non_reward/non_reward_confirmation_util.h +++ b/components/brave_ads/core/internal/account/confirmations/non_reward/non_reward_confirmation_util.h @@ -6,7 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_CONFIRMATIONS_NON_REWARD_NON_REWARD_CONFIRMATION_UTIL_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_CONFIRMATIONS_NON_REWARD_NON_REWARD_CONFIRMATION_UTIL_H_ -#include "third_party/abseil-cpp/absl/types/optional.h" +#include namespace brave_ads { @@ -14,7 +14,7 @@ struct ConfirmationInfo; struct UserDataInfo; struct TransactionInfo; -absl::optional BuildNonRewardConfirmation( +std::optional BuildNonRewardConfirmation( const TransactionInfo& transaction, const UserDataInfo& user_data); diff --git a/components/brave_ads/core/internal/account/confirmations/payload/confirmation_payload_json_writer.cc b/components/brave_ads/core/internal/account/confirmations/payload/confirmation_payload_json_writer.cc index 129a397621a..72a70677c36 100644 --- a/components/brave_ads/core/internal/account/confirmations/payload/confirmation_payload_json_writer.cc +++ b/components/brave_ads/core/internal/account/confirmations/payload/confirmation_payload_json_writer.cc @@ -12,7 +12,6 @@ #include "base/values.h" #include "brave/components/brave_ads/core/internal/account/confirmations/confirmation_info.h" #include "brave/components/brave_ads/core/internal/account/confirmations/payload/reward_confirmation_payload_util.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads::json::writer { diff --git a/components/brave_ads/core/internal/account/confirmations/payload/confirmation_payload_json_writer_unittest.cc b/components/brave_ads/core/internal/account/confirmations/payload/confirmation_payload_json_writer_unittest.cc index 86c8a3da5f3..0a19d149039 100644 --- a/components/brave_ads/core/internal/account/confirmations/payload/confirmation_payload_json_writer_unittest.cc +++ b/components/brave_ads/core/internal/account/confirmations/payload/confirmation_payload_json_writer_unittest.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/account/confirmations/payload/confirmation_payload_json_writer.h" +#include + #include "base/test/values_test_util.h" #include "brave/components/brave_ads/core/internal/account/confirmations/confirmation_info.h" #include "brave/components/brave_ads/core/internal/account/confirmations/non_reward/non_reward_confirmation_util.h" @@ -35,7 +37,7 @@ TEST_F(BraveAdsConfirmationPayloadJsonWriterTest, const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/false); - const absl::optional confirmation = BuildRewardConfirmation( + const std::optional confirmation = BuildRewardConfirmation( &token_generator_mock_, transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); @@ -66,7 +68,7 @@ TEST_F(BraveAdsConfirmationPayloadJsonWriterTest, const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/false); - const absl::optional confirmation = + const std::optional confirmation = BuildNonRewardConfirmation(transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); diff --git a/components/brave_ads/core/internal/account/confirmations/payload/reward_confirmation_payload_util.cc b/components/brave_ads/core/internal/account/confirmations/payload/reward_confirmation_payload_util.cc index fe335910c52..d4e92013dd1 100644 --- a/components/brave_ads/core/internal/account/confirmations/payload/reward_confirmation_payload_util.cc +++ b/components/brave_ads/core/internal/account/confirmations/payload/reward_confirmation_payload_util.cc @@ -5,11 +5,11 @@ #include "brave/components/brave_ads/core/internal/account/confirmations/payload/reward_confirmation_payload_util.h" +#include #include #include #include "brave/components/brave_ads/core/internal/account/confirmations/reward/reward_info.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -22,12 +22,12 @@ constexpr char kPublicKeyKey[] = "publicKey"; base::Value::Dict BuildRewardConfirmationPayload(const RewardInfo& reward) { base::Value::List list; - const absl::optional blinded_token_base64 = + const std::optional blinded_token_base64 = reward.blinded_token.EncodeBase64(); CHECK(blinded_token_base64); list.Append(*blinded_token_base64); - const absl::optional public_key_base64 = + const std::optional public_key_base64 = reward.public_key.EncodeBase64(); CHECK(public_key_base64); diff --git a/components/brave_ads/core/internal/account/confirmations/payload/reward_confirmation_payload_util_unittest.cc b/components/brave_ads/core/internal/account/confirmations/payload/reward_confirmation_payload_util_unittest.cc index a28ce952b16..b271de49f67 100644 --- a/components/brave_ads/core/internal/account/confirmations/payload/reward_confirmation_payload_util_unittest.cc +++ b/components/brave_ads/core/internal/account/confirmations/payload/reward_confirmation_payload_util_unittest.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/account/confirmations/payload/reward_confirmation_payload_util.h" +#include + #include "base/test/values_test_util.h" #include "brave/components/brave_ads/core/internal/account/confirmations/confirmation_info.h" #include "brave/components/brave_ads/core/internal/account/confirmations/reward/reward_confirmation_util.h" @@ -34,7 +36,7 @@ TEST_F(BraveAdsRewardConfirmationPayloadUtilTest, const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/false); - const absl::optional confirmation = BuildRewardConfirmation( + const std::optional confirmation = BuildRewardConfirmation( &token_generator_mock_, transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); diff --git a/components/brave_ads/core/internal/account/confirmations/queue/confirmation_queue.cc b/components/brave_ads/core/internal/account/confirmations/queue/confirmation_queue.cc index 7e9acaee701..18db137c2e8 100644 --- a/components/brave_ads/core/internal/account/confirmations/queue/confirmation_queue.cc +++ b/components/brave_ads/core/internal/account/confirmations/queue/confirmation_queue.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/account/confirmations/queue/confirmation_queue.h" +#include + #include "base/check.h" #include "base/functional/bind.h" #include "base/memory/weak_ptr.h" @@ -98,7 +100,7 @@ void ConfirmationQueue::FailedToProcessQueueItem( } void ConfirmationQueue::ProcessNextQueueItem() { - const absl::optional confirmation = + const std::optional confirmation = MaybeGetNextConfirmationQueueItem(); if (!confirmation) { return NotifyDidExhaustConfirmationQueue(); diff --git a/components/brave_ads/core/internal/account/confirmations/queue/confirmation_queue_unittest.cc b/components/brave_ads/core/internal/account/confirmations/queue/confirmation_queue_unittest.cc index 982afde88cd..986e7464cc5 100644 --- a/components/brave_ads/core/internal/account/confirmations/queue/confirmation_queue_unittest.cc +++ b/components/brave_ads/core/internal/account/confirmations/queue/confirmation_queue_unittest.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_ads/core/internal/account/confirmations/queue/confirmation_queue.h" #include +#include #include "brave/components/brave_ads/core/internal/account/confirmations/confirmation_info.h" #include "brave/components/brave_ads/core/internal/account/confirmations/non_reward/non_reward_confirmation_util.h" @@ -31,7 +32,6 @@ #include "brave/components/brave_ads/core/internal/common/unittest/unittest_url_response_alias.h" #include "brave/components/brave_ads/core/internal/settings/settings_unittest_util.h" #include "net/http/http_status_code.h" -#include "third_party/abseil-cpp/absl/types/optional.h" // npm run test -- brave_unit_tests --filter=BraveAds* @@ -63,7 +63,7 @@ TEST_F(BraveAdsConfirmationQueueTest, AddRewardConfirmationToQueue) { const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/true); - const absl::optional confirmation = BuildRewardConfirmation( + const std::optional confirmation = BuildRewardConfirmation( &token_generator_mock_, transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); @@ -85,7 +85,7 @@ TEST_F(BraveAdsConfirmationQueueTest, AddNonRewardConfirmationToQueue) { const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/true); - const absl::optional confirmation = + const std::optional confirmation = BuildNonRewardConfirmation(transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); @@ -120,7 +120,7 @@ TEST_F(BraveAdsConfirmationQueueTest, ProcessRewardConfirmationInQueue) { const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/false); - const absl::optional confirmation = BuildRewardConfirmation( + const std::optional confirmation = BuildRewardConfirmation( &token_generator_mock_, transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); @@ -151,7 +151,7 @@ TEST_F(BraveAdsConfirmationQueueTest, ProcessNonRewardConfirmationQueue) { const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/false); - const absl::optional confirmation = + const std::optional confirmation = BuildNonRewardConfirmation(transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); @@ -191,7 +191,7 @@ TEST_F(BraveAdsConfirmationQueueTest, const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/false); - absl::optional confirmation = BuildRewardConfirmation( + std::optional confirmation = BuildRewardConfirmation( &token_generator_mock_, transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); @@ -247,7 +247,7 @@ TEST_F(BraveAdsConfirmationQueueTest, const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/false); - const absl::optional confirmation = + const std::optional confirmation = BuildNonRewardConfirmation(transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); diff --git a/components/brave_ads/core/internal/account/confirmations/queue/confirmation_queue_util.cc b/components/brave_ads/core/internal/account/confirmations/queue/confirmation_queue_util.cc index cc2ce464c08..0226be9a382 100644 --- a/components/brave_ads/core/internal/account/confirmations/queue/confirmation_queue_util.cc +++ b/components/brave_ads/core/internal/account/confirmations/queue/confirmation_queue_util.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/account/confirmations/queue/confirmation_queue_util.h" +#include #include #include @@ -28,7 +29,7 @@ void RebuildConfirmationCallback(const ConfirmationInfo& confirmation, mutable_confirmation.user_data.dynamic = std::move(user_data); if (mutable_confirmation.reward) { - const absl::optional reward_credential_base64url = + const std::optional reward_credential_base64url = BuildRewardCredential(mutable_confirmation); CHECK(reward_credential_base64url); @@ -57,11 +58,11 @@ void RemoveConfirmationQueueItem(const ConfirmationInfo& confirmation) { ConfirmationStateManager::GetInstance().SaveState(); } -absl::optional MaybeGetNextConfirmationQueueItem() { +std::optional MaybeGetNextConfirmationQueueItem() { const ConfirmationList confirmations = ConfirmationStateManager::GetInstance().GetConfirmations(); if (confirmations.empty()) { - return absl::nullopt; + return std::nullopt; } return confirmations.front(); diff --git a/components/brave_ads/core/internal/account/confirmations/queue/confirmation_queue_util.h b/components/brave_ads/core/internal/account/confirmations/queue/confirmation_queue_util.h index 21efe0df351..9b9a5ea06b6 100644 --- a/components/brave_ads/core/internal/account/confirmations/queue/confirmation_queue_util.h +++ b/components/brave_ads/core/internal/account/confirmations/queue/confirmation_queue_util.h @@ -6,8 +6,9 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_CONFIRMATIONS_QUEUE_CONFIRMATION_QUEUE_UTIL_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_CONFIRMATIONS_QUEUE_CONFIRMATION_QUEUE_UTIL_H_ +#include + #include "base/functional/callback_forward.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -19,7 +20,7 @@ using RebuildConfirmationQueueItemCallback = void AddConfirmationQueueItem(const ConfirmationInfo& confirmation); void RemoveConfirmationQueueItem(const ConfirmationInfo& confirmation); -absl::optional MaybeGetNextConfirmationQueueItem(); +std::optional MaybeGetNextConfirmationQueueItem(); void RebuildConfirmationQueueItem( const ConfirmationInfo& confirmation, diff --git a/components/brave_ads/core/internal/account/confirmations/queue/confirmation_queue_util_unittest.cc b/components/brave_ads/core/internal/account/confirmations/queue/confirmation_queue_util_unittest.cc index f520d242dd7..2536b204d42 100644 --- a/components/brave_ads/core/internal/account/confirmations/queue/confirmation_queue_util_unittest.cc +++ b/components/brave_ads/core/internal/account/confirmations/queue/confirmation_queue_util_unittest.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/account/confirmations/queue/confirmation_queue_util.h" +#include + #include "base/test/mock_callback.h" #include "brave/components/brave_ads/core/internal/account/confirmations/confirmation_info.h" #include "brave/components/brave_ads/core/internal/account/confirmations/non_reward/non_reward_confirmation_util.h" @@ -47,7 +49,7 @@ TEST_F(BraveAdsConversionQueueUtilTest, AddRewardConfirmationQueueItem) { const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/true); - const absl::optional confirmation = BuildRewardConfirmation( + const std::optional confirmation = BuildRewardConfirmation( &token_generator_mock_, transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); @@ -72,7 +74,7 @@ TEST_F(BraveAdsConversionQueueUtilTest, const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.0, ConfirmationType::kConversion, /*should_use_random_uuids=*/false); - const absl::optional confirmation = BuildRewardConfirmation( + const std::optional confirmation = BuildRewardConfirmation( &token_generator_mock_, transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); @@ -97,7 +99,7 @@ TEST_F(BraveAdsConversionQueueUtilTest, const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.0, ConfirmationType::kConversion, /*should_use_random_uuids=*/false); - const absl::optional confirmation = BuildRewardConfirmation( + const std::optional confirmation = BuildRewardConfirmation( &token_generator_mock_, transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); @@ -115,7 +117,7 @@ TEST_F(BraveAdsConversionQueueUtilTest, AddNonRewardConfirmationQueueItem) { const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/true); - const absl::optional confirmation = + const std::optional confirmation = BuildNonRewardConfirmation(transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); @@ -138,7 +140,7 @@ TEST_F(BraveAdsConversionQueueUtilTest, const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.0, ConfirmationType::kConversion, /*should_use_random_uuids=*/false); - const absl::optional confirmation = + const std::optional confirmation = BuildNonRewardConfirmation(transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); @@ -161,7 +163,7 @@ TEST_F(BraveAdsConversionQueueUtilTest, const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.0, ConfirmationType::kConversion, /*should_use_random_uuids=*/false); - const absl::optional confirmation = + const std::optional confirmation = BuildNonRewardConfirmation(transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); @@ -181,7 +183,7 @@ TEST_F(BraveAdsConversionQueueUtilTest, RemoveConfirmationQueueItem) { const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/true); - const absl::optional confirmation = BuildRewardConfirmation( + const std::optional confirmation = BuildRewardConfirmation( &token_generator_mock_, transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); @@ -204,7 +206,7 @@ TEST_F(BraveAdsConversionQueueUtilTest, GetRewardConfirmationQueueItem) { const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/true); - const absl::optional confirmation = BuildRewardConfirmation( + const std::optional confirmation = BuildRewardConfirmation( &token_generator_mock_, transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); @@ -221,7 +223,7 @@ TEST_F(BraveAdsConversionQueueUtilTest, GetNonRewardConfirmationQueueItem) { const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/true); - const absl::optional confirmation = + const std::optional confirmation = BuildNonRewardConfirmation(transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); @@ -247,7 +249,7 @@ TEST_F(BraveAdsConversionQueueUtilTest, RebuildRewardConfirmationQueueItem) { const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/true); - const absl::optional confirmation = BuildRewardConfirmation( + const std::optional confirmation = BuildRewardConfirmation( &token_generator_mock_, transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); @@ -264,7 +266,7 @@ TEST_F(BraveAdsConversionQueueUtilTest, RebuildNonRewardConfirmationQueueItem) { const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/true); - const absl::optional confirmation = + const std::optional confirmation = BuildNonRewardConfirmation(transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); diff --git a/components/brave_ads/core/internal/account/confirmations/reward/reward_confirmation_util.cc b/components/brave_ads/core/internal/account/confirmations/reward/reward_confirmation_util.cc index 2362797a7c9..558e5b8ce86 100644 --- a/components/brave_ads/core/internal/account/confirmations/reward/reward_confirmation_util.cc +++ b/components/brave_ads/core/internal/account/confirmations/reward/reward_confirmation_util.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/account/confirmations/reward/reward_confirmation_util.h" +#include #include #include "base/base64url.h" @@ -32,8 +33,8 @@ namespace brave_ads { namespace { -absl::optional BuildReward(TokenGeneratorInterface* token_generator, - const ConfirmationInfo& confirmation) { +std::optional BuildReward(TokenGeneratorInterface* token_generator, + const ConfirmationInfo& confirmation) { CHECK(token_generator); CHECK(IsValid(confirmation)); CHECK(UserHasJoinedBraveRewards()); @@ -52,16 +53,16 @@ absl::optional BuildReward(TokenGeneratorInterface* token_generator, reward.blinded_token = blinded_tokens.front(); // Confirmation token - const absl::optional confirmation_token = + const std::optional confirmation_token = MaybeGetConfirmationToken(); if (!confirmation_token) { BLOG(0, "Failed to get confirmation token"); - return absl::nullopt; + return std::nullopt; } if (!RemoveConfirmationToken(*confirmation_token)) { BLOG(0, "Failed to remove confirmation token"); - return absl::nullopt; + return std::nullopt; } reward.unblinded_token = confirmation_token->unblinded_token; @@ -72,10 +73,10 @@ absl::optional BuildReward(TokenGeneratorInterface* token_generator, ConfirmationInfo mutable_confirmation(confirmation); mutable_confirmation.reward = reward; - const absl::optional reward_credential_base64url = + const std::optional reward_credential_base64url = BuildRewardCredential(mutable_confirmation); if (!reward_credential_base64url) { - return absl::nullopt; + return std::nullopt; } reward.credential_base64url = *reward_credential_base64url; @@ -84,15 +85,15 @@ absl::optional BuildReward(TokenGeneratorInterface* token_generator, } // namespace -absl::optional BuildRewardCredential( +std::optional BuildRewardCredential( const ConfirmationInfo& confirmation) { - const absl::optional reward_credential = + const std::optional reward_credential = json::writer::WriteRewardCredential( confirmation.reward, json::writer::WriteConfirmationPayload(confirmation)); if (!reward_credential) { BLOG(0, "Failed to create reward credential"); - return absl::nullopt; + return std::nullopt; } std::string reward_credential_base64url; @@ -102,7 +103,7 @@ absl::optional BuildRewardCredential( return reward_credential_base64url; } -absl::optional BuildRewardConfirmation( +std::optional BuildRewardConfirmation( TokenGeneratorInterface* token_generator, const TransactionInfo& transaction, const UserDataInfo& user_data) { @@ -118,11 +119,11 @@ absl::optional BuildRewardConfirmation( confirmation.created_at = transaction.created_at; confirmation.user_data = user_data; - const absl::optional reward = + const std::optional reward = BuildReward(token_generator, confirmation); if (!reward) { BLOG(0, "Failed to create reward"); - return absl::nullopt; + return std::nullopt; } confirmation.reward = reward; diff --git a/components/brave_ads/core/internal/account/confirmations/reward/reward_confirmation_util.h b/components/brave_ads/core/internal/account/confirmations/reward/reward_confirmation_util.h index f279eb147a8..d4effc4105d 100644 --- a/components/brave_ads/core/internal/account/confirmations/reward/reward_confirmation_util.h +++ b/components/brave_ads/core/internal/account/confirmations/reward/reward_confirmation_util.h @@ -6,9 +6,9 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_CONFIRMATIONS_REWARD_REWARD_CONFIRMATION_UTIL_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_CONFIRMATIONS_REWARD_REWARD_CONFIRMATION_UTIL_H_ +#include #include -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -17,10 +17,10 @@ struct UserDataInfo; class TokenGeneratorInterface; struct TransactionInfo; -absl::optional BuildRewardCredential( +std::optional BuildRewardCredential( const ConfirmationInfo& confirmation); -absl::optional BuildRewardConfirmation( +std::optional BuildRewardConfirmation( TokenGeneratorInterface* token_generator, const TransactionInfo& transaction, const UserDataInfo& user_data); diff --git a/components/brave_ads/core/internal/account/confirmations/reward/reward_confirmation_util_unittest.cc b/components/brave_ads/core/internal/account/confirmations/reward/reward_confirmation_util_unittest.cc index b4f01507b65..6fe11227216 100644 --- a/components/brave_ads/core/internal/account/confirmations/reward/reward_confirmation_util_unittest.cc +++ b/components/brave_ads/core/internal/account/confirmations/reward/reward_confirmation_util_unittest.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/account/confirmations/reward/reward_confirmation_util.h" +#include + #include "base/strings/string_util.h" #include "base/test/mock_callback.h" #include "base/test/values_test_util.h" @@ -52,7 +54,7 @@ TEST_F(BraveAdsRewardConfirmationUtilTest, BuildRewardCredential) { const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/false); - const absl::optional confirmation = BuildRewardConfirmation( + const std::optional confirmation = BuildRewardConfirmation( &token_generator_mock_, transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); @@ -75,7 +77,7 @@ TEST_F(BraveAdsRewardConfirmationUtilTest, BuildRewardConfirmation) { // Act & Assert base::MockCallback callback; EXPECT_CALL(callback, Run).WillOnce([=](const UserDataInfo& user_data) { - const absl::optional confirmation = + const std::optional confirmation = BuildRewardConfirmation(&token_generator_mock_, transaction, user_data); ASSERT_TRUE(confirmation); diff --git a/components/brave_ads/core/internal/account/confirmations/reward/reward_credential_json_writer.cc b/components/brave_ads/core/internal/account/confirmations/reward/reward_credential_json_writer.cc index 9d6be4ff1c5..c38d9318e48 100644 --- a/components/brave_ads/core/internal/account/confirmations/reward/reward_credential_json_writer.cc +++ b/components/brave_ads/core/internal/account/confirmations/reward/reward_credential_json_writer.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/account/confirmations/reward/reward_credential_json_writer.h" +#include + #include "base/check.h" #include "base/json/json_writer.h" #include "base/values.h" @@ -13,19 +15,19 @@ namespace brave_ads::json::writer { -absl::optional WriteRewardCredential( - const absl::optional& reward, +std::optional WriteRewardCredential( + const std::optional& reward, const std::string& payload) { CHECK(!payload.empty()); if (!reward) { - return absl::nullopt; + return std::nullopt; } - const absl::optional credential = + const std::optional credential = cbr::BuildCredential(reward->unblinded_token, payload); if (!credential) { - return absl::nullopt; + return std::nullopt; } std::string json; diff --git a/components/brave_ads/core/internal/account/confirmations/reward/reward_credential_json_writer.h b/components/brave_ads/core/internal/account/confirmations/reward/reward_credential_json_writer.h index c5158bfb0f5..bd45cbad62e 100644 --- a/components/brave_ads/core/internal/account/confirmations/reward/reward_credential_json_writer.h +++ b/components/brave_ads/core/internal/account/confirmations/reward/reward_credential_json_writer.h @@ -6,9 +6,9 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_CONFIRMATIONS_REWARD_REWARD_CREDENTIAL_JSON_WRITER_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_CONFIRMATIONS_REWARD_REWARD_CREDENTIAL_JSON_WRITER_H_ +#include #include -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -16,8 +16,8 @@ struct RewardInfo; namespace json::writer { -absl::optional WriteRewardCredential( - const absl::optional& reward, +std::optional WriteRewardCredential( + const std::optional& reward, const std::string& payload); } // namespace json::writer diff --git a/components/brave_ads/core/internal/account/confirmations/reward/reward_credential_json_writer_unittest.cc b/components/brave_ads/core/internal/account/confirmations/reward/reward_credential_json_writer_unittest.cc index fd4070b6e68..bad2b4a2f92 100644 --- a/components/brave_ads/core/internal/account/confirmations/reward/reward_credential_json_writer_unittest.cc +++ b/components/brave_ads/core/internal/account/confirmations/reward/reward_credential_json_writer_unittest.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/account/confirmations/reward/reward_credential_json_writer.h" +#include + #include "base/test/values_test_util.h" #include "brave/components/brave_ads/core/internal/account/confirmations/confirmation_info.h" #include "brave/components/brave_ads/core/internal/account/confirmations/reward/reward_confirmation_util.h" @@ -35,12 +37,12 @@ TEST_F(BraveAdsRewardCredentialJsonWriterTest, WriteRewardCredential) { const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/false); - const absl::optional confirmation = BuildRewardConfirmation( + const std::optional confirmation = BuildRewardConfirmation( &token_generator_mock_, transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); // Act - const absl::optional reward_credential = + const std::optional reward_credential = json::writer::WriteRewardCredential( test::BuildReward(*confirmation), /*payload=*/"definition: the weight of a payload"); diff --git a/components/brave_ads/core/internal/account/confirmations/reward/reward_unittest_util.cc b/components/brave_ads/core/internal/account/confirmations/reward/reward_unittest_util.cc index 3f6e01e963d..91af06026af 100644 --- a/components/brave_ads/core/internal/account/confirmations/reward/reward_unittest_util.cc +++ b/components/brave_ads/core/internal/account/confirmations/reward/reward_unittest_util.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/account/confirmations/reward/reward_unittest_util.h" +#include #include #include "base/check.h" @@ -33,7 +34,7 @@ RewardInfo BuildReward(const ConfirmationInfo& confirmation) { reward.signature = R"(+yxJmIDobOZ5DBncIVuzjQEZfIa0+UPrSQhzA5pwEAL9qC4UW7A1H35nKAhVLehJlXnnfMVKV02StVO3fBU5CQ==)"; - const absl::optional reward_credential_base64url = + const std::optional reward_credential_base64url = BuildRewardCredential(confirmation); CHECK(reward_credential_base64url); reward.credential_base64url = *reward_credential_base64url; diff --git a/components/brave_ads/core/internal/account/deposits/cash_deposit.cc b/components/brave_ads/core/internal/account/deposits/cash_deposit.cc index 39f2fc02ffd..869035c2840 100644 --- a/components/brave_ads/core/internal/account/deposits/cash_deposit.cc +++ b/components/brave_ads/core/internal/account/deposits/cash_deposit.cc @@ -5,13 +5,13 @@ #include "brave/components/brave_ads/core/internal/account/deposits/cash_deposit.h" +#include #include #include "base/functional/bind.h" #include "base/functional/callback.h" #include "brave/components/brave_ads/core/internal/account/deposits/deposit_info.h" #include "brave/components/brave_ads/core/internal/account/deposits/deposits_database_table.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -22,7 +22,7 @@ void CashDeposit::GetValue(const std::string& creative_instance_id, creative_instance_id, base::BindOnce( [](GetDepositCallback callback, const bool success, - const absl::optional& deposit) { + const std::optional& deposit) { if (!success) { return std::move(callback).Run(/*success=*/false, /*value=*/0.0); diff --git a/components/brave_ads/core/internal/account/deposits/deposits_database_table.cc b/components/brave_ads/core/internal/account/deposits/deposits_database_table.cc index 690891bcd0e..cc0dbbc96f6 100644 --- a/components/brave_ads/core/internal/account/deposits/deposits_database_table.cc +++ b/components/brave_ads/core/internal/account/deposits/deposits_database_table.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/account/deposits/deposits_database_table.h" +#include #include #include "base/check.h" @@ -86,13 +87,13 @@ void GetForCreativeInstanceIdCallback( mojom::DBCommandResponseInfo::StatusType::RESPONSE_OK) { BLOG(0, "Failed to get deposit value"); return std::move(callback).Run(/*success=*/false, - /*deposit=*/absl::nullopt); + /*deposit=*/std::nullopt); } CHECK(command_response->result); if (command_response->result->get_records().empty()) { - return std::move(callback).Run(/*success=*/true, /*deposit=*/absl::nullopt); + return std::move(callback).Run(/*success=*/true, /*deposit=*/std::nullopt); } const mojom::DBRecordInfoPtr record = @@ -169,7 +170,7 @@ void Deposits::GetForCreativeInstanceId(const std::string& creative_instance_id, GetDepositsCallback callback) const { if (creative_instance_id.empty()) { return std::move(callback).Run(/*success=*/false, - /*deposit=*/absl::nullopt); + /*deposit=*/std::nullopt); } mojom::DBTransactionInfoPtr transaction = mojom::DBTransactionInfo::New(); diff --git a/components/brave_ads/core/internal/account/deposits/deposits_database_table.h b/components/brave_ads/core/internal/account/deposits/deposits_database_table.h index 9ed1ed5c8a2..4d14587ecad 100644 --- a/components/brave_ads/core/internal/account/deposits/deposits_database_table.h +++ b/components/brave_ads/core/internal/account/deposits/deposits_database_table.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_DEPOSITS_DEPOSITS_DATABASE_TABLE_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_DEPOSITS_DEPOSITS_DATABASE_TABLE_H_ +#include #include #include "base/functional/callback_forward.h" @@ -14,13 +15,12 @@ #include "brave/components/brave_ads/core/internal/database/database_table_interface.h" #include "brave/components/brave_ads/core/mojom/brave_ads.mojom-forward.h" #include "brave/components/brave_ads/core/public/client/ads_client_callback.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads::database::table { using GetDepositsCallback = base::OnceCallback& deposit)>; + const std::optional& deposit)>; class Deposits final : public TableInterface { public: diff --git a/components/brave_ads/core/internal/account/issuers/confirmations_issuer_util.cc b/components/brave_ads/core/internal/account/issuers/confirmations_issuer_util.cc index 732f05fbd2d..06a2fa749f0 100644 --- a/components/brave_ads/core/internal/account/issuers/confirmations_issuer_util.cc +++ b/components/brave_ads/core/internal/account/issuers/confirmations_issuer_util.cc @@ -5,17 +5,18 @@ #include "brave/components/brave_ads/core/internal/account/issuers/confirmations_issuer_util.h" +#include + #include "brave/components/brave_ads/core/internal/account/issuers/issuer_info.h" #include "brave/components/brave_ads/core/internal/account/issuers/issuer_types.h" #include "brave/components/brave_ads/core/internal/account/issuers/issuers_feature.h" #include "brave/components/brave_ads/core/internal/account/issuers/issuers_info.h" #include "brave/components/brave_ads/core/internal/account/issuers/issuers_util.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { bool IsConfirmationsIssuerValid(const IssuersInfo& issuers) { - const absl::optional confirmations_issuer = + const std::optional confirmations_issuer = GetIssuerForType(issuers, IssuerType::kConfirmations); if (!confirmations_issuer) { return false; diff --git a/components/brave_ads/core/internal/account/issuers/issuers_url_request.cc b/components/brave_ads/core/internal/account/issuers/issuers_url_request.cc index 06d3e7a6d14..970786fde94 100644 --- a/components/brave_ads/core/internal/account/issuers/issuers_url_request.cc +++ b/components/brave_ads/core/internal/account/issuers/issuers_url_request.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/account/issuers/issuers_url_request.h" +#include #include #include "base/functional/bind.h" @@ -22,7 +23,6 @@ #include "brave/components/brave_ads/core/mojom/brave_ads.mojom.h" #include "brave/components/brave_ads/core/public/prefs/pref_names.h" #include "net/http/http_status_code.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -92,7 +92,7 @@ void IssuersUrlRequest::FetchCallback( } BLOG(1, "Parsing issuers"); - const absl::optional issuers = + const std::optional issuers = json::reader::ReadIssuers(url_response.body); if (!issuers) { BLOG(3, "Failed to parse issuers"); diff --git a/components/brave_ads/core/internal/account/issuers/issuers_url_request_json_reader.cc b/components/brave_ads/core/internal/account/issuers/issuers_url_request_json_reader.cc index 4f5b794e13f..70eea33d7c1 100644 --- a/components/brave_ads/core/internal/account/issuers/issuers_url_request_json_reader.cc +++ b/components/brave_ads/core/internal/account/issuers/issuers_url_request_json_reader.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/account/issuers/issuers_url_request_json_reader.h" +#include + #include "base/json/json_reader.h" #include "base/values.h" #include "brave/components/brave_ads/core/internal/account/issuers/issuer_info.h" @@ -13,21 +15,21 @@ namespace brave_ads::json::reader { -absl::optional ReadIssuers(const std::string& json) { - const absl::optional dict = +std::optional ReadIssuers(const std::string& json) { + const std::optional dict = base::JSONReader::ReadDict(json); if (!dict) { - return absl::nullopt; + return std::nullopt; } - const absl::optional ping = ParsePing(*dict); + const std::optional ping = ParsePing(*dict); if (!ping) { - return absl::nullopt; + return std::nullopt; } - const absl::optional issuers = ParseIssuers(*dict); + const std::optional issuers = ParseIssuers(*dict); if (!issuers) { - return absl::nullopt; + return std::nullopt; } IssuersInfo new_issuers; diff --git a/components/brave_ads/core/internal/account/issuers/issuers_url_request_json_reader.h b/components/brave_ads/core/internal/account/issuers/issuers_url_request_json_reader.h index 5f473d4cc0f..6000b18212f 100644 --- a/components/brave_ads/core/internal/account/issuers/issuers_url_request_json_reader.h +++ b/components/brave_ads/core/internal/account/issuers/issuers_url_request_json_reader.h @@ -6,9 +6,9 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_ISSUERS_ISSUERS_URL_REQUEST_JSON_READER_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_ISSUERS_ISSUERS_URL_REQUEST_JSON_READER_H_ +#include #include -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -16,7 +16,7 @@ struct IssuersInfo; namespace json::reader { -absl::optional ReadIssuers(const std::string& json); +std::optional ReadIssuers(const std::string& json); } // namespace json::reader } // namespace brave_ads diff --git a/components/brave_ads/core/internal/account/issuers/issuers_url_request_json_reader_util.cc b/components/brave_ads/core/internal/account/issuers/issuers_url_request_json_reader_util.cc index d6d0e732636..7b71a275e04 100644 --- a/components/brave_ads/core/internal/account/issuers/issuers_url_request_json_reader_util.cc +++ b/components/brave_ads/core/internal/account/issuers/issuers_url_request_json_reader_util.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/account/issuers/issuers_url_request_json_reader_util.h" +#include + #include "brave/components/brave_ads/core/internal/account/issuers/issuers_value_util.h" namespace brave_ads::json::reader { @@ -16,14 +18,14 @@ constexpr char kIssuersKey[] = "issuers"; } // namespace -absl::optional ParsePing(const base::Value::Dict& dict) { +std::optional ParsePing(const base::Value::Dict& dict) { return dict.FindInt(kPingKey); } -absl::optional ParseIssuers(const base::Value::Dict& dict) { +std::optional ParseIssuers(const base::Value::Dict& dict) { const auto* const list = dict.FindList(kIssuersKey); if (!list) { - return absl::nullopt; + return std::nullopt; } return ValueToIssuers(*list); diff --git a/components/brave_ads/core/internal/account/issuers/issuers_url_request_json_reader_util.h b/components/brave_ads/core/internal/account/issuers/issuers_url_request_json_reader_util.h index f6795e63e6f..82ef084a10f 100644 --- a/components/brave_ads/core/internal/account/issuers/issuers_url_request_json_reader_util.h +++ b/components/brave_ads/core/internal/account/issuers/issuers_url_request_json_reader_util.h @@ -6,14 +6,15 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_ISSUERS_ISSUERS_URL_REQUEST_JSON_READER_UTIL_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_ISSUERS_ISSUERS_URL_REQUEST_JSON_READER_UTIL_H_ +#include + #include "base/values.h" #include "brave/components/brave_ads/core/internal/account/issuers/issuer_info.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads::json::reader { -absl::optional ParsePing(const base::Value::Dict& dict); -absl::optional ParseIssuers(const base::Value::Dict& dict); +std::optional ParsePing(const base::Value::Dict& dict); +std::optional ParseIssuers(const base::Value::Dict& dict); } // namespace brave_ads::json::reader diff --git a/components/brave_ads/core/internal/account/issuers/issuers_url_request_unittest.cc b/components/brave_ads/core/internal/account/issuers/issuers_url_request_unittest.cc index 19918f31f86..bcdfe07d209 100644 --- a/components/brave_ads/core/internal/account/issuers/issuers_url_request_unittest.cc +++ b/components/brave_ads/core/internal/account/issuers/issuers_url_request_unittest.cc @@ -15,7 +15,6 @@ #include "brave/components/brave_ads/core/internal/common/unittest/unittest_base.h" #include "brave/components/brave_ads/core/internal/common/unittest/unittest_mock_util.h" #include "net/http/http_status_code.h" -#include "third_party/abseil-cpp/absl/types/optional.h" // npm run test -- brave_unit_tests --filter=BraveAds* diff --git a/components/brave_ads/core/internal/account/issuers/issuers_util.cc b/components/brave_ads/core/internal/account/issuers/issuers_util.cc index bb4df3c8632..c9c9c458e51 100644 --- a/components/brave_ads/core/internal/account/issuers/issuers_util.cc +++ b/components/brave_ads/core/internal/account/issuers/issuers_util.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/account/issuers/issuers_util.h" +#include + #include "base/ranges/algorithm.h" #include "brave/components/brave_ads/core/internal/account/issuers/confirmations_issuer_util.h" #include "brave/components/brave_ads/core/internal/account/issuers/issuer_info.h" @@ -24,16 +26,16 @@ void SetIssuers(const IssuersInfo& issuers) { SetProfileListPref(prefs::kIssuers, IssuersToValue(issuers.issuers)); } -absl::optional GetIssuers() { - const absl::optional list = +std::optional GetIssuers() { + const std::optional list = GetProfileListPref(prefs::kIssuers); if (!list || list->empty()) { - return absl::nullopt; + return std::nullopt; } - const absl::optional issuer = ValueToIssuers(*list); + const std::optional issuer = ValueToIssuers(*list); if (!issuer) { - return absl::nullopt; + return std::nullopt; } IssuersInfo issuers; @@ -58,7 +60,7 @@ bool HasIssuers() { } bool HasIssuersChanged(const IssuersInfo& other) { - const absl::optional issuers = GetIssuers(); + const std::optional issuers = GetIssuers(); if (!issuers) { return true; } @@ -67,7 +69,7 @@ bool HasIssuersChanged(const IssuersInfo& other) { } bool IssuerExistsForType(const IssuerType issuer_type) { - const absl::optional issuers = GetIssuers(); + const std::optional issuers = GetIssuers(); if (!issuers) { return false; } @@ -75,12 +77,12 @@ bool IssuerExistsForType(const IssuerType issuer_type) { return !!GetIssuerForType(*issuers, issuer_type); } -absl::optional GetIssuerForType(const IssuersInfo& issuers, - const IssuerType issuer_type) { +std::optional GetIssuerForType(const IssuersInfo& issuers, + const IssuerType issuer_type) { const auto iter = base::ranges::find(issuers.issuers, issuer_type, &IssuerInfo::type); if (iter == issuers.issuers.cend()) { - return absl::nullopt; + return std::nullopt; } return *iter; @@ -88,12 +90,12 @@ absl::optional GetIssuerForType(const IssuersInfo& issuers, bool PublicKeyExistsForIssuerType(const IssuerType issuer_type, const cbr::PublicKey& public_key) { - const absl::optional issuers = GetIssuers(); + const std::optional issuers = GetIssuers(); if (!issuers) { return false; } - const absl::optional issuer = + const std::optional issuer = GetIssuerForType(*issuers, issuer_type); if (!issuer) { return false; diff --git a/components/brave_ads/core/internal/account/issuers/issuers_util.h b/components/brave_ads/core/internal/account/issuers/issuers_util.h index 2e3dfa8a0c0..e7d29bb217e 100644 --- a/components/brave_ads/core/internal/account/issuers/issuers_util.h +++ b/components/brave_ads/core/internal/account/issuers/issuers_util.h @@ -6,8 +6,9 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_ISSUERS_ISSUERS_UTIL_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_ISSUERS_ISSUERS_UTIL_H_ +#include + #include "brave/components/brave_ads/core/internal/account/issuers/issuer_types.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -19,7 +20,7 @@ class PublicKey; } // namespace cbr void SetIssuers(const IssuersInfo& issuers); -absl::optional GetIssuers(); +std::optional GetIssuers(); void ResetIssuers(); bool IsIssuersValid(const IssuersInfo& issuers); @@ -28,8 +29,8 @@ bool HasIssuers(); bool HasIssuersChanged(const IssuersInfo& other); bool IssuerExistsForType(IssuerType issuer_type); -absl::optional GetIssuerForType(const IssuersInfo& issuers, - IssuerType issuer_type); +std::optional GetIssuerForType(const IssuersInfo& issuers, + IssuerType issuer_type); bool PublicKeyExistsForIssuerType(IssuerType issuer_type, const cbr::PublicKey& public_key); diff --git a/components/brave_ads/core/internal/account/issuers/issuers_value_util.cc b/components/brave_ads/core/internal/account/issuers/issuers_value_util.cc index 6d5fa16755b..3f4ca0cd231 100644 --- a/components/brave_ads/core/internal/account/issuers/issuers_value_util.cc +++ b/components/brave_ads/core/internal/account/issuers/issuers_value_util.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/account/issuers/issuers_value_util.h" +#include #include #include @@ -13,7 +14,6 @@ #include "base/strings/string_number_conversions.h" #include "brave/components/brave_ads/core/internal/account/issuers/issuer_types.h" #include "brave/components/brave_ads/core/internal/account/issuers/public_key_alias.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -28,10 +28,10 @@ constexpr char kUndefinedName[] = ""; constexpr char kConfirmationsName[] = "confirmations"; constexpr char kPaymentsName[] = "payments"; -absl::optional GetNameForIssuerType(const IssuerType type) { +std::optional GetNameForIssuerType(const IssuerType type) { switch (type) { case IssuerType::kUndefined: { - return absl::nullopt; + return std::nullopt; } case IssuerType::kConfirmations: { @@ -47,10 +47,10 @@ absl::optional GetNameForIssuerType(const IssuerType type) { << static_cast(type); } -absl::optional ParseIssuerType(const base::Value::Dict& dict) { +std::optional ParseIssuerType(const base::Value::Dict& dict) { const std::string* const name = dict.FindString(kNameKey); if (!name) { - return absl::nullopt; + return std::nullopt; } if (*name == kUndefinedName) { @@ -65,31 +65,31 @@ absl::optional ParseIssuerType(const base::Value::Dict& dict) { return IssuerType::kPayments; } - return absl::nullopt; + return std::nullopt; } -absl::optional ParsePublicKeys(const base::Value::Dict& dict) { +std::optional ParsePublicKeys(const base::Value::Dict& dict) { const auto* const public_keys_list = dict.FindList(kPublicKeysKey); if (!public_keys_list) { - return absl::nullopt; + return std::nullopt; } PublicKeyMap public_keys; for (const auto& item : *public_keys_list) { const auto* const item_dict = item.GetIfDict(); if (!item_dict) { - return absl::nullopt; + return std::nullopt; } const std::string* const public_key = item_dict->FindString(kPublicKeyKey); if (!public_key) { - return absl::nullopt; + return std::nullopt; } const std::string* const associated_value = item_dict->FindString(kAssociatedValueKey); if (!associated_value) { - return absl::nullopt; + return std::nullopt; } double associated_value_as_double; if (!base::StringToDouble(*associated_value, &associated_value_as_double)) { @@ -112,7 +112,7 @@ base::Value::List IssuersToValue(const IssuerList& issuers) { base::Value::List list; for (const auto& issuer : issuers) { - const absl::optional name = GetNameForIssuerType(issuer.type); + const std::optional name = GetNameForIssuerType(issuer.type); if (!name) { continue; } @@ -133,7 +133,7 @@ base::Value::List IssuersToValue(const IssuerList& issuers) { return list; } -absl::optional ValueToIssuers(const base::Value::List& list) { +std::optional ValueToIssuers(const base::Value::List& list) { IssuerList issuers; for (const auto& item : list) { @@ -142,16 +142,15 @@ absl::optional ValueToIssuers(const base::Value::List& list) { continue; } - const absl::optional issuer_type = ParseIssuerType(*item_dict); + const std::optional issuer_type = ParseIssuerType(*item_dict); if (!issuer_type) { - return absl::nullopt; + return std::nullopt; } CHECK_NE(IssuerType::kUndefined, *issuer_type); - const absl::optional public_keys = - ParsePublicKeys(*item_dict); + const std::optional public_keys = ParsePublicKeys(*item_dict); if (!public_keys) { - return absl::nullopt; + return std::nullopt; } IssuerInfo issuer; diff --git a/components/brave_ads/core/internal/account/issuers/issuers_value_util.h b/components/brave_ads/core/internal/account/issuers/issuers_value_util.h index b5d2995d712..721db0ea02b 100644 --- a/components/brave_ads/core/internal/account/issuers/issuers_value_util.h +++ b/components/brave_ads/core/internal/account/issuers/issuers_value_util.h @@ -6,13 +6,15 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_ISSUERS_ISSUERS_VALUE_UTIL_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_ISSUERS_ISSUERS_VALUE_UTIL_H_ +#include + #include "base/values.h" #include "brave/components/brave_ads/core/internal/account/issuers/issuer_info.h" namespace brave_ads { base::Value::List IssuersToValue(const IssuerList& issuers); -absl::optional ValueToIssuers(const base::Value::List& list); +std::optional ValueToIssuers(const base::Value::List& list); } // namespace brave_ads diff --git a/components/brave_ads/core/internal/account/issuers/payments_issuer_util.cc b/components/brave_ads/core/internal/account/issuers/payments_issuer_util.cc index 6f3739d3730..c2630e3ba50 100644 --- a/components/brave_ads/core/internal/account/issuers/payments_issuer_util.cc +++ b/components/brave_ads/core/internal/account/issuers/payments_issuer_util.cc @@ -5,18 +5,19 @@ #include "brave/components/brave_ads/core/internal/account/issuers/payments_issuer_util.h" +#include + #include "base/containers/flat_map.h" #include "brave/components/brave_ads/core/internal/account/issuers/issuer_info.h" #include "brave/components/brave_ads/core/internal/account/issuers/issuer_types.h" #include "brave/components/brave_ads/core/internal/account/issuers/issuers_feature.h" #include "brave/components/brave_ads/core/internal/account/issuers/issuers_info.h" #include "brave/components/brave_ads/core/internal/account/issuers/issuers_util.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { bool IsPaymentsIssuerValid(const IssuersInfo& issuers) { - const absl::optional payments_issuer = + const std::optional payments_issuer = GetIssuerForType(issuers, IssuerType::kPayments); if (!payments_issuer) { return false; diff --git a/components/brave_ads/core/internal/account/issuers/public_key_util.cc b/components/brave_ads/core/internal/account/issuers/public_key_util.cc index 5129c7d07d3..eef88f3915a 100644 --- a/components/brave_ads/core/internal/account/issuers/public_key_util.cc +++ b/components/brave_ads/core/internal/account/issuers/public_key_util.cc @@ -5,18 +5,18 @@ #include "brave/components/brave_ads/core/internal/account/issuers/public_key_util.h" +#include #include #include "base/containers/contains.h" #include "brave/components/brave_ads/core/internal/account/issuers/issuer_info.h" #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/public_key.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { bool PublicKeyExists(const IssuerInfo& issuer, const cbr::PublicKey& public_key) { - const absl::optional public_key_base64 = + const std::optional public_key_base64 = public_key.EncodeBase64(); if (!public_key_base64) { return false; diff --git a/components/brave_ads/core/internal/account/tokens/confirmation_tokens/confirmation_tokens_unittest_util.cc b/components/brave_ads/core/internal/account/tokens/confirmation_tokens/confirmation_tokens_unittest_util.cc index b7e7f16c79b..094ccbebd6b 100644 --- a/components/brave_ads/core/internal/account/tokens/confirmation_tokens/confirmation_tokens_unittest_util.cc +++ b/components/brave_ads/core/internal/account/tokens/confirmation_tokens/confirmation_tokens_unittest_util.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/account/tokens/confirmation_tokens/confirmation_tokens_unittest_util.h" +#include #include #include @@ -33,7 +34,7 @@ ConfirmationTokenInfo BuildConfirmationToken( confirmation_token.public_key = cbr::PublicKey("RJ2i/o/pZkrH+i0aGEMY1G9FXtd7Q7gfRi3YdNRnDDk="); - const absl::optional signature = + const std::optional signature = crypto::Sign(unblinded_token_base64, wallet.secret_key); CHECK(signature); confirmation_token.signature = *signature; diff --git a/components/brave_ads/core/internal/account/tokens/confirmation_tokens/confirmation_tokens_util.cc b/components/brave_ads/core/internal/account/tokens/confirmation_tokens/confirmation_tokens_util.cc index a1f6cc72e98..4e64c8b7fb9 100644 --- a/components/brave_ads/core/internal/account/tokens/confirmation_tokens/confirmation_tokens_util.cc +++ b/components/brave_ads/core/internal/account/tokens/confirmation_tokens/confirmation_tokens_util.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/account/tokens/confirmation_tokens/confirmation_tokens_util.h" +#include + #include "brave/components/brave_ads/core/internal/account/tokens/confirmation_tokens/confirmation_tokens.h" #include "brave/components/brave_ads/core/internal/deprecated/confirmations/confirmation_state_manager.h" @@ -18,9 +20,9 @@ bool HasConfirmationTokens() { } // namespace -absl::optional MaybeGetConfirmationToken() { +std::optional MaybeGetConfirmationToken() { if (!HasConfirmationTokens()) { - return absl::nullopt; + return std::nullopt; } return ConfirmationStateManager::GetInstance() diff --git a/components/brave_ads/core/internal/account/tokens/confirmation_tokens/confirmation_tokens_util.h b/components/brave_ads/core/internal/account/tokens/confirmation_tokens/confirmation_tokens_util.h index e1719357464..9cb5da9a2be 100644 --- a/components/brave_ads/core/internal/account/tokens/confirmation_tokens/confirmation_tokens_util.h +++ b/components/brave_ads/core/internal/account/tokens/confirmation_tokens/confirmation_tokens_util.h @@ -6,12 +6,13 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_TOKENS_CONFIRMATION_TOKENS_CONFIRMATION_TOKENS_UTIL_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_TOKENS_CONFIRMATION_TOKENS_CONFIRMATION_TOKENS_UTIL_H_ +#include + #include "brave/components/brave_ads/core/internal/account/tokens/confirmation_tokens/confirmation_token_info.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { -absl::optional MaybeGetConfirmationToken(); +std::optional MaybeGetConfirmationToken(); void AddConfirmationTokens(const ConfirmationTokenList& confirmation_tokens); diff --git a/components/brave_ads/core/internal/account/tokens/confirmation_tokens/confirmation_tokens_value_util.cc b/components/brave_ads/core/internal/account/tokens/confirmation_tokens/confirmation_tokens_value_util.cc index 8ebf8224179..387a0ef3683 100644 --- a/components/brave_ads/core/internal/account/tokens/confirmation_tokens/confirmation_tokens_value_util.cc +++ b/components/brave_ads/core/internal/account/tokens/confirmation_tokens/confirmation_tokens_value_util.cc @@ -5,11 +5,11 @@ #include "brave/components/brave_ads/core/internal/account/tokens/confirmation_tokens/confirmation_tokens_value_util.h" +#include #include #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/unblinded_token.h" #include "brave/components/brave_ads/core/internal/common/logging_util.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -26,13 +26,13 @@ base::Value::List ConfirmationTokensToValue( base::Value::List list; for (const auto& confirmation_token : confirmation_tokens) { - const absl::optional unblinded_token_base64 = + const std::optional unblinded_token_base64 = confirmation_token.unblinded_token.EncodeBase64(); if (!unblinded_token_base64) { continue; } - const absl::optional public_key_base64 = + const std::optional public_key_base64 = confirmation_token.public_key.EncodeBase64(); if (!public_key_base64) { continue; diff --git a/components/brave_ads/core/internal/account/tokens/payment_tokens/payment_token_util.cc b/components/brave_ads/core/internal/account/tokens/payment_tokens/payment_token_util.cc index 97e44b93133..26b8d2b4826 100644 --- a/components/brave_ads/core/internal/account/tokens/payment_tokens/payment_token_util.cc +++ b/components/brave_ads/core/internal/account/tokens/payment_tokens/payment_token_util.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/account/tokens/payment_tokens/payment_token_util.h" +#include + #include "brave/components/brave_ads/core/internal/account/tokens/payment_tokens/payment_tokens.h" #include "brave/components/brave_ads/core/internal/deprecated/confirmations/confirmation_state_manager.h" @@ -18,9 +20,9 @@ bool HasPaymentTokens() { } // namespace -absl::optional MaybeGetPaymentToken() { +std::optional MaybeGetPaymentToken() { if (!HasPaymentTokens()) { - return absl::nullopt; + return std::nullopt; } return ConfirmationStateManager::GetInstance().GetPaymentTokens().GetToken(); diff --git a/components/brave_ads/core/internal/account/tokens/payment_tokens/payment_token_util.h b/components/brave_ads/core/internal/account/tokens/payment_tokens/payment_token_util.h index 0f60dad838e..3d4af54e748 100644 --- a/components/brave_ads/core/internal/account/tokens/payment_tokens/payment_token_util.h +++ b/components/brave_ads/core/internal/account/tokens/payment_tokens/payment_token_util.h @@ -6,12 +6,13 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_TOKENS_PAYMENT_TOKENS_PAYMENT_TOKEN_UTIL_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_TOKENS_PAYMENT_TOKENS_PAYMENT_TOKEN_UTIL_H_ +#include + #include "brave/components/brave_ads/core/internal/account/tokens/payment_tokens/payment_token_info.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { -absl::optional MaybeGetPaymentToken(); +std::optional MaybeGetPaymentToken(); const PaymentTokenList& GetAllPaymentTokens(); diff --git a/components/brave_ads/core/internal/account/tokens/payment_tokens/payment_token_value_util.cc b/components/brave_ads/core/internal/account/tokens/payment_tokens/payment_token_value_util.cc index bc07f33e1bd..a4a7588e793 100644 --- a/components/brave_ads/core/internal/account/tokens/payment_tokens/payment_token_value_util.cc +++ b/components/brave_ads/core/internal/account/tokens/payment_tokens/payment_token_value_util.cc @@ -5,12 +5,12 @@ #include "brave/components/brave_ads/core/internal/account/tokens/payment_tokens/payment_token_value_util.h" +#include #include #include "base/uuid.h" #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/unblinded_token.h" #include "brave/components/brave_ads/core/internal/common/logging_util.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -28,13 +28,13 @@ base::Value::List PaymentTokensToValue(const PaymentTokenList& payment_tokens) { base::Value::List list; for (const auto& payment_token : payment_tokens) { - const absl::optional unblinded_token_base64 = + const std::optional unblinded_token_base64 = payment_token.unblinded_token.EncodeBase64(); if (!unblinded_token_base64) { continue; } - const absl::optional public_key_base64 = + const std::optional public_key_base64 = payment_token.public_key.EncodeBase64(); if (!public_key_base64) { continue; diff --git a/components/brave_ads/core/internal/account/user_data/fixed/conversion_user_data.cc b/components/brave_ads/core/internal/account/user_data/fixed/conversion_user_data.cc index 1d0c4ea1cc0..87f7f2944ea 100644 --- a/components/brave_ads/core/internal/account/user_data/fixed/conversion_user_data.cc +++ b/components/brave_ads/core/internal/account/user_data/fixed/conversion_user_data.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/account/user_data/fixed/conversion_user_data.h" +#include #include #include "base/check.h" @@ -14,7 +15,6 @@ #include "brave/components/brave_ads/core/internal/account/user_data/fixed/conversion_user_data_util.h" #include "brave/components/brave_ads/core/internal/conversions/queue/conversion_queue_database_table.h" #include "brave/components/brave_ads/core/internal/conversions/queue/queue_item/conversion_queue_item_info.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -47,7 +47,7 @@ void BuildConversionUserData(const std::string& creative_instance_id, BuildConversionActionTypeUserData(conversion_queue_item)); // Verifiable conversion. - absl::optional verifiable_conversion_user_data = + std::optional verifiable_conversion_user_data = MaybeBuildVerifiableConversionUserData(conversion_queue_item); if (verifiable_conversion_user_data) { list.Append(std::move(*verifiable_conversion_user_data)); diff --git a/components/brave_ads/core/internal/account/user_data/fixed/conversion_user_data_util.cc b/components/brave_ads/core/internal/account/user_data/fixed/conversion_user_data_util.cc index 4ffbbedcd59..f4447ff7642 100644 --- a/components/brave_ads/core/internal/account/user_data/fixed/conversion_user_data_util.cc +++ b/components/brave_ads/core/internal/account/user_data/fixed/conversion_user_data_util.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/account/user_data/fixed/conversion_user_data_util.h" +#include + #include "base/check.h" #include "brave/components/brave_ads/core/internal/account/user_data/fixed/conversion_user_data_constants.h" #include "brave/components/brave_ads/core/internal/common/logging_util.h" @@ -14,7 +16,6 @@ #include "brave/components/brave_ads/core/internal/conversions/types/verifiable_conversion/envelope/verifiable_conversion_envelope_info.h" #include "brave/components/brave_ads/core/internal/conversions/types/verifiable_conversion/envelope/verifiable_conversion_envelope_util.h" #include "brave/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_info.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -29,16 +30,16 @@ base::Value::Dict BuildConversionActionTypeUserData( conversion_queue_item.conversion.action_type)); } -absl::optional MaybeBuildVerifiableConversionUserData( +std::optional MaybeBuildVerifiableConversionUserData( const ConversionQueueItemInfo& conversion_queue_item) { if (!conversion_queue_item.conversion.verifiable) { - return absl::nullopt; + return std::nullopt; } const VerifiableConversionInfo verifiable_conversion = *conversion_queue_item.conversion.verifiable; - const absl::optional + const std::optional sealed_verifiable_conversion_envelope = SealVerifiableConversionEnvelope(verifiable_conversion); if (!sealed_verifiable_conversion_envelope) { @@ -46,7 +47,7 @@ absl::optional MaybeBuildVerifiableConversionUserData( << verifiable_conversion.id << " and " << verifiable_conversion.advertiser_public_key_base64 << " advertiser public key"); - return absl::nullopt; + return std::nullopt; } return base::Value::Dict().Set( diff --git a/components/brave_ads/core/internal/account/user_data/fixed/conversion_user_data_util.h b/components/brave_ads/core/internal/account/user_data/fixed/conversion_user_data_util.h index 6a8fb85558e..c141a3f192e 100644 --- a/components/brave_ads/core/internal/account/user_data/fixed/conversion_user_data_util.h +++ b/components/brave_ads/core/internal/account/user_data/fixed/conversion_user_data_util.h @@ -6,8 +6,9 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_USER_DATA_FIXED_CONVERSION_USER_DATA_UTIL_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_USER_DATA_FIXED_CONVERSION_USER_DATA_UTIL_H_ +#include + #include "base/values.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -16,7 +17,7 @@ struct ConversionQueueItemInfo; base::Value::Dict BuildConversionActionTypeUserData( const ConversionQueueItemInfo& conversion_queue_item); -absl::optional MaybeBuildVerifiableConversionUserData( +std::optional MaybeBuildVerifiableConversionUserData( const ConversionQueueItemInfo& conversion_queue_item); } // namespace brave_ads diff --git a/components/brave_ads/core/internal/account/user_data/fixed/conversion_user_data_util_unittest.cc b/components/brave_ads/core/internal/account/user_data/fixed/conversion_user_data_util_unittest.cc index 2c988e09cb6..d760a7bd119 100644 --- a/components/brave_ads/core/internal/account/user_data/fixed/conversion_user_data_util_unittest.cc +++ b/components/brave_ads/core/internal/account/user_data/fixed/conversion_user_data_util_unittest.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/account/user_data/fixed/conversion_user_data_util.h" +#include #include #include "base/json/json_writer.h" @@ -43,7 +44,7 @@ TEST_F(BraveAdsConversionUserDataUtilTest, BuildVerifiableConversionUserData) { /*process_at=*/Now()); // Act - const absl::optional user_data = + const std::optional user_data = MaybeBuildVerifiableConversionUserData(conversion_queue_item); ASSERT_TRUE(user_data); @@ -63,7 +64,7 @@ TEST_F(BraveAdsConversionUserDataUtilTest, const ConversionInfo conversion = BuildConversion(BuildAdEvent(ad, ConfirmationType::kViewed, /*created_at=*/Now()), - /*verifiable_conversion=*/absl::nullopt); + /*verifiable_conversion=*/std::nullopt); const ConversionQueueItemInfo conversion_queue_item = BuildConversionQueueItem(conversion, /*process_at=*/Now()); @@ -79,7 +80,7 @@ TEST_F(BraveAdsConversionUserDataUtilTest, BuildConversionActionTypeUserData) { const ConversionInfo conversion = BuildConversion(BuildAdEvent(ad, ConfirmationType::kViewed, /*created_at=*/Now()), - /*verifiable_conversion=*/absl::nullopt); + /*verifiable_conversion=*/std::nullopt); const ConversionQueueItemInfo conversion_queue_item = BuildConversionQueueItem(conversion, /*process_at=*/Now()); diff --git a/components/brave_ads/core/internal/account/user_data/fixed/rotating_hash_user_data.cc b/components/brave_ads/core/internal/account/user_data/fixed/rotating_hash_user_data.cc index 0afd878d609..06613de161f 100644 --- a/components/brave_ads/core/internal/account/user_data/fixed/rotating_hash_user_data.cc +++ b/components/brave_ads/core/internal/account/user_data/fixed/rotating_hash_user_data.cc @@ -5,12 +5,12 @@ #include "brave/components/brave_ads/core/internal/account/user_data/fixed/rotating_hash_user_data.h" +#include #include #include "brave/components/brave_ads/core/internal/account/transactions/transaction_info.h" #include "brave/components/brave_ads/core/internal/account/user_data/fixed/rotating_hash_user_data_util.h" #include "brave/components/brave_ads/core/internal/settings/settings.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -26,7 +26,7 @@ base::Value::Dict BuildRotatingHashUserData( return user_data; } - const absl::optional rotating_hash = + const std::optional rotating_hash = BuildRotatingHash(transaction); if (rotating_hash) { user_data.Set(kRotatingHashKey, *rotating_hash); diff --git a/components/brave_ads/core/internal/account/user_data/fixed/rotating_hash_user_data_util.cc b/components/brave_ads/core/internal/account/user_data/fixed/rotating_hash_user_data_util.cc index d39a6220b79..42df2f5c0f8 100644 --- a/components/brave_ads/core/internal/account/user_data/fixed/rotating_hash_user_data_util.cc +++ b/components/brave_ads/core/internal/account/user_data/fixed/rotating_hash_user_data_util.cc @@ -7,6 +7,7 @@ #include #include +#include #include "base/base64.h" #include "base/strings/stringprintf.h" @@ -17,12 +18,12 @@ namespace brave_ads { -absl::optional BuildRotatingHash( +std::optional BuildRotatingHash( const TransactionInfo& transaction) { const std::string& device_id = GlobalState::GetInstance()->SysInfo().device_id; if (device_id.empty()) { - return absl::nullopt; + return std::nullopt; } const int64_t timestamp_rounded_down_to_nearest_hour = diff --git a/components/brave_ads/core/internal/account/user_data/fixed/rotating_hash_user_data_util.h b/components/brave_ads/core/internal/account/user_data/fixed/rotating_hash_user_data_util.h index 5d7ce53ffbe..b52568aa84c 100644 --- a/components/brave_ads/core/internal/account/user_data/fixed/rotating_hash_user_data_util.h +++ b/components/brave_ads/core/internal/account/user_data/fixed/rotating_hash_user_data_util.h @@ -6,15 +6,15 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_USER_DATA_FIXED_ROTATING_HASH_USER_DATA_UTIL_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_USER_DATA_FIXED_ROTATING_HASH_USER_DATA_UTIL_H_ +#include #include -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { struct TransactionInfo; -absl::optional BuildRotatingHash( +std::optional BuildRotatingHash( const TransactionInfo& transaction); } // namespace brave_ads diff --git a/components/brave_ads/core/internal/account/user_data/fixed/rotating_hash_user_data_util_unittest.cc b/components/brave_ads/core/internal/account/user_data/fixed/rotating_hash_user_data_util_unittest.cc index db2ba77e189..36fd3518bcd 100644 --- a/components/brave_ads/core/internal/account/user_data/fixed/rotating_hash_user_data_util_unittest.cc +++ b/components/brave_ads/core/internal/account/user_data/fixed/rotating_hash_user_data_util_unittest.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/account/user_data/fixed/rotating_hash_user_data_util.h" +#include + #include "brave/components/brave_ads/core/internal/account/transactions/transaction_info.h" #include "brave/components/brave_ads/core/internal/account/transactions/transactions_unittest_util.h" #include "brave/components/brave_ads/core/internal/common/unittest/unittest_base.h" @@ -56,7 +58,7 @@ TEST_F(BraveAdsRotatingHashUserDataUtilTest, AdvanceClockTo(TimeFromString("2 June 2022 11:00", /*is_local=*/false)); - const absl::optional rotating_hash_before = + const std::optional rotating_hash_before = BuildRotatingHash(transaction); EXPECT_TRUE(rotating_hash_before); @@ -77,7 +79,7 @@ TEST_F(BraveAdsRotatingHashUserDataUtilTest, AdvanceClockTo(TimeFromString("2 June 2022 11:00", /*is_local=*/false)); - const absl::optional rotating_hash_before = + const std::optional rotating_hash_before = BuildRotatingHash(transaction); EXPECT_TRUE(rotating_hash_before); @@ -96,7 +98,7 @@ TEST_F(BraveAdsRotatingHashUserDataUtilTest, /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/false); - const absl::optional rotating_hash_before = + const std::optional rotating_hash_before = BuildRotatingHash(transaction); EXPECT_TRUE(rotating_hash_before); diff --git a/components/brave_ads/core/internal/account/user_data/fixed/top_segment_user_data.cc b/components/brave_ads/core/internal/account/user_data/fixed/top_segment_user_data.cc index 34608f2c0ed..0616074154d 100644 --- a/components/brave_ads/core/internal/account/user_data/fixed/top_segment_user_data.cc +++ b/components/brave_ads/core/internal/account/user_data/fixed/top_segment_user_data.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/account/user_data/fixed/top_segment_user_data.h" +#include #include #include @@ -36,7 +37,7 @@ base::Value::Dict BuildTopSegmentUserData(const TransactionInfo& transaction) { base::Value::List list; - if (const absl::optional top_segment = + if (const std::optional top_segment = GetTopSegment(BuildInterestSegments(), /*parent_only=*/false)) { list.Append(base::Value::Dict().Set(kInterestSegmentKey, *top_segment)); } diff --git a/components/brave_ads/core/internal/account/utility/redeem_confirmation/non_reward/redeem_non_reward_confirmation_unittest.cc b/components/brave_ads/core/internal/account/utility/redeem_confirmation/non_reward/redeem_non_reward_confirmation_unittest.cc index 3a71d7d3db0..50851efef2b 100644 --- a/components/brave_ads/core/internal/account/utility/redeem_confirmation/non_reward/redeem_non_reward_confirmation_unittest.cc +++ b/components/brave_ads/core/internal/account/utility/redeem_confirmation/non_reward/redeem_non_reward_confirmation_unittest.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/account/utility/redeem_confirmation/non_reward/redeem_non_reward_confirmation.h" +#include + #include "base/memory/weak_ptr.h" #include "brave/components/brave_ads/core/internal/account/confirmations/confirmation_info.h" #include "brave/components/brave_ads/core/internal/account/confirmations/non_reward/non_reward_confirmation_util.h" @@ -47,7 +49,7 @@ TEST_F(BraveAdsRedeemNonRewardConfirmationTest, Redeem) { const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/false); - const absl::optional confirmation = + const std::optional confirmation = BuildNonRewardConfirmation(transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); @@ -72,7 +74,7 @@ TEST_F(BraveAdsRedeemNonRewardConfirmationTest, const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/false); - const absl::optional confirmation = + const std::optional confirmation = BuildNonRewardConfirmation(transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); @@ -98,7 +100,7 @@ TEST_F(BraveAdsRedeemNonRewardConfirmationTest, const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/false); - const absl::optional confirmation = + const std::optional confirmation = BuildNonRewardConfirmation(transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); @@ -124,7 +126,7 @@ TEST_F(BraveAdsRedeemNonRewardConfirmationTest, const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/false); - const absl::optional confirmation = + const std::optional confirmation = BuildNonRewardConfirmation(transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); @@ -150,7 +152,7 @@ TEST_F(BraveAdsRedeemNonRewardConfirmationTest, RetryRedeeming) { const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/false); - const absl::optional confirmation = + const std::optional confirmation = BuildNonRewardConfirmation(transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); diff --git a/components/brave_ads/core/internal/account/utility/redeem_confirmation/non_reward/url_request_builders/create_non_reward_confirmation_url_request_builder_unittest.cc b/components/brave_ads/core/internal/account/utility/redeem_confirmation/non_reward/url_request_builders/create_non_reward_confirmation_url_request_builder_unittest.cc index c341e683b5d..20a9731f7df 100644 --- a/components/brave_ads/core/internal/account/utility/redeem_confirmation/non_reward/url_request_builders/create_non_reward_confirmation_url_request_builder_unittest.cc +++ b/components/brave_ads/core/internal/account/utility/redeem_confirmation/non_reward/url_request_builders/create_non_reward_confirmation_url_request_builder_unittest.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/account/utility/redeem_confirmation/non_reward/url_request_builders/create_non_reward_confirmation_url_request_builder.h" +#include + #include "brave/components/brave_ads/core/internal/account/confirmations/non_reward/non_reward_confirmation_util.h" #include "brave/components/brave_ads/core/internal/account/transactions/transactions_unittest_util.h" #include "brave/components/brave_ads/core/internal/common/unittest/unittest_base.h" @@ -39,7 +41,7 @@ TEST_F(BraveAdsCreateNonRewardConfirmationUrlRequestBuilderTest, BuildUrl) { const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/false); - const absl::optional confirmation = + const std::optional confirmation = BuildNonRewardConfirmation(transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); diff --git a/components/brave_ads/core/internal/account/utility/redeem_confirmation/reward/redeem_reward_confirmation.cc b/components/brave_ads/core/internal/account/utility/redeem_confirmation/reward/redeem_reward_confirmation.cc index cca71a2ffe9..9a4e15ae3aa 100644 --- a/components/brave_ads/core/internal/account/utility/redeem_confirmation/reward/redeem_reward_confirmation.cc +++ b/components/brave_ads/core/internal/account/utility/redeem_confirmation/reward/redeem_reward_confirmation.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/account/utility/redeem_confirmation/reward/redeem_reward_confirmation.h" +#include #include #include "base/check.h" @@ -30,7 +31,6 @@ #include "brave/components/brave_ads/core/internal/common/url/url_response_string_util.h" #include "brave/components/brave_ads/core/mojom/brave_ads.mojom.h" #include "net/http/http_status_code.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -183,7 +183,7 @@ RedeemRewardConfirmation::HandleFetchPaymentTokenUrlResponse( /*should_retry=*/true)); } - const absl::optional dict = + const std::optional dict = base::JSONReader::ReadDict(url_response.body); if (!dict) { return base::unexpected(std::make_tuple( @@ -211,7 +211,7 @@ RedeemRewardConfirmation::HandleFetchPaymentTokenUrlResponse( /*should_retry=*/false)); } - const absl::optional public_key = + const std::optional public_key = ParsePublicKey(*payment_token_dict); if (!public_key.has_value()) { return base::unexpected(std::make_tuple("Failed to parse public key", diff --git a/components/brave_ads/core/internal/account/utility/redeem_confirmation/reward/redeem_reward_confirmation_unittest.cc b/components/brave_ads/core/internal/account/utility/redeem_confirmation/reward/redeem_reward_confirmation_unittest.cc index 6a91f96d88d..03edd90b179 100644 --- a/components/brave_ads/core/internal/account/utility/redeem_confirmation/reward/redeem_reward_confirmation_unittest.cc +++ b/components/brave_ads/core/internal/account/utility/redeem_confirmation/reward/redeem_reward_confirmation_unittest.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/account/utility/redeem_confirmation/reward/redeem_reward_confirmation.h" +#include + #include "base/memory/weak_ptr.h" #include "brave/components/brave_ads/core/internal/account/confirmations/confirmation_info.h" #include "brave/components/brave_ads/core/internal/account/confirmations/reward/reward_confirmation_util.h" @@ -56,7 +58,7 @@ TEST_F(BraveAdsRedeemRewardConfirmationTest, Redeem) { const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/false); - const absl::optional confirmation = BuildRewardConfirmation( + const std::optional confirmation = BuildRewardConfirmation( &token_generator_mock_, transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); @@ -78,7 +80,7 @@ TEST_F(BraveAdsRedeemRewardConfirmationTest, RetryRedeemingIfNoIssuers) { const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/true); - const absl::optional confirmation = BuildRewardConfirmation( + const std::optional confirmation = BuildRewardConfirmation( &token_generator_mock_, transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); @@ -110,7 +112,7 @@ TEST_F(BraveAdsRedeemRewardConfirmationTest, const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/false); - const absl::optional confirmation = BuildRewardConfirmation( + const std::optional confirmation = BuildRewardConfirmation( &token_generator_mock_, transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); @@ -144,7 +146,7 @@ TEST_F(BraveAdsRedeemRewardConfirmationTest, const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/false); - const absl::optional confirmation = BuildRewardConfirmation( + const std::optional confirmation = BuildRewardConfirmation( &token_generator_mock_, transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); @@ -181,7 +183,7 @@ TEST_F(BraveAdsRedeemRewardConfirmationTest, const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/false); - const absl::optional confirmation = BuildRewardConfirmation( + const std::optional confirmation = BuildRewardConfirmation( &token_generator_mock_, transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); @@ -217,7 +219,7 @@ TEST_F(BraveAdsRedeemRewardConfirmationTest, const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/false); - const absl::optional confirmation = BuildRewardConfirmation( + const std::optional confirmation = BuildRewardConfirmation( &token_generator_mock_, transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); @@ -254,7 +256,7 @@ TEST_F(BraveAdsRedeemRewardConfirmationTest, const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/false); - const absl::optional confirmation = BuildRewardConfirmation( + const std::optional confirmation = BuildRewardConfirmation( &token_generator_mock_, transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); @@ -290,7 +292,7 @@ TEST_F(BraveAdsRedeemRewardConfirmationTest, const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/false); - const absl::optional confirmation = BuildRewardConfirmation( + const std::optional confirmation = BuildRewardConfirmation( &token_generator_mock_, transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); @@ -339,7 +341,7 @@ TEST_F(BraveAdsRedeemRewardConfirmationTest, const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/false); - const absl::optional confirmation = BuildRewardConfirmation( + const std::optional confirmation = BuildRewardConfirmation( &token_generator_mock_, transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); @@ -389,7 +391,7 @@ TEST_F(BraveAdsRedeemRewardConfirmationTest, const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/false); - const absl::optional confirmation = BuildRewardConfirmation( + const std::optional confirmation = BuildRewardConfirmation( &token_generator_mock_, transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); @@ -432,7 +434,7 @@ TEST_F(BraveAdsRedeemRewardConfirmationTest, const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/false); - const absl::optional confirmation = BuildRewardConfirmation( + const std::optional confirmation = BuildRewardConfirmation( &token_generator_mock_, transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); @@ -481,7 +483,7 @@ TEST_F(BraveAdsRedeemRewardConfirmationTest, const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/false); - const absl::optional confirmation = BuildRewardConfirmation( + const std::optional confirmation = BuildRewardConfirmation( &token_generator_mock_, transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); @@ -531,7 +533,7 @@ TEST_F(BraveAdsRedeemRewardConfirmationTest, const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/false); - const absl::optional confirmation = BuildRewardConfirmation( + const std::optional confirmation = BuildRewardConfirmation( &token_generator_mock_, transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); @@ -580,7 +582,7 @@ TEST_F(BraveAdsRedeemRewardConfirmationTest, const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/false); - const absl::optional confirmation = BuildRewardConfirmation( + const std::optional confirmation = BuildRewardConfirmation( &token_generator_mock_, transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); @@ -629,7 +631,7 @@ TEST_F(BraveAdsRedeemRewardConfirmationTest, const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/false); - const absl::optional confirmation = BuildRewardConfirmation( + const std::optional confirmation = BuildRewardConfirmation( &token_generator_mock_, transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); @@ -679,7 +681,7 @@ TEST_F(BraveAdsRedeemRewardConfirmationTest, const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/false); - const absl::optional confirmation = BuildRewardConfirmation( + const std::optional confirmation = BuildRewardConfirmation( &token_generator_mock_, transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); @@ -726,7 +728,7 @@ TEST_F(BraveAdsRedeemRewardConfirmationTest, const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/false); - const absl::optional confirmation = BuildRewardConfirmation( + const std::optional confirmation = BuildRewardConfirmation( &token_generator_mock_, transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); @@ -773,7 +775,7 @@ TEST_F(BraveAdsRedeemRewardConfirmationTest, const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/false); - const absl::optional confirmation = BuildRewardConfirmation( + const std::optional confirmation = BuildRewardConfirmation( &token_generator_mock_, transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); @@ -823,7 +825,7 @@ TEST_F(BraveAdsRedeemRewardConfirmationTest, const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/false); - const absl::optional confirmation = BuildRewardConfirmation( + const std::optional confirmation = BuildRewardConfirmation( &token_generator_mock_, transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); diff --git a/components/brave_ads/core/internal/account/utility/redeem_confirmation/reward/url_request_builders/create_reward_confirmation_url_request_builder_unittest.cc b/components/brave_ads/core/internal/account/utility/redeem_confirmation/reward/url_request_builders/create_reward_confirmation_url_request_builder_unittest.cc index 6ee6f0fcef7..2b0970bdd35 100644 --- a/components/brave_ads/core/internal/account/utility/redeem_confirmation/reward/url_request_builders/create_reward_confirmation_url_request_builder_unittest.cc +++ b/components/brave_ads/core/internal/account/utility/redeem_confirmation/reward/url_request_builders/create_reward_confirmation_url_request_builder_unittest.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/account/utility/redeem_confirmation/reward/url_request_builders/create_reward_confirmation_url_request_builder.h" +#include + #include "brave/components/brave_ads/core/internal/account/confirmations/reward/reward_confirmation_util.h" #include "brave/components/brave_ads/core/internal/account/tokens/confirmation_tokens/confirmation_tokens_unittest_util.h" #include "brave/components/brave_ads/core/internal/account/tokens/token_generator_mock.h" @@ -45,7 +47,7 @@ TEST_F(BraveAdsCreateRewardConfirmationUrlRequestBuilderTest, const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/false); - const absl::optional confirmation = BuildRewardConfirmation( + const std::optional confirmation = BuildRewardConfirmation( &token_generator_mock_, transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); @@ -76,7 +78,7 @@ TEST_F(BraveAdsCreateRewardConfirmationUrlRequestBuilderTest, const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/false); - const absl::optional confirmation = BuildRewardConfirmation( + const std::optional confirmation = BuildRewardConfirmation( &token_generator_mock_, transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); @@ -107,7 +109,7 @@ TEST_F(BraveAdsCreateRewardConfirmationUrlRequestBuilderTest, const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/false); - const absl::optional confirmation = BuildRewardConfirmation( + const std::optional confirmation = BuildRewardConfirmation( &token_generator_mock_, transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); @@ -138,7 +140,7 @@ TEST_F(BraveAdsCreateRewardConfirmationUrlRequestBuilderTest, const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/false); - const absl::optional confirmation = BuildRewardConfirmation( + const std::optional confirmation = BuildRewardConfirmation( &token_generator_mock_, transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); @@ -171,7 +173,7 @@ TEST_F(BraveAdsCreateRewardConfirmationUrlRequestBuilderTest, const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/false); - const absl::optional confirmation = BuildRewardConfirmation( + const std::optional confirmation = BuildRewardConfirmation( &token_generator_mock_, transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); @@ -204,7 +206,7 @@ TEST_F(BraveAdsCreateRewardConfirmationUrlRequestBuilderTest, const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/false); - const absl::optional confirmation = BuildRewardConfirmation( + const std::optional confirmation = BuildRewardConfirmation( &token_generator_mock_, transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); diff --git a/components/brave_ads/core/internal/account/utility/redeem_confirmation/reward/url_request_builders/fetch_payment_token_url_request_builder_unittest.cc b/components/brave_ads/core/internal/account/utility/redeem_confirmation/reward/url_request_builders/fetch_payment_token_url_request_builder_unittest.cc index a0b57229a72..7c5a046c68e 100644 --- a/components/brave_ads/core/internal/account/utility/redeem_confirmation/reward/url_request_builders/fetch_payment_token_url_request_builder_unittest.cc +++ b/components/brave_ads/core/internal/account/utility/redeem_confirmation/reward/url_request_builders/fetch_payment_token_url_request_builder_unittest.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/account/utility/redeem_confirmation/reward/url_request_builders/fetch_payment_token_url_request_builder.h" +#include + #include "brave/components/brave_ads/core/internal/account/confirmations/reward/reward_confirmation_util.h" #include "brave/components/brave_ads/core/internal/account/tokens/confirmation_tokens/confirmation_tokens_unittest_util.h" #include "brave/components/brave_ads/core/internal/account/tokens/token_generator_mock.h" @@ -31,7 +33,7 @@ TEST_F(BraveAdsFetchPaymentTokenUrlRequestBuilderTest, BuildUrl) { const TransactionInfo transaction = test::BuildUnreconciledTransaction( /*value=*/0.01, ConfirmationType::kViewed, /*should_use_random_uuids=*/false); - const absl::optional confirmation = BuildRewardConfirmation( + const std::optional confirmation = BuildRewardConfirmation( &token_generator_mock_, transaction, /*user_data=*/{}); ASSERT_TRUE(confirmation); diff --git a/components/brave_ads/core/internal/account/utility/redeem_payment_tokens/url_request_builders/redeem_payment_tokens_url_request_builder.cc b/components/brave_ads/core/internal/account/utility/redeem_payment_tokens/url_request_builders/redeem_payment_tokens_url_request_builder.cc index e0eeadaf34d..01576c81b9c 100644 --- a/components/brave_ads/core/internal/account/utility/redeem_payment_tokens/url_request_builders/redeem_payment_tokens_url_request_builder.cc +++ b/components/brave_ads/core/internal/account/utility/redeem_payment_tokens/url_request_builders/redeem_payment_tokens_url_request_builder.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/account/utility/redeem_payment_tokens/url_request_builders/redeem_payment_tokens_url_request_builder.h" +#include #include #include @@ -15,7 +16,6 @@ #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/credential_builder.h" #include "brave/components/brave_ads/core/internal/common/url/request_builder/host/url_host_util.h" #include "brave/components/brave_ads/core/mojom/brave_ads.mojom.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h" namespace brave_ads { @@ -93,13 +93,13 @@ base::Value::List RedeemPaymentTokensUrlRequestBuilder::BuildPaymentRequestDTO( base::Value::List list; for (const auto& payment_token : payment_tokens_) { - const absl::optional credential = + const std::optional credential = cbr::BuildCredential(payment_token.unblinded_token, payload); if (!credential) { continue; } - const absl::optional public_key_base64 = + const std::optional public_key_base64 = payment_token.public_key.EncodeBase64(); if (!public_key_base64) { NOTREACHED_NORETURN(); diff --git a/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/refill_confirmation_tokens.cc b/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/refill_confirmation_tokens.cc index 58b6557d138..b0ff823a4d7 100644 --- a/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/refill_confirmation_tokens.cc +++ b/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/refill_confirmation_tokens.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/refill_confirmation_tokens.h" +#include #include #include "base/check.h" @@ -33,7 +34,6 @@ #include "brave/components/brave_ads/core/internal/common/url/url_response_string_util.h" #include "brave/components/brave_ads/core/mojom/brave_ads.mojom.h" #include "net/http/http_status_code.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -148,7 +148,7 @@ RefillConfirmationTokens::HandleRequestSignedTokensUrlResponse( /*should_retry=*/true)); } - const absl::optional dict = + const std::optional dict = base::JSONReader::ReadDict(url_response.body); if (!dict) { return base::unexpected(std::make_tuple( @@ -223,7 +223,7 @@ RefillConfirmationTokens::HandleGetSignedTokensUrlResponse( /*should_retry=*/true)); } - const absl::optional dict = + const std::optional dict = base::JSONReader::ReadDict(url_response.body); if (!dict) { return base::unexpected(std::make_tuple( @@ -239,7 +239,7 @@ RefillConfirmationTokens::HandleGetSignedTokensUrlResponse( false)); } - const absl::optional public_key = ParsePublicKey(*dict); + const std::optional public_key = ParsePublicKey(*dict); if (!public_key.has_value()) { return base::unexpected(std::make_tuple("Failed to parse public key", /*should_retry=*/false)); @@ -268,7 +268,7 @@ RefillConfirmationTokens::HandleGetSignedTokensUrlResponse( void RefillConfirmationTokens::ParseAndRequireCaptcha( const base::Value::Dict& dict) const { - if (const absl::optional captcha_id = ParseCaptchaId(dict)) { + if (const std::optional captcha_id = ParseCaptchaId(dict)) { NotifyCaptchaRequiredToRefillConfirmationTokens(*captcha_id); } } diff --git a/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/refill_confirmation_tokens.h b/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/refill_confirmation_tokens.h index 691e13032c4..51a085d44cc 100644 --- a/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/refill_confirmation_tokens.h +++ b/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/refill_confirmation_tokens.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_UTILITY_REFILL_CONFIRMATION_TOKENS_REFILL_CONFIRMATION_TOKENS_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_UTILITY_REFILL_CONFIRMATION_TOKENS_REFILL_CONFIRMATION_TOKENS_H_ +#include #include #include #include @@ -87,10 +88,10 @@ class RefillConfirmationTokens final { WalletInfo wallet_; - absl::optional nonce_; + std::optional nonce_; - absl::optional> tokens_; - absl::optional> blinded_tokens_; + std::optional> tokens_; + std::optional> blinded_tokens_; bool is_processing_ = false; diff --git a/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/url_requests/get_signed_tokens/get_signed_tokens_url_request_util.cc b/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/url_requests/get_signed_tokens/get_signed_tokens_url_request_util.cc index 07f93e3c389..cc9ec441944 100644 --- a/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/url_requests/get_signed_tokens/get_signed_tokens_url_request_util.cc +++ b/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/url_requests/get_signed_tokens/get_signed_tokens_url_request_util.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/url_requests/get_signed_tokens/get_signed_tokens_url_request_util.h" +#include + #include "base/check.h" #include "brave/components/brave_ads/core/internal/account/tokens/confirmation_tokens/confirmation_token_info.h" #include "brave/components/brave_ads/core/internal/account/tokens/confirmation_tokens/confirmation_tokens_util.h" @@ -20,12 +22,12 @@ namespace { constexpr char kCaptchaIdKey[] = "captcha_id"; -absl::optional Sign(const cbr::UnblindedToken& unblinded_token, - const WalletInfo& wallet) { - const absl::optional unblinded_token_base64 = +std::optional Sign(const cbr::UnblindedToken& unblinded_token, + const WalletInfo& wallet) { + const std::optional unblinded_token_base64 = unblinded_token.EncodeBase64(); if (!unblinded_token_base64) { - return absl::nullopt; + return std::nullopt; } return crypto::Sign(*unblinded_token_base64, wallet.secret_key); @@ -38,7 +40,7 @@ ConfirmationTokenList BuildConfirmationTokens( ConfirmationTokenList confirmation_tokens; for (const cbr::UnblindedToken& unblinded_token : unblinded_tokens) { - const absl::optional signature = Sign(unblinded_token, wallet); + const std::optional signature = Sign(unblinded_token, wallet); CHECK(signature); ConfirmationTokenInfo confirmation_token; @@ -55,10 +57,10 @@ ConfirmationTokenList BuildConfirmationTokens( } // namespace -absl::optional ParseCaptchaId(const base::Value::Dict& dict) { +std::optional ParseCaptchaId(const base::Value::Dict& dict) { const std::string* const captcha_id = dict.FindString(kCaptchaIdKey); if (!captcha_id || captcha_id->empty()) { - return absl::nullopt; + return std::nullopt; } return *captcha_id; diff --git a/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/url_requests/get_signed_tokens/get_signed_tokens_url_request_util.h b/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/url_requests/get_signed_tokens/get_signed_tokens_url_request_util.h index 0386a97b13c..7eb51f48126 100644 --- a/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/url_requests/get_signed_tokens/get_signed_tokens_url_request_util.h +++ b/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/url_requests/get_signed_tokens/get_signed_tokens_url_request_util.h @@ -6,11 +6,11 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_UTILITY_REFILL_CONFIRMATION_TOKENS_URL_REQUESTS_GET_SIGNED_TOKENS_GET_SIGNED_TOKENS_URL_REQUEST_UTIL_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_UTILITY_REFILL_CONFIRMATION_TOKENS_URL_REQUESTS_GET_SIGNED_TOKENS_GET_SIGNED_TOKENS_URL_REQUEST_UTIL_H_ +#include #include #include #include "base/values.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -21,7 +21,7 @@ class UnblindedToken; struct WalletInfo; -absl::optional ParseCaptchaId(const base::Value::Dict& dict); +std::optional ParseCaptchaId(const base::Value::Dict& dict); void BuildAndAddConfirmationTokens( const std::vector& unblinded_tokens, diff --git a/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/url_requests/request_signed_tokens/request_signed_tokens_url_request_builder.cc b/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/url_requests/request_signed_tokens/request_signed_tokens_url_request_builder.cc index 210d7a8eb95..a68a8850f14 100644 --- a/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/url_requests/request_signed_tokens/request_signed_tokens_url_request_builder.cc +++ b/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/url_requests/request_signed_tokens/request_signed_tokens_url_request_builder.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/url_requests/request_signed_tokens/request_signed_tokens_url_request_builder.h" #include +#include #include #include "base/base64.h" @@ -114,7 +115,7 @@ std::string RequestSignedTokensUrlRequestBuilder::BuildSignatureHeaderValue( index++; } - const absl::optional signature_base64 = + const std::optional signature_base64 = crypto::Sign(concatenated_message, wallet_.secret_key); if (!signature_base64) { return {}; @@ -129,7 +130,7 @@ std::string RequestSignedTokensUrlRequestBuilder::BuildBody() const { base::Value::List list; for (const auto& blinded_token : blinded_tokens_) { - if (const absl::optional blinded_token_base64 = + if (const std::optional blinded_token_base64 = blinded_token.EncodeBase64()) { list.Append(*blinded_token_base64); } diff --git a/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/url_requests/request_signed_tokens/request_signed_tokens_url_request_util.cc b/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/url_requests/request_signed_tokens/request_signed_tokens_url_request_util.cc index 915e60a4107..ea9e6a8fded 100644 --- a/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/url_requests/request_signed_tokens/request_signed_tokens_url_request_util.cc +++ b/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/url_requests/request_signed_tokens/request_signed_tokens_url_request_util.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/url_requests/request_signed_tokens/request_signed_tokens_url_request_util.h" +#include + namespace brave_ads { namespace { @@ -14,14 +16,14 @@ constexpr char kNonceKey[] = "nonce"; } // namespace -absl::optional ParseIsEligible(const base::Value::Dict& dict) { +std::optional ParseIsEligible(const base::Value::Dict& dict) { return dict.FindBool(kIsEligibleKey); } -absl::optional ParseNonce(const base::Value::Dict& dict) { +std::optional ParseNonce(const base::Value::Dict& dict) { const std::string* const nonce = dict.FindString(kNonceKey); if (!nonce || nonce->empty()) { - return absl::nullopt; + return std::nullopt; } return *nonce; diff --git a/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/url_requests/request_signed_tokens/request_signed_tokens_url_request_util.h b/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/url_requests/request_signed_tokens/request_signed_tokens_url_request_util.h index 842932d3ba7..ba7c339f90d 100644 --- a/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/url_requests/request_signed_tokens/request_signed_tokens_url_request_util.h +++ b/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/url_requests/request_signed_tokens/request_signed_tokens_url_request_util.h @@ -6,16 +6,16 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_UTILITY_REFILL_CONFIRMATION_TOKENS_URL_REQUESTS_REQUEST_SIGNED_TOKENS_REQUEST_SIGNED_TOKENS_URL_REQUEST_UTIL_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_UTILITY_REFILL_CONFIRMATION_TOKENS_URL_REQUESTS_REQUEST_SIGNED_TOKENS_REQUEST_SIGNED_TOKENS_URL_REQUEST_UTIL_H_ +#include #include #include "base/values.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { -absl::optional ParseIsEligible(const base::Value::Dict& dict); +std::optional ParseIsEligible(const base::Value::Dict& dict); -absl::optional ParseNonce(const base::Value::Dict& dict); +std::optional ParseNonce(const base::Value::Dict& dict); } // namespace brave_ads diff --git a/components/brave_ads/core/internal/account/utility/tokens_util.cc b/components/brave_ads/core/internal/account/utility/tokens_util.cc index ab9aab0b00a..4b610236c40 100644 --- a/components/brave_ads/core/internal/account/utility/tokens_util.cc +++ b/components/brave_ads/core/internal/account/utility/tokens_util.cc @@ -5,11 +5,12 @@ #include "brave/components/brave_ads/core/internal/account/utility/tokens_util.h" +#include + #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/batch_dleq_proof.h" #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/public_key.h" #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/signed_token.h" #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/unblinded_token.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -21,25 +22,25 @@ constexpr char kPublicKeyKey[] = "publicKey"; } // namespace -absl::optional ParsePublicKey(const base::Value::Dict& dict) { +std::optional ParsePublicKey(const base::Value::Dict& dict) { const std::string* const public_key_base64 = dict.FindString(kPublicKeyKey); if (!public_key_base64) { - return absl::nullopt; + return std::nullopt; } const cbr::PublicKey public_key(*public_key_base64); if (!public_key.has_value()) { - return absl::nullopt; + return std::nullopt; } return public_key; } -absl::optional> ParseSignedTokens( +std::optional> ParseSignedTokens( const base::Value::Dict& dict) { const base::Value::List* list = dict.FindList(kSignedTokensKey); if (!list) { - return absl::nullopt; + return std::nullopt; } std::vector signed_tokens; @@ -47,13 +48,13 @@ absl::optional> ParseSignedTokens( for (const auto& item : *list) { const std::string* const signed_token_base64 = item.GetIfString(); if (!signed_token_base64) { - return absl::nullopt; + return std::nullopt; } const cbr::SignedToken signed_token = cbr::SignedToken(*signed_token_base64); if (!signed_token.has_value()) { - return absl::nullopt; + return std::nullopt; } signed_tokens.push_back(signed_token); @@ -83,13 +84,13 @@ ParseVerifyAndUnblindTokens( return base::unexpected("Invalid batch DLEQ proof"); } - const absl::optional> signed_tokens = + const std::optional> signed_tokens = ParseSignedTokens(dict); if (!signed_tokens) { return base::unexpected("Failed to parse signed tokens"); } - const absl::optional> unblinded_tokens = + const std::optional> unblinded_tokens = batch_dleq_proof.VerifyAndUnblind(tokens, blinded_tokens, *signed_tokens, public_key); if (!unblinded_tokens || unblinded_tokens->empty()) { diff --git a/components/brave_ads/core/internal/account/utility/tokens_util.h b/components/brave_ads/core/internal/account/utility/tokens_util.h index fe4d70b15ea..e6b1acf71da 100644 --- a/components/brave_ads/core/internal/account/utility/tokens_util.h +++ b/components/brave_ads/core/internal/account/utility/tokens_util.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_UTILITY_TOKENS_UTIL_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_UTILITY_TOKENS_UTIL_H_ +#include #include #include @@ -22,9 +23,9 @@ class Token; class UnblindedToken; } // namespace cbr -absl::optional ParsePublicKey(const base::Value::Dict& dict); +std::optional ParsePublicKey(const base::Value::Dict& dict); -absl::optional> ParseSignedTokens( +std::optional> ParseSignedTokens( const base::Value::Dict& dict); base::expected, std::string> diff --git a/components/brave_ads/core/internal/account/utility/tokens_util_unittest.cc b/components/brave_ads/core/internal/account/utility/tokens_util_unittest.cc index 5ec110eaae9..f0913d94456 100644 --- a/components/brave_ads/core/internal/account/utility/tokens_util_unittest.cc +++ b/components/brave_ads/core/internal/account/utility/tokens_util_unittest.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/account/utility/tokens_util.h" +#include + #include "base/values.h" #include "brave/components/brave_ads/core/internal/account/issuers/issuers_unittest_util.h" #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/blinded_token.h" @@ -60,7 +62,7 @@ TEST_F(BraveAdsSignedTokensUtilTest, ParseSignedTokens) { // Arrange // Act - const absl::optional> signed_tokens = + const std::optional> signed_tokens = ParseSignedTokens(BuildUrlResponseBody()); // Assert diff --git a/components/brave_ads/core/internal/account/wallet/wallet_util.cc b/components/brave_ads/core/internal/account/wallet/wallet_util.cc index dcd3e1c2d93..bb08dfcd6f1 100644 --- a/components/brave_ads/core/internal/account/wallet/wallet_util.cc +++ b/components/brave_ads/core/internal/account/wallet/wallet_util.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/account/wallet/wallet_util.h" +#include #include #include "base/base64.h" @@ -14,18 +15,18 @@ namespace brave_ads { -absl::optional ToWallet(const std::string& payment_id, - const std::string& recovery_seed) { - const absl::optional> raw_recovery_seed = +std::optional ToWallet(const std::string& payment_id, + const std::string& recovery_seed) { + const std::optional> raw_recovery_seed = base::Base64Decode(recovery_seed); if (!raw_recovery_seed) { - return absl::nullopt; + return std::nullopt; } - const absl::optional key_pair = + const std::optional key_pair = crypto::GenerateSignKeyPairFromSeed(*raw_recovery_seed); if (!key_pair || !key_pair->IsValid()) { - return absl::nullopt; + return std::nullopt; } WalletInfo wallet; @@ -34,7 +35,7 @@ absl::optional ToWallet(const std::string& payment_id, wallet.secret_key = base::Base64Encode(key_pair->secret_key); if (!wallet.IsValid()) { - return absl::nullopt; + return std::nullopt; } return wallet; diff --git a/components/brave_ads/core/internal/account/wallet/wallet_util.h b/components/brave_ads/core/internal/account/wallet/wallet_util.h index 89417a90dfc..a921d9b40bc 100644 --- a/components/brave_ads/core/internal/account/wallet/wallet_util.h +++ b/components/brave_ads/core/internal/account/wallet/wallet_util.h @@ -6,16 +6,16 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_WALLET_WALLET_UTIL_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_WALLET_WALLET_UTIL_H_ +#include #include -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { struct WalletInfo; -absl::optional ToWallet(const std::string& payment_id, - const std::string& recovery_seed); +std::optional ToWallet(const std::string& payment_id, + const std::string& recovery_seed); } // namespace brave_ads diff --git a/components/brave_ads/core/internal/ads_impl.cc b/components/brave_ads/core/internal/ads_impl.cc index fbae59016bd..f1a739512da 100644 --- a/components/brave_ads/core/internal/ads_impl.cc +++ b/components/brave_ads/core/internal/ads_impl.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/ads_impl.h" +#include #include #include "base/check.h" @@ -100,7 +101,7 @@ void AdsImpl::Shutdown(ShutdownCallback callback) { std::move(callback).Run(/*success=*/true); } -absl::optional AdsImpl::MaybeGetNotificationAd( +std::optional AdsImpl::MaybeGetNotificationAd( const std::string& placement_id) { return NotificationAdManager::GetInstance().MaybeGetForPlacementId( placement_id); @@ -120,7 +121,7 @@ void AdsImpl::TriggerNotificationAdEvent( void AdsImpl::MaybeServeNewTabPageAd(MaybeServeNewTabPageAdCallback callback) { if (!is_initialized_) { - return std::move(callback).Run(/*ad=*/absl::nullopt); + return std::move(callback).Run(/*ad=*/std::nullopt); } ad_handler_.MaybeServeNewTabPageAd(std::move(callback)); @@ -156,7 +157,7 @@ void AdsImpl::MaybeServeInlineContentAd( const std::string& dimensions, MaybeServeInlineContentAdCallback callback) { if (!is_initialized_) { - return std::move(callback).Run(dimensions, /*ad=*/absl::nullopt); + return std::move(callback).Run(dimensions, /*ad=*/std::nullopt); } ad_handler_.MaybeServeInlineContentAd(dimensions, std::move(callback)); @@ -232,7 +233,7 @@ void AdsImpl::GetStatementOfAccounts(GetStatementOfAccountsCallback callback) { void AdsImpl::GetDiagnostics(GetDiagnosticsCallback callback) { if (!is_initialized_) { - return std::move(callback).Run(/*diagnostics=*/absl::nullopt); + return std::move(callback).Run(/*diagnostics=*/std::nullopt); } DiagnosticManager::GetInstance().GetDiagnostics(std::move(callback)); @@ -369,7 +370,7 @@ void AdsImpl::MigrateConfirmationStateCallback(mojom::WalletInfoPtr wallet, return FailedToInitialize(std::move(callback)); } - absl::optional new_wallet; + std::optional new_wallet; if (wallet) { new_wallet = ToWallet(wallet->payment_id, wallet->recovery_seed); if (!new_wallet) { diff --git a/components/brave_ads/core/internal/ads_impl.h b/components/brave_ads/core/internal/ads_impl.h index a1f66d93e23..200eef66ca7 100644 --- a/components/brave_ads/core/internal/ads_impl.h +++ b/components/brave_ads/core/internal/ads_impl.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ADS_IMPL_H_ #include +#include #include #include "base/memory/weak_ptr.h" @@ -24,7 +25,6 @@ #include "brave/components/brave_ads/core/public/history/history_filter_types.h" #include "brave/components/brave_ads/core/public/history/history_item_info.h" #include "brave/components/brave_ads/core/public/history/history_sort_types.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace base { class Time; @@ -76,7 +76,7 @@ class AdsImpl final : public Ads { mojom::NewTabPageAdEventType event_type, TriggerAdEventCallback callback) override; - absl::optional MaybeGetNotificationAd( + std::optional MaybeGetNotificationAd( const std::string& placement_id) override; void TriggerNotificationAdEvent(const std::string& placement_id, mojom::NotificationAdEventType event_type, diff --git a/components/brave_ads/core/internal/analytics/p2a/opportunities/p2a_opportunity_util.cc b/components/brave_ads/core/internal/analytics/p2a/opportunities/p2a_opportunity_util.cc index c8b6fd318e6..819d049ab80 100644 --- a/components/brave_ads/core/internal/analytics/p2a/opportunities/p2a_opportunity_util.cc +++ b/components/brave_ads/core/internal/analytics/p2a/opportunities/p2a_opportunity_util.cc @@ -5,11 +5,12 @@ #include "brave/components/brave_ads/core/internal/analytics/p2a/opportunities/p2a_opportunity_util.h" +#include + #include "base/check.h" #include "base/strings/string_util.h" #include "brave/components/brave_ads/core/internal/common/strings/string_strip_util.h" #include "brave/components/brave_ads/core/internal/segments/segment_util.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -26,7 +27,7 @@ std::string NormalizeSegment(const std::string& segment) { return normalized_segment; } -absl::optional BuildAdOpportunitiesPerSegmentEvent( +std::optional BuildAdOpportunitiesPerSegmentEvent( AdType ad_type, const std::string& segment) { CHECK_NE(AdType::kUndefined, ad_type); @@ -35,7 +36,7 @@ absl::optional BuildAdOpportunitiesPerSegmentEvent( const std::string parent_segment = GetParentSegment(segment); const std::string normalized_segment = NormalizeSegment(parent_segment); if (normalized_segment.empty()) { - return absl::nullopt; + return std::nullopt; } return base::ReplaceStringPlaceholders( @@ -60,7 +61,7 @@ std::vector BuildP2AAdOpportunityEvents( std::vector events; for (const auto& segment : segments) { - if (const absl::optional ad_opportunities_per_segment_event = + if (const std::optional ad_opportunities_per_segment_event = BuildAdOpportunitiesPerSegmentEvent(ad_type, segment)) { events.push_back(*ad_opportunities_per_segment_event); } diff --git a/components/brave_ads/core/internal/browser/browser_util.cc b/components/brave_ads/core/internal/browser/browser_util.cc index a2aeaf842db..8efd64ab24e 100644 --- a/components/brave_ads/core/internal/browser/browser_util.cc +++ b/components/brave_ads/core/internal/browser/browser_util.cc @@ -5,10 +5,11 @@ #include "brave/components/brave_ads/core/internal/browser/browser_util.h" +#include + #include "brave/components/brave_ads/core/internal/client/ads_client_util.h" #include "brave/components/brave_ads/core/public/prefs/pref_names.h" #include "brave/components/version_info/version_info.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -17,7 +18,7 @@ std::string GetBrowserVersionNumber() { } bool WasBrowserUpgraded() { - static absl::optional was_upgraded; + static std::optional was_upgraded; if (was_upgraded) { return *was_upgraded; diff --git a/components/brave_ads/core/internal/catalog/campaign/creative_set/catalog_conversion_info.h b/components/brave_ads/core/internal/catalog/campaign/creative_set/catalog_conversion_info.h index 887ab62f08c..c07884a706c 100644 --- a/components/brave_ads/core/internal/catalog/campaign/creative_set/catalog_conversion_info.h +++ b/components/brave_ads/core/internal/catalog/campaign/creative_set/catalog_conversion_info.h @@ -6,11 +6,11 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_CATALOG_CAMPAIGN_CREATIVE_SET_CATALOG_CONVERSION_INFO_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_CATALOG_CAMPAIGN_CREATIVE_SET_CATALOG_CONVERSION_INFO_H_ +#include #include #include #include "base/time/time.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -29,7 +29,7 @@ struct CatalogConversionInfo final { std::string creative_set_id; std::string url_pattern; - absl::optional verifiable_advertiser_public_key_base64; + std::optional verifiable_advertiser_public_key_base64; base::TimeDelta observation_window; base::Time expire_at; }; diff --git a/components/brave_ads/core/internal/catalog/catalog_url_request.cc b/components/brave_ads/core/internal/catalog/catalog_url_request.cc index 9f1142b0209..f29162c1dd8 100644 --- a/components/brave_ads/core/internal/catalog/catalog_url_request.cc +++ b/components/brave_ads/core/internal/catalog/catalog_url_request.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/catalog/catalog_url_request.h" +#include #include #include "base/functional/bind.h" @@ -24,7 +25,6 @@ #include "brave/components/brave_ads/core/internal/flags/debug/debug_flag_util.h" #include "brave/components/brave_ads/core/mojom/brave_ads.mojom.h" #include "net/http/http_status_code.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -96,7 +96,7 @@ void CatalogUrlRequest::FetchCallback( } BLOG(1, "Parsing catalog"); - const absl::optional catalog = + const std::optional catalog = json::reader::ReadCatalog(url_response.body); if (!catalog) { BLOG(1, "Failed to parse catalog"); diff --git a/components/brave_ads/core/internal/catalog/catalog_url_request_json_reader.cc b/components/brave_ads/core/internal/catalog/catalog_url_request_json_reader.cc index 0eb1043184d..44226004eb7 100644 --- a/components/brave_ads/core/internal/catalog/catalog_url_request_json_reader.cc +++ b/components/brave_ads/core/internal/catalog/catalog_url_request_json_reader.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_ads/core/internal/catalog/catalog_url_request_json_reader.h" #include +#include #include "base/time/time.h" #include "brave/components/brave_ads/core/internal/catalog/campaign/catalog_campaign_info.h" @@ -21,7 +22,7 @@ namespace brave_ads::json::reader { // TODO(https://github.com/brave/brave-browser/issues/25987): Reduce cognitive // complexity. -absl::optional ReadCatalog(const std::string& json) { +std::optional ReadCatalog(const std::string& json) { rapidjson::Document document; document.Parse(json.c_str()); @@ -30,7 +31,7 @@ absl::optional ReadCatalog(const std::string& json) { if (!helper::json::Validate(&document, json_schema)) { BLOG(1, helper::json::GetLastError(&document)); - return absl::nullopt; + return std::nullopt; } CatalogInfo catalog; diff --git a/components/brave_ads/core/internal/catalog/catalog_url_request_json_reader.h b/components/brave_ads/core/internal/catalog/catalog_url_request_json_reader.h index 02a4c3bbd76..83758995bf2 100644 --- a/components/brave_ads/core/internal/catalog/catalog_url_request_json_reader.h +++ b/components/brave_ads/core/internal/catalog/catalog_url_request_json_reader.h @@ -6,9 +6,9 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_CATALOG_CATALOG_URL_REQUEST_JSON_READER_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_CATALOG_CATALOG_URL_REQUEST_JSON_READER_H_ +#include #include -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -16,7 +16,7 @@ struct CatalogInfo; namespace json::reader { -absl::optional ReadCatalog(const std::string& json); +std::optional ReadCatalog(const std::string& json); } // namespace json::reader } // namespace brave_ads diff --git a/components/brave_ads/core/internal/catalog/catalog_url_request_json_reader_unittest.cc b/components/brave_ads/core/internal/catalog/catalog_url_request_json_reader_unittest.cc index e3ddcf3d7e0..036d76d3fea 100644 --- a/components/brave_ads/core/internal/catalog/catalog_url_request_json_reader_unittest.cc +++ b/components/brave_ads/core/internal/catalog/catalog_url_request_json_reader_unittest.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/catalog/catalog_url_request_json_reader.h" +#include + #include "base/time/time.h" #include "brave/components/brave_ads/core/internal/catalog/campaign/catalog_campaign_info.h" #include "brave/components/brave_ads/core/internal/catalog/campaign/catalog_daypart_info.h" @@ -431,7 +433,7 @@ class BraveAdsCatalogUrlRequestJsonReaderTest : public UnitTestBase {}; TEST_F(BraveAdsCatalogUrlRequestJsonReaderTest, ParseCatalogWithSingleCampaign) { // Arrange - const absl::optional contents = + const std::optional contents = MaybeReadFileToStringAndReplaceTags(kCatalogWithSingleCampaignFilename); ASSERT_TRUE(contents); @@ -447,7 +449,7 @@ TEST_F(BraveAdsCatalogUrlRequestJsonReaderTest, TEST_F(BraveAdsCatalogUrlRequestJsonReaderTest, ParseCatalogWithMultipleCampaigns) { // Arrange - const absl::optional contents = + const std::optional contents = MaybeReadFileToStringAndReplaceTags( kCatalogWithMultipleCampaignsFilename); ASSERT_TRUE(contents); @@ -464,7 +466,7 @@ TEST_F(BraveAdsCatalogUrlRequestJsonReaderTest, TEST_F(BraveAdsCatalogUrlRequestJsonReaderTest, ParseEmptyCatalog) { // Arrange - const absl::optional contents = + const std::optional contents = MaybeReadFileToStringAndReplaceTags(kEmptyCatalogFilename); ASSERT_TRUE(contents); diff --git a/components/brave_ads/core/internal/client/ads_client_mock.h b/components/brave_ads/core/internal/client/ads_client_mock.h index 224371ff4c4..cd3d8f8ea47 100644 --- a/components/brave_ads/core/internal/client/ads_client_mock.h +++ b/components/brave_ads/core/internal/client/ads_client_mock.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_CLIENT_ADS_CLIENT_MOCK_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_CLIENT_ADS_CLIENT_MOCK_H_ +#include #include #include @@ -105,7 +106,7 @@ class AdsClientMock : public AdsClient { (const std::vector training_sample)); - MOCK_METHOD(absl::optional, + MOCK_METHOD(std::optional, GetProfilePref, (const std::string& path)); MOCK_METHOD(void, @@ -114,7 +115,7 @@ class AdsClientMock : public AdsClient { MOCK_METHOD(void, ClearProfilePref, (const std::string& path)); MOCK_METHOD(bool, HasProfilePrefPath, (const std::string& path), (const)); - MOCK_METHOD(absl::optional, + MOCK_METHOD(std::optional, GetLocalStatePref, (const std::string& path)); MOCK_METHOD(void, diff --git a/components/brave_ads/core/internal/client/ads_client_util.cc b/components/brave_ads/core/internal/client/ads_client_util.cc index e8707cf6978..8df4ae8be0d 100644 --- a/components/brave_ads/core/internal/client/ads_client_util.cc +++ b/components/brave_ads/core/internal/client/ads_client_util.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/client/ads_client_util.h" +#include #include #include "base/check.h" @@ -150,12 +151,12 @@ void AddFederatedLearningPredictorTrainingSample( std::move(training_sample)); } -absl::optional GetProfilePref(const std::string& path) { +std::optional GetProfilePref(const std::string& path) { return GetInstance()->GetProfilePref(path); } bool GetProfileBooleanPref(const std::string& path) { - const absl::optional value = GetProfilePref(path); + const std::optional value = GetProfilePref(path); if (!value) { return false; } @@ -166,7 +167,7 @@ bool GetProfileBooleanPref(const std::string& path) { } int GetProfileIntegerPref(const std::string& path) { - const absl::optional value = GetProfilePref(path); + const std::optional value = GetProfilePref(path); if (!value) { return 0; } @@ -177,7 +178,7 @@ int GetProfileIntegerPref(const std::string& path) { } double GetProfileDoublePref(const std::string& path) { - const absl::optional value = GetProfilePref(path); + const std::optional value = GetProfilePref(path); if (!value) { return 0.0; } @@ -188,7 +189,7 @@ double GetProfileDoublePref(const std::string& path) { } std::string GetProfileStringPref(const std::string& path) { - const absl::optional value = GetProfilePref(path); + const std::optional value = GetProfilePref(path); if (!value) { return ""; } @@ -199,7 +200,7 @@ std::string GetProfileStringPref(const std::string& path) { } base::Value::Dict GetProfileDictPref(const std::string& path) { - const absl::optional value = GetProfilePref(path); + const std::optional value = GetProfilePref(path); if (!value) { return {}; } @@ -210,7 +211,7 @@ base::Value::Dict GetProfileDictPref(const std::string& path) { } base::Value::List GetProfileListPref(const std::string& path) { - const absl::optional value = GetProfilePref(path); + const std::optional value = GetProfilePref(path); if (!value) { return {}; } @@ -221,19 +222,19 @@ base::Value::List GetProfileListPref(const std::string& path) { } int64_t GetProfileInt64Pref(const std::string& path) { - const absl::optional value = GetProfilePref(path); + const std::optional value = GetProfilePref(path); if (!value) { return 0; } CHECK(value->is_string()) << "Wrong type for GetProfileInt64Pref: " << path; - const absl::optional integer = base::ValueToInt64(*value); + const std::optional integer = base::ValueToInt64(*value); return integer.value_or(0); } uint64_t GetProfileUint64Pref(const std::string& path) { - const absl::optional value = GetProfilePref(path); + const std::optional value = GetProfilePref(path); if (!value) { return 0; } @@ -251,19 +252,19 @@ uint64_t GetProfileUint64Pref(const std::string& path) { } base::Time GetProfileTimePref(const std::string& path) { - const absl::optional value = GetProfilePref(path); + const std::optional value = GetProfilePref(path); if (!value) { return {}; } CHECK(value->is_string()) << "Wrong type for GetProfileTimePref: " << path; - const absl::optional time = base::ValueToTime(*value); + const std::optional time = base::ValueToTime(*value); return time.value_or(base::Time()); } base::TimeDelta GetProfileTimeDeltaPref(const std::string& path) { - const absl::optional value = GetProfilePref(path); + const std::optional value = GetProfilePref(path); if (!value) { return {}; } @@ -271,7 +272,7 @@ base::TimeDelta GetProfileTimeDeltaPref(const std::string& path) { CHECK(value->is_string()) << "Wrong type for GetProfileTimedDeltaPref: " << path; - const absl::optional time_delta = + const std::optional time_delta = base::ValueToTimeDelta(*value); return time_delta.value_or(base::TimeDelta()); } @@ -328,12 +329,12 @@ bool HasProfilePrefPath(const std::string& path) { return GetInstance()->HasProfilePrefPath(path); } -absl::optional GetLocalStatePref(const std::string& path) { +std::optional GetLocalStatePref(const std::string& path) { return GetInstance()->GetLocalStatePref(path); } bool GetLocalStateBooleanPref(const std::string& path) { - const absl::optional value = GetLocalStatePref(path); + const std::optional value = GetLocalStatePref(path); if (!value) { return false; } @@ -344,7 +345,7 @@ bool GetLocalStateBooleanPref(const std::string& path) { } int GetLocalStateIntegerPref(const std::string& path) { - const absl::optional value = GetLocalStatePref(path); + const std::optional value = GetLocalStatePref(path); if (!value) { return 0; } @@ -355,7 +356,7 @@ int GetLocalStateIntegerPref(const std::string& path) { } double GetLocalStateDoublePref(const std::string& path) { - const absl::optional value = GetLocalStatePref(path); + const std::optional value = GetLocalStatePref(path); if (!value) { return 0.0; } @@ -366,7 +367,7 @@ double GetLocalStateDoublePref(const std::string& path) { } std::string GetLocalStateStringPref(const std::string& path) { - const absl::optional value = GetLocalStatePref(path); + const std::optional value = GetLocalStatePref(path); if (!value) { return ""; } @@ -377,7 +378,7 @@ std::string GetLocalStateStringPref(const std::string& path) { } base::Value::Dict GetLocalStateDictPref(const std::string& path) { - const absl::optional value = GetLocalStatePref(path); + const std::optional value = GetLocalStatePref(path); if (!value) { return {}; } @@ -388,7 +389,7 @@ base::Value::Dict GetLocalStateDictPref(const std::string& path) { } base::Value::List GetLocalStateListPref(const std::string& path) { - const absl::optional value = GetLocalStatePref(path); + const std::optional value = GetLocalStatePref(path); if (!value) { return {}; } @@ -399,19 +400,19 @@ base::Value::List GetLocalStateListPref(const std::string& path) { } int64_t GetLocalStateInt64Pref(const std::string& path) { - const absl::optional value = GetLocalStatePref(path); + const std::optional value = GetLocalStatePref(path); if (!value) { return 0; } CHECK(value->is_string()) << "Wrong type for GetProfileBooleanPref: " << path; - const absl::optional integer = base::ValueToInt64(*value); + const std::optional integer = base::ValueToInt64(*value); return integer.value_or(0); } uint64_t GetLocalStateUint64Pref(const std::string& path) { - const absl::optional value = GetLocalStatePref(path); + const std::optional value = GetLocalStatePref(path); if (!value) { return 0; } @@ -429,19 +430,19 @@ uint64_t GetLocalStateUint64Pref(const std::string& path) { } base::Time GetLocalStateTimePref(const std::string& path) { - const absl::optional value = GetLocalStatePref(path); + const std::optional value = GetLocalStatePref(path); if (!value) { return {}; } CHECK(value->is_string()) << "Wrong type for GetLocalStateTimePref: " << path; - const absl::optional time = base::ValueToTime(*value); + const std::optional time = base::ValueToTime(*value); return time.value_or(base::Time()); } base::TimeDelta GetLocalStateTimeDeltaPref(const std::string& path) { - const absl::optional value = GetLocalStatePref(path); + const std::optional value = GetLocalStatePref(path); if (!value) { return {}; } @@ -449,7 +450,7 @@ base::TimeDelta GetLocalStateTimeDeltaPref(const std::string& path) { CHECK(value->is_string()) << "Wrong type for GetLocalStateTimedDeltaPref: " << path; - const absl::optional time_delta = + const std::optional time_delta = base::ValueToTimeDelta(*value); return time_delta.value_or(base::TimeDelta()); } diff --git a/components/brave_ads/core/internal/client/ads_client_util.h b/components/brave_ads/core/internal/client/ads_client_util.h index 37173fb7874..e4ed59b18aa 100644 --- a/components/brave_ads/core/internal/client/ads_client_util.h +++ b/components/brave_ads/core/internal/client/ads_client_util.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_CLIENT_ADS_CLIENT_UTIL_H_ #include +#include #include #include @@ -18,7 +19,6 @@ #include "brave/components/brave_ads/core/public/client/ads_client_notifier_observer.h" #include "brave/components/brave_ads/core/public/units/ad_type.h" #include "brave/components/brave_federated/public/interfaces/brave_federated.mojom-forward.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -78,7 +78,7 @@ void RecordP2AEvents(const std::vector& events); void AddFederatedLearningPredictorTrainingSample( std::vector training_sample); -absl::optional GetProfilePref(const std::string& path); +std::optional GetProfilePref(const std::string& path); bool GetProfileBooleanPref(const std::string& path); int GetProfileIntegerPref(const std::string& path); double GetProfileDoublePref(const std::string& path); @@ -103,7 +103,7 @@ void SetProfileTimeDeltaPref(const std::string& path, base::TimeDelta value); void ClearProfilePref(const std::string& path); bool HasProfilePrefPath(const std::string& path); -absl::optional GetLocalStatePref(const std::string& path); +std::optional GetLocalStatePref(const std::string& path); bool GetLocalStateBooleanPref(const std::string& path); int GetLocalStateIntegerPref(const std::string& path); double GetLocalStateDoublePref(const std::string& path); diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/batch_dleq_proof.cc b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/batch_dleq_proof.cc index d5c411caaba..832cf6798b0 100644 --- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/batch_dleq_proof.cc +++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/batch_dleq_proof.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/batch_dleq_proof.h" +#include #include #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/blinded_token.h" @@ -22,12 +23,12 @@ namespace brave_ads::cbr { namespace { -absl::optional Create( +std::optional Create( const std::vector& blinded_tokens, const std::vector& signed_tokens, const SigningKey& signing_key) { if (!signing_key.has_value()) { - return absl::nullopt; + return std::nullopt; } return ValueOrLogError(challenge_bypass_ristretto::BatchDLEQProof::Create( @@ -35,10 +36,10 @@ absl::optional Create( signing_key.get())); } -absl::optional Create( +std::optional Create( const std::string& batch_dleq_proof_base64) { if (batch_dleq_proof_base64.empty()) { - return absl::nullopt; + return std::nullopt; } return ValueOrLogError( @@ -88,13 +89,13 @@ BatchDLEQProof BatchDLEQProof::DecodeBase64( return BatchDLEQProof(batch_dleq_proof_base64); } -absl::optional BatchDLEQProof::EncodeBase64() const { +std::optional BatchDLEQProof::EncodeBase64() const { if (!has_value()) { - return absl::nullopt; + return std::nullopt; } if (!batch_dleq_proof_) { - return absl::nullopt; + return std::nullopt; } return ValueOrLogError(batch_dleq_proof_->encode_base64()); @@ -118,14 +119,14 @@ bool BatchDLEQProof::Verify(const std::vector& blinded_tokens, .value_or(false); } -absl::optional> BatchDLEQProof::VerifyAndUnblind( +std::optional> BatchDLEQProof::VerifyAndUnblind( const std::vector& tokens, const std::vector& blinded_tokens, const std::vector& signed_tokens, const PublicKey& public_key) { if (!batch_dleq_proof_ || !has_value() || tokens.empty() || !public_key.has_value()) { - return absl::nullopt; + return std::nullopt; } auto raw_unblinded_tokens = @@ -135,7 +136,7 @@ absl::optional> BatchDLEQProof::VerifyAndUnblind( if (!raw_unblinded_tokens || tokens.size() != raw_unblinded_tokens->size()) { // An exception is not thrown by FFI if there is a public key mismatch, so // detect this edge case - return absl::nullopt; + return std::nullopt; } return ToUnblindedTokens(std::move(raw_unblinded_tokens).value()); diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/batch_dleq_proof.h b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/batch_dleq_proof.h index 82fbe1c794c..9a00156e318 100644 --- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/batch_dleq_proof.h +++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/batch_dleq_proof.h @@ -6,13 +6,13 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_CHALLENGE_BYPASS_RISTRETTO_BATCH_DLEQ_PROOF_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_CHALLENGE_BYPASS_RISTRETTO_BATCH_DLEQ_PROOF_H_ +#include #include #include #include #include "base/check.h" #include "brave/third_party/challenge_bypass_ristretto_ffi/src/wrapper.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads::cbr { @@ -61,20 +61,20 @@ class BatchDLEQProof { static BatchDLEQProof DecodeBase64( const std::string& batch_dleq_proof_base64); - absl::optional EncodeBase64() const; + std::optional EncodeBase64() const; [[nodiscard]] bool Verify(const std::vector& blinded_tokens, const std::vector& signed_tokens, const PublicKey& public_key); - [[nodiscard]] absl::optional> VerifyAndUnblind( + [[nodiscard]] std::optional> VerifyAndUnblind( const std::vector& tokens, const std::vector& blinded_tokens, const std::vector& signed_tokens, const PublicKey& public_key); private: - absl::optional batch_dleq_proof_; + std::optional batch_dleq_proof_; }; std::ostream& operator<<(std::ostream& os, diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/batch_dleq_proof_unittest.cc b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/batch_dleq_proof_unittest.cc index b726c56b44e..bef1eca9499 100644 --- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/batch_dleq_proof_unittest.cc +++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/batch_dleq_proof_unittest.cc @@ -21,7 +21,6 @@ #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/unblinded_token.h" #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/unblinded_token_unittest_util.h" #include "brave/components/brave_ads/core/internal/common/unittest/unittest_base.h" -#include "third_party/abseil-cpp/absl/types/optional.h" // npm run test -- brave_unit_tests --filter=BraveAds* diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/blinded_token.cc b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/blinded_token.cc index 0a7adb38a5d..c320d5d269a 100644 --- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/blinded_token.cc +++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/blinded_token.cc @@ -5,16 +5,18 @@ #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/blinded_token.h" +#include + #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/challenge_bypass_ristretto_util.h" namespace brave_ads::cbr { namespace { -absl::optional Create( +std::optional Create( const std::string& blinded_token_base64) { if (blinded_token_base64.empty()) { - return absl::nullopt; + return std::nullopt; } return ValueOrLogError( @@ -56,9 +58,9 @@ BlindedToken BlindedToken::DecodeBase64( return BlindedToken(blinded_token_base64); } -absl::optional BlindedToken::EncodeBase64() const { +std::optional BlindedToken::EncodeBase64() const { if (!blinded_token_ || !has_value()) { - return absl::nullopt; + return std::nullopt; } return ValueOrLogError(blinded_token_->encode_base64()); diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/blinded_token.h b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/blinded_token.h index 5c62ed32db8..fec5f131a34 100644 --- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/blinded_token.h +++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/blinded_token.h @@ -6,12 +6,12 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_CHALLENGE_BYPASS_RISTRETTO_BLINDED_TOKEN_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_CHALLENGE_BYPASS_RISTRETTO_BLINDED_TOKEN_H_ +#include #include #include #include "base/check.h" #include "brave/third_party/challenge_bypass_ristretto_ffi/src/wrapper.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads::cbr { @@ -52,10 +52,10 @@ class BlindedToken { } static BlindedToken DecodeBase64(const std::string& blinded_token_base64); - absl::optional EncodeBase64() const; + std::optional EncodeBase64() const; private: - absl::optional blinded_token_; + std::optional blinded_token_; }; std::ostream& operator<<(std::ostream& os, const BlindedToken& blinded_token); diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/blinded_token_unittest.cc b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/blinded_token_unittest.cc index 35f1f0cce3e..78b8265b48a 100644 --- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/blinded_token_unittest.cc +++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/blinded_token_unittest.cc @@ -10,7 +10,6 @@ #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/challenge_bypass_ristretto_unittest_constants.h" #include "brave/components/brave_ads/core/internal/common/unittest/unittest_base.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/abseil-cpp/absl/types/optional.h" // npm run test -- brave_unit_tests --filter=BraveAds* diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/blinded_token_util.cc b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/blinded_token_util.cc index 0227098cd3f..cf9783a7295 100644 --- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/blinded_token_util.cc +++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/blinded_token_util.cc @@ -5,9 +5,10 @@ #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/blinded_token_util.h" +#include + #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/blinded_token.h" #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads::cbr { @@ -18,7 +19,7 @@ std::vector BlindTokens(const std::vector& tokens) { return {}; } - const absl::optional blinded_token = token.Blind(); + const std::optional blinded_token = token.Blind(); if (!blinded_token) { return {}; } diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/challenge_bypass_ristretto_test.cc b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/challenge_bypass_ristretto_test.cc index fb248166a1e..e8c72970fdc 100644 --- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/challenge_bypass_ristretto_test.cc +++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/challenge_bypass_ristretto_test.cc @@ -3,6 +3,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include + #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/batch_dleq_proof.h" #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/blinded_token.h" #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/dleq_proof.h" @@ -15,7 +17,6 @@ #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/verification_key.h" #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/verification_signature.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/abseil-cpp/absl/types/optional.h" // npm run test -- brave_unit_tests --filter=BraveAds* @@ -31,7 +32,7 @@ TEST(BraveAdsChallengeBypassRistrettoTest, ProveAndVerifyUnblindedToken) { EXPECT_TRUE(token.has_value()); // Client prepares a blinding scalar. - const absl::optional blinded_token = token.Blind(); + const std::optional blinded_token = token.Blind(); EXPECT_TRUE(blinded_token); // Server prepares a random signing key. @@ -39,12 +40,12 @@ TEST(BraveAdsChallengeBypassRistrettoTest, ProveAndVerifyUnblindedToken) { EXPECT_TRUE(signing_key.has_value()); // Server signs the blinded token. - const absl::optional signed_token = + const std::optional signed_token = signing_key.Sign(*blinded_token); EXPECT_TRUE(signed_token); // Server returns the associated public key for the signing key. - const absl::optional public_key = signing_key.GetPublicKey(); + const std::optional public_key = signing_key.GetPublicKey(); EXPECT_TRUE(public_key); // Server signs a DLEQ (Discrete Log Equivalence) proof. @@ -63,7 +64,7 @@ TEST(BraveAdsChallengeBypassRistrettoTest, ProveAndVerifyUnblindedToken) { // Client verifies the batch DLEQ proof and uses the blinding scalar to // unblind the returned signed tokens. const std::vector tokens = {token}; - const absl::optional> unblinded_tokens = + const std::optional> unblinded_tokens = batch_dleq_proof.VerifyAndUnblind(tokens, blinded_tokens, signed_tokens, *public_key); EXPECT_TRUE(unblinded_tokens); @@ -71,30 +72,30 @@ TEST(BraveAdsChallengeBypassRistrettoTest, ProveAndVerifyUnblindedToken) { // Redeem unblinded tokens. for (const auto& unblinded_token : *unblinded_tokens) { // Client derives a shared verification key from the unblinded token. - absl::optional verification_key = + std::optional verification_key = unblinded_token.DeriveVerificationKey(); EXPECT_TRUE(verification_key); // Client signs the message using the shared verification key and sends it // to the server as a `signature` in the credential. - const absl::optional verification_signature = + const std::optional verification_signature = verification_key->Sign(kMessage); EXPECT_TRUE(verification_signature); // Client decodes the token preimage from the unblinded token and sends it // to the server as `t` in the credential. - const absl::optional token_preimage = + const std::optional token_preimage = unblinded_token.GetTokenPreimage(); EXPECT_TRUE(token_preimage); // Server rederives the unblinded token using the server signing key and the // token preimage. - const absl::optional rederived_unblinded_token = + const std::optional rederived_unblinded_token = signing_key.RederiveUnblindedToken(*token_preimage); EXPECT_TRUE(rederived_unblinded_token); // Server derives the shared verification key from the unblinded token. - absl::optional shared_verification_key = + std::optional shared_verification_key = rederived_unblinded_token->DeriveVerificationKey(); EXPECT_TRUE(shared_verification_key); diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/challenge_bypass_ristretto_util.h b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/challenge_bypass_ristretto_util.h index 4d741bd4db7..d9485c7b334 100644 --- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/challenge_bypass_ristretto_util.h +++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/challenge_bypass_ristretto_util.h @@ -6,22 +6,22 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_CHALLENGE_BYPASS_RISTRETTO_CHALLENGE_BYPASS_RISTRETTO_UTIL_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_CHALLENGE_BYPASS_RISTRETTO_CHALLENGE_BYPASS_RISTRETTO_UTIL_H_ +#include #include #include #include "base/types/expected.h" #include "brave/components/brave_ads/core/internal/common/logging_util.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads::cbr { template -absl::optional ValueOrLogError(base::expected result) { +std::optional ValueOrLogError(base::expected result) { if (!result.has_value()) { BLOG(1, "Challenge Bypass Ristretto Error: " << result.error()); - return absl::nullopt; + return std::nullopt; } - return absl::make_optional(std::move(result).value()); + return std::make_optional(std::move(result).value()); } } // namespace brave_ads::cbr diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/credential_builder.cc b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/credential_builder.cc index 91215185ec1..ea7de16c315 100644 --- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/credential_builder.cc +++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/credential_builder.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/credential_builder.h" +#include + #include "base/check.h" #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token_preimage.h" #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/unblinded_token.h" @@ -20,40 +22,40 @@ constexpr char kTokenPreimageKey[] = "t"; } // namespace -absl::optional BuildCredential( +std::optional BuildCredential( const UnblindedToken& unblinded_token, const std::string& payload) { CHECK(unblinded_token.has_value()); CHECK(!payload.empty()); - absl::optional verification_key = + std::optional verification_key = unblinded_token.DeriveVerificationKey(); if (!verification_key) { - return absl::nullopt; + return std::nullopt; } - const absl::optional verification_signature = + const std::optional verification_signature = verification_key->Sign(payload); if (!verification_signature) { - return absl::nullopt; + return std::nullopt; } - const absl::optional verification_signature_base64 = + const std::optional verification_signature_base64 = verification_signature->EncodeBase64(); if (!verification_signature_base64) { - return absl::nullopt; + return std::nullopt; } - const absl::optional token_preimage = + const std::optional token_preimage = unblinded_token.GetTokenPreimage(); if (!token_preimage) { - return absl::nullopt; + return std::nullopt; } - const absl::optional token_preimage_base64 = + const std::optional token_preimage_base64 = token_preimage->EncodeBase64(); if (!token_preimage_base64) { - return absl::nullopt; + return std::nullopt; } return base::Value::Dict() diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/credential_builder.h b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/credential_builder.h index 633b8319ee4..d79fe0f1628 100644 --- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/credential_builder.h +++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/credential_builder.h @@ -6,16 +6,16 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_CHALLENGE_BYPASS_RISTRETTO_CREDENTIAL_BUILDER_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_CHALLENGE_BYPASS_RISTRETTO_CREDENTIAL_BUILDER_H_ +#include #include #include "base/values.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads::cbr { class UnblindedToken; -absl::optional BuildCredential( +std::optional BuildCredential( const UnblindedToken& unblinded_token, const std::string& payload); diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/credential_builder_unittest.cc b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/credential_builder_unittest.cc index 63baa2ab602..7f8499d2506 100644 --- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/credential_builder_unittest.cc +++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/credential_builder_unittest.cc @@ -5,11 +5,12 @@ #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/credential_builder.h" +#include + #include "base/test/values_test_util.h" #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/challenge_bypass_ristretto_unittest_constants.h" #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/unblinded_token.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/abseil-cpp/absl/types/optional.h" // npm run test -- brave_unit_tests --filter=BraveAds* @@ -19,7 +20,7 @@ TEST(BraveAdsChallengeBypassRistrettoTest, BuildCredential) { // Arrange // Act - const absl::optional credential = + const std::optional credential = BuildCredential(UnblindedToken(kUnblindedTokenBase64), /*payload=*/"definition: the weight of a payload"); ASSERT_TRUE(credential); diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/dleq_proof.cc b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/dleq_proof.cc index 08f645d4e90..53794b430c4 100644 --- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/dleq_proof.cc +++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/dleq_proof.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/dleq_proof.h" +#include + #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/blinded_token.h" #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/challenge_bypass_ristretto_util.h" #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/public_key.h" @@ -15,23 +17,23 @@ namespace brave_ads::cbr { namespace { -absl::optional Create( +std::optional Create( const BlindedToken& blinded_token, const SignedToken& signed_token, const SigningKey& signing_key) { if (!blinded_token.has_value() || !signed_token.has_value() || !signing_key.has_value()) { - return absl::nullopt; + return std::nullopt; } return ValueOrLogError(challenge_bypass_ristretto::DLEQProof::Create( blinded_token.get(), signed_token.get(), signing_key.get())); } -absl::optional Create( +std::optional Create( const std::string& dleq_proof_base64) { if (dleq_proof_base64.empty()) { - return absl::nullopt; + return std::nullopt; } return ValueOrLogError( @@ -64,9 +66,9 @@ DLEQProof DLEQProof::DecodeBase64(const std::string& dleq_proof_base64) { return DLEQProof(dleq_proof_base64); } -absl::optional DLEQProof::EncodeBase64() const { +std::optional DLEQProof::EncodeBase64() const { if (!dleq_proof_ || !has_value()) { - return absl::nullopt; + return std::nullopt; } return ValueOrLogError(dleq_proof_->encode_base64()); diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/dleq_proof.h b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/dleq_proof.h index 5fb4106c57a..7963078dd0c 100644 --- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/dleq_proof.h +++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/dleq_proof.h @@ -6,12 +6,12 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_CHALLENGE_BYPASS_RISTRETTO_DLEQ_PROOF_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_CHALLENGE_BYPASS_RISTRETTO_DLEQ_PROOF_H_ +#include #include #include #include "base/check.h" #include "brave/third_party/challenge_bypass_ristretto_ffi/src/wrapper.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads::cbr { @@ -55,14 +55,14 @@ class DLEQProof { } static DLEQProof DecodeBase64(const std::string& dleq_proof_base64); - absl::optional EncodeBase64() const; + std::optional EncodeBase64() const; [[nodiscard]] bool Verify(const BlindedToken& blinded_token, const SignedToken& signed_token, const PublicKey& public_key); private: - absl::optional dleq_proof_; + std::optional dleq_proof_; }; std::ostream& operator<<(std::ostream& os, const DLEQProof& dleq_proof); diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/public_key.cc b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/public_key.cc index d4cbae0c012..e110d8104b8 100644 --- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/public_key.cc +++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/public_key.cc @@ -5,16 +5,18 @@ #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/public_key.h" +#include + #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/challenge_bypass_ristretto_util.h" namespace brave_ads::cbr { namespace { -absl::optional Create( +std::optional Create( const std::string& public_key_base64) { if (public_key_base64.empty()) { - return absl::nullopt; + return std::nullopt; } return ValueOrLogError( @@ -53,9 +55,9 @@ PublicKey PublicKey::DecodeBase64(const std::string& public_key_base64) { return PublicKey(public_key_base64); } -absl::optional PublicKey::EncodeBase64() const { +std::optional PublicKey::EncodeBase64() const { if (!public_key_ || !has_value()) { - return absl::nullopt; + return std::nullopt; } return ValueOrLogError(public_key_->encode_base64()); diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/public_key.h b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/public_key.h index b73c525c013..5804c440e20 100644 --- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/public_key.h +++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/public_key.h @@ -6,12 +6,12 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_CHALLENGE_BYPASS_RISTRETTO_PUBLIC_KEY_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_CHALLENGE_BYPASS_RISTRETTO_PUBLIC_KEY_H_ +#include #include #include #include "base/check.h" #include "brave/third_party/challenge_bypass_ristretto_ffi/src/wrapper.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads::cbr { @@ -47,10 +47,10 @@ class PublicKey { } static PublicKey DecodeBase64(const std::string& public_key_base64); - absl::optional EncodeBase64() const; + std::optional EncodeBase64() const; private: - absl::optional public_key_; + std::optional public_key_; }; std::ostream& operator<<(std::ostream& os, const PublicKey& public_key); diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/signed_token.cc b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/signed_token.cc index a8a4bd560c1..2c982921235 100644 --- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/signed_token.cc +++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/signed_token.cc @@ -5,16 +5,18 @@ #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/signed_token.h" +#include + #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/challenge_bypass_ristretto_util.h" namespace brave_ads::cbr { namespace { -absl::optional Create( +std::optional Create( const std::string& signed_token_base64) { if (signed_token_base64.empty()) { - return absl::nullopt; + return std::nullopt; } return ValueOrLogError(challenge_bypass_ristretto::SignedToken::decode_base64( @@ -54,9 +56,9 @@ SignedToken SignedToken::DecodeBase64(const std::string& signed_token_base64) { return SignedToken(signed_token_base64); } -absl::optional SignedToken::EncodeBase64() const { +std::optional SignedToken::EncodeBase64() const { if (!signed_token_ || !has_value()) { - return absl::nullopt; + return std::nullopt; } return ValueOrLogError(signed_token_->encode_base64()); } diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/signed_token.h b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/signed_token.h index 89986743ebf..54d09e09417 100644 --- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/signed_token.h +++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/signed_token.h @@ -6,12 +6,12 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_CHALLENGE_BYPASS_RISTRETTO_SIGNED_TOKEN_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_CHALLENGE_BYPASS_RISTRETTO_SIGNED_TOKEN_H_ +#include #include #include #include "base/check.h" #include "brave/third_party/challenge_bypass_ristretto_ffi/src/wrapper.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads::cbr { @@ -48,10 +48,10 @@ class SignedToken { } static SignedToken DecodeBase64(const std::string& signed_token_base64); - absl::optional EncodeBase64() const; + std::optional EncodeBase64() const; private: - absl::optional signed_token_; + std::optional signed_token_; }; std::ostream& operator<<(std::ostream& os, const SignedToken& signed_token); diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/signing_key.cc b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/signing_key.cc index 681829d7fed..c5822a6f5a0 100644 --- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/signing_key.cc +++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/signing_key.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/signing_key.h" +#include + #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/blinded_token.h" #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/challenge_bypass_ristretto_util.h" #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/public_key.h" @@ -16,10 +18,10 @@ namespace brave_ads::cbr { namespace { -absl::optional Create( +std::optional Create( const std::string& signing_key_base64) { if (signing_key_base64.empty()) { - return absl::nullopt; + return std::nullopt; } return ValueOrLogError(challenge_bypass_ristretto::SigningKey::decode_base64( @@ -53,28 +55,28 @@ SigningKey SigningKey::DecodeBase64(const std::string& signing_key_base64) { return SigningKey(signing_key_base64); } -absl::optional SigningKey::EncodeBase64() const { +std::optional SigningKey::EncodeBase64() const { if (!signing_key_ || !has_value()) { - return absl::nullopt; + return std::nullopt; } return ValueOrLogError(signing_key_->encode_base64()); } -absl::optional SigningKey::Sign( +std::optional SigningKey::Sign( const BlindedToken& blinded_token) const { if (!signing_key_ || !has_value() || !blinded_token.has_value()) { - return absl::nullopt; + return std::nullopt; } return ValueOrLogError( signing_key_->sign(blinded_token.get())); } -absl::optional SigningKey::RederiveUnblindedToken( +std::optional SigningKey::RederiveUnblindedToken( const TokenPreimage& token_preimage) { if (!signing_key_ || !has_value() || !token_preimage.has_value()) { - return absl::nullopt; + return std::nullopt; } return ValueOrLogError SigningKey::RederiveUnblindedToken( signing_key_->rederive_unblinded_token(token_preimage.get())); } -absl::optional SigningKey::GetPublicKey() { +std::optional SigningKey::GetPublicKey() { if (!signing_key_ || !has_value()) { - return absl::nullopt; + return std::nullopt; } return PublicKey(signing_key_->public_key()); diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/signing_key.h b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/signing_key.h index 3416b79d186..cff1139599d 100644 --- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/signing_key.h +++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/signing_key.h @@ -6,12 +6,12 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_CHALLENGE_BYPASS_RISTRETTO_SIGNING_KEY_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_CHALLENGE_BYPASS_RISTRETTO_SIGNING_KEY_H_ +#include #include #include #include "base/check.h" #include "brave/third_party/challenge_bypass_ristretto_ffi/src/wrapper.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads::cbr { @@ -55,17 +55,17 @@ class SigningKey { } static SigningKey DecodeBase64(const std::string& signing_key_base64); - absl::optional EncodeBase64() const; + std::optional EncodeBase64() const; - absl::optional Sign(const BlindedToken& blinded_token) const; + std::optional Sign(const BlindedToken& blinded_token) const; - absl::optional RederiveUnblindedToken( + std::optional RederiveUnblindedToken( const TokenPreimage& token_preimage); - absl::optional GetPublicKey(); + std::optional GetPublicKey(); private: - absl::optional signing_key_; + std::optional signing_key_; }; std::ostream& operator<<(std::ostream& os, const SigningKey& signing_key); diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token.cc b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token.cc index 1ea537a25f9..40f44c81813 100644 --- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token.cc +++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token.h" +#include + #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/blinded_token.h" #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/challenge_bypass_ristretto_util.h" @@ -12,10 +14,10 @@ namespace brave_ads::cbr { namespace { -absl::optional Create( +std::optional Create( const std::string& token_base64) { if (token_base64.empty()) { - return absl::nullopt; + return std::nullopt; } return ValueOrLogError( @@ -51,17 +53,17 @@ Token Token::DecodeBase64(const std::string& token_base64) { return Token(token_base64); } -absl::optional Token::EncodeBase64() const { +std::optional Token::EncodeBase64() const { if (!token_ || !has_value()) { - return absl::nullopt; + return std::nullopt; } return ValueOrLogError(token_->encode_base64()); } -absl::optional Token::Blind() { +std::optional Token::Blind() { if (!token_ || !has_value()) { - return absl::nullopt; + return std::nullopt; } return ValueOrLogError #include #include #include "base/check.h" #include "brave/third_party/challenge_bypass_ristretto_ffi/src/wrapper.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads::cbr { @@ -50,12 +50,12 @@ class Token { } static Token DecodeBase64(const std::string& token_base64); - absl::optional EncodeBase64() const; + std::optional EncodeBase64() const; - absl::optional Blind(); + std::optional Blind(); private: - absl::optional token_; + std::optional token_; }; std::ostream& operator<<(std::ostream& os, const Token& token); diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token_preimage.cc b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token_preimage.cc index 47096741bc5..34f7c86b625 100644 --- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token_preimage.cc +++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token_preimage.cc @@ -5,16 +5,18 @@ #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token_preimage.h" +#include + #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/challenge_bypass_ristretto_util.h" namespace brave_ads::cbr { namespace { -absl::optional Create( +std::optional Create( const std::string& token_preimage_base64) { if (token_preimage_base64.empty()) { - return absl::nullopt; + return std::nullopt; } return ValueOrLogError( @@ -57,9 +59,9 @@ TokenPreimage TokenPreimage::DecodeBase64( return TokenPreimage(token_preimage_base64); } -absl::optional TokenPreimage::EncodeBase64() const { +std::optional TokenPreimage::EncodeBase64() const { if (!token_preimage_ || !has_value()) { - return absl::nullopt; + return std::nullopt; } return ValueOrLogError(token_preimage_->encode_base64()); diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token_preimage.h b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token_preimage.h index 1ceab458d98..ed42790453e 100644 --- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token_preimage.h +++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token_preimage.h @@ -6,12 +6,12 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_CHALLENGE_BYPASS_RISTRETTO_TOKEN_PREIMAGE_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_CHALLENGE_BYPASS_RISTRETTO_TOKEN_PREIMAGE_H_ +#include #include #include #include "base/check.h" #include "brave/third_party/challenge_bypass_ristretto_ffi/src/wrapper.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads::cbr { @@ -52,10 +52,10 @@ class TokenPreimage { } static TokenPreimage DecodeBase64(const std::string& token_preimage_base64); - absl::optional EncodeBase64() const; + std::optional EncodeBase64() const; private: - absl::optional token_preimage_; + std::optional token_preimage_; }; std::ostream& operator<<(std::ostream& os, const TokenPreimage& token_preimage); diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/unblinded_token.cc b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/unblinded_token.cc index 8c338dfd580..50b6525ef9f 100644 --- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/unblinded_token.cc +++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/unblinded_token.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/unblinded_token.h" +#include + #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/challenge_bypass_ristretto_util.h" #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token_preimage.h" #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/verification_key.h" @@ -13,10 +15,10 @@ namespace brave_ads::cbr { namespace { -absl::optional Create( +std::optional Create( const std::string& unblinded_token_base64) { if (unblinded_token_base64.empty()) { - return absl::nullopt; + return std::nullopt; } return ValueOrLogError( @@ -60,25 +62,25 @@ UnblindedToken UnblindedToken::DecodeBase64( return UnblindedToken(unblinded_token_base64); } -absl::optional UnblindedToken::EncodeBase64() const { +std::optional UnblindedToken::EncodeBase64() const { if (!unblinded_token_ || !has_value()) { - return absl::nullopt; + return std::nullopt; } return ValueOrLogError(unblinded_token_->encode_base64()); } -absl::optional UnblindedToken::DeriveVerificationKey() const { +std::optional UnblindedToken::DeriveVerificationKey() const { if (!unblinded_token_ || !has_value()) { - return absl::nullopt; + return std::nullopt; } return VerificationKey(unblinded_token_->derive_verification_key()); } -absl::optional UnblindedToken::GetTokenPreimage() const { +std::optional UnblindedToken::GetTokenPreimage() const { if (!unblinded_token_ || !has_value()) { - return absl::nullopt; + return std::nullopt; } return TokenPreimage(unblinded_token_->preimage()); diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/unblinded_token.h b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/unblinded_token.h index ddbb210a68c..2a6b6eb9e65 100644 --- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/unblinded_token.h +++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/unblinded_token.h @@ -6,12 +6,12 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_CHALLENGE_BYPASS_RISTRETTO_UNBLINDED_TOKEN_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_CHALLENGE_BYPASS_RISTRETTO_UNBLINDED_TOKEN_H_ +#include #include #include #include "base/check.h" #include "brave/third_party/challenge_bypass_ristretto_ffi/src/wrapper.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads::cbr { @@ -55,14 +55,14 @@ class UnblindedToken { } static UnblindedToken DecodeBase64(const std::string& unblinded_token_base64); - absl::optional EncodeBase64() const; + std::optional EncodeBase64() const; - absl::optional DeriveVerificationKey() const; + std::optional DeriveVerificationKey() const; - absl::optional GetTokenPreimage() const; + std::optional GetTokenPreimage() const; private: - absl::optional unblinded_token_; + std::optional unblinded_token_; }; std::ostream& operator<<(std::ostream& os, diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/verification_key.cc b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/verification_key.cc index aac956023d4..032e67cce27 100644 --- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/verification_key.cc +++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/verification_key.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/verification_key.h" +#include + #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/challenge_bypass_ristretto_util.h" #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/verification_signature.h" @@ -14,7 +16,7 @@ VerificationKey::VerificationKey( const challenge_bypass_ristretto::VerificationKey& verification_key) : verification_key_(verification_key) {} -absl::optional VerificationKey::Sign( +std::optional VerificationKey::Sign( const std::string& message) { return ValueOrLogError( diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/verification_key.h b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/verification_key.h index 9f772e47655..166eb1e0148 100644 --- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/verification_key.h +++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/verification_key.h @@ -6,10 +6,10 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_CHALLENGE_BYPASS_RISTRETTO_VERIFICATION_KEY_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_CHALLENGE_BYPASS_RISTRETTO_VERIFICATION_KEY_H_ +#include #include #include "brave/third_party/challenge_bypass_ristretto_ffi/src/wrapper.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads::cbr { @@ -31,7 +31,7 @@ class VerificationKey { return verification_key_; } - absl::optional Sign(const std::string& message); + std::optional Sign(const std::string& message); [[nodiscard]] bool Verify(const VerificationSignature& verification_signature, const std::string& message); diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/verification_key_unittest_util.cc b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/verification_key_unittest_util.cc index 1900801cd24..2c34b191155 100644 --- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/verification_key_unittest_util.cc +++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/verification_key_unittest_util.cc @@ -5,18 +5,18 @@ #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/verification_key_unittest_util.h" -#include "base/check.h" +#include +#include "base/check.h" #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/unblinded_token.h" #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/unblinded_token_unittest_util.h" #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/verification_key.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads::cbr::test { VerificationKey GetVerificationKey() { const UnblindedToken unblinded_token = GetUnblindedToken(); - const absl::optional verification_key = + const std::optional verification_key = unblinded_token.DeriveVerificationKey(); CHECK(verification_key); return *verification_key; diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/verification_signature.cc b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/verification_signature.cc index 8a95acce4b5..2445a03bbec 100644 --- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/verification_signature.cc +++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/verification_signature.cc @@ -5,16 +5,18 @@ #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/verification_signature.h" +#include + #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/challenge_bypass_ristretto_util.h" namespace brave_ads::cbr { namespace { -absl::optional Create( +std::optional Create( const std::string& verification_signature_base64) { if (verification_signature_base64.empty()) { - return absl::nullopt; + return std::nullopt; } return ValueOrLogError( @@ -64,9 +66,9 @@ VerificationSignature VerificationSignature::DecodeBase64( return VerificationSignature(verification_signature_base64); } -absl::optional VerificationSignature::EncodeBase64() const { +std::optional VerificationSignature::EncodeBase64() const { if (!verification_signature_ || !has_value()) { - return absl::nullopt; + return std::nullopt; } return ValueOrLogError(verification_signature_->encode_base64()); diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/verification_signature.h b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/verification_signature.h index 763772d4d82..2c714ab6173 100644 --- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/verification_signature.h +++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/verification_signature.h @@ -6,12 +6,12 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_CHALLENGE_BYPASS_RISTRETTO_VERIFICATION_SIGNATURE_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_CHALLENGE_BYPASS_RISTRETTO_VERIFICATION_SIGNATURE_H_ +#include #include #include #include "base/check.h" #include "brave/third_party/challenge_bypass_ristretto_ffi/src/wrapper.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads::cbr { @@ -54,10 +54,10 @@ class VerificationSignature { static VerificationSignature DecodeBase64( const std::string& verification_signature_base64); - absl::optional EncodeBase64() const; + std::optional EncodeBase64() const; private: - absl::optional + std::optional verification_signature_; }; diff --git a/components/brave_ads/core/internal/common/country_code/country_code.cc b/components/brave_ads/core/internal/common/country_code/country_code.cc index 92d79191ac3..ebdecafc656 100644 --- a/components/brave_ads/core/internal/common/country_code/country_code.cc +++ b/components/brave_ads/core/internal/common/country_code/country_code.cc @@ -5,13 +5,14 @@ #include "brave/components/brave_ads/core/internal/common/country_code/country_code.h" +#include + #include "brave/components/brave_ads/core/internal/client/ads_client_util.h" #include "brave/components/brave_ads/core/internal/common/subdivision/subdivision_util.h" #include "brave/components/brave_ads/core/internal/settings/settings.h" #include "brave/components/brave_rewards/common/pref_names.h" #include "brave/components/l10n/common/locale_util.h" #include "brave/components/l10n/common/prefs.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -47,7 +48,7 @@ void CountryCode::OnNotifyPrefDidChange(const std::string& path) { } void CountryCode::OnDidUpdateSubdivision(const std::string& subdivision) { - absl::optional subdivision_country_code = + std::optional subdivision_country_code = GetSubdivisionCountryCode(subdivision); if (!subdivision_country_code || subdivision_country_code->empty()) { return; diff --git a/components/brave_ads/core/internal/common/country_code/country_code_unittest.cc b/components/brave_ads/core/internal/common/country_code/country_code_unittest.cc index a64c7dfb0a9..f9e544c705a 100644 --- a/components/brave_ads/core/internal/common/country_code/country_code_unittest.cc +++ b/components/brave_ads/core/internal/common/country_code/country_code_unittest.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_ads/core/internal/common/country_code/country_code.h" #include +#include #include "brave/components/brave_ads/core/internal/client/ads_client_util.h" #include "brave/components/brave_ads/core/internal/common/subdivision/subdivision.h" @@ -18,7 +19,6 @@ #include "brave/components/brave_rewards/common/pref_names.h" #include "brave/components/l10n/common/prefs.h" #include "net/http/http_status_code.h" -#include "third_party/abseil-cpp/absl/types/optional.h" // npm run test -- brave_unit_tests --filter=BraveAds* @@ -26,7 +26,7 @@ namespace brave_ads { namespace { -absl::optional GetCountryCode() { +std::optional GetCountryCode() { return GetLocalStateStringPref(brave_l10n::prefs::kCountryCode); } diff --git a/components/brave_ads/core/internal/common/crypto/crypto_util.cc b/components/brave_ads/core/internal/common/crypto/crypto_util.cc index 88bd587c3d5..f227a0e24e9 100644 --- a/components/brave_ads/core/internal/common/crypto/crypto_util.cc +++ b/components/brave_ads/core/internal/common/crypto/crypto_util.cc @@ -8,7 +8,9 @@ #include #include #include + #include +#include #include "base/base64.h" #include "base/ranges/algorithm.h" @@ -30,7 +32,7 @@ constexpr uint8_t kHKDFSalt[] = { 246, 105, 20, 215, 5, 248, 154, 179, 191, 46, 17, 6, 72, 210, 91, 10, 169, 145, 248, 22, 147, 117, 24, 105, 12}; -absl::optional> GetHKDF( +std::optional> GetHKDF( const std::vector& secret) { CHECK(!secret.empty()); @@ -41,7 +43,7 @@ absl::optional> GetHKDF( if (HKDF(derived_key.data(), kHKDFSeedLength, EVP_sha512(), secret.data(), secret.size(), kHKDFSalt, std::size(kHKDFSalt), kInfo, sizeof(kInfo) / sizeof(kInfo[0])) == 0) { - return absl::nullopt; + return std::nullopt; } return derived_key; @@ -71,15 +73,15 @@ std::vector Sha256(const std::string& value) { return hash; } -absl::optional GenerateSignKeyPairFromSeed( +std::optional GenerateSignKeyPairFromSeed( const std::vector& seed) { if (seed.empty()) { - return absl::nullopt; + return std::nullopt; } - const absl::optional> derived_key = GetHKDF(seed); + const std::optional> derived_key = GetHKDF(seed); if (!derived_key) { - return absl::nullopt; + return std::nullopt; } return GenerateSignKeyPairFromSecret(*derived_key); @@ -103,12 +105,12 @@ std::vector GenerateRandomNonce() { return nonce; } -absl::optional Sign(const std::string& message, - const std::string& secret_key) { - const absl::optional> raw_secret_key = +std::optional Sign(const std::string& message, + const std::string& secret_key) { + const std::optional> raw_secret_key = base::Base64Decode(secret_key); if (!raw_secret_key) { - return absl::nullopt; + return std::nullopt; } const std::vector raw_message(message.begin(), message.end()); @@ -117,7 +119,7 @@ absl::optional Sign(const std::string& message, raw_signature.resize(ED25519_SIGNATURE_LEN); if (ED25519_sign(raw_signature.data(), raw_message.data(), raw_message.size(), raw_secret_key->data()) == 0) { - return absl::nullopt; + return std::nullopt; } return base::Base64Encode(raw_signature); @@ -126,13 +128,13 @@ absl::optional Sign(const std::string& message, bool Verify(const std::string& message, const std::string& public_key, const std::string& signature) { - const absl::optional> raw_public_key = + const std::optional> raw_public_key = base::Base64Decode(public_key); if (!raw_public_key) { return false; } - const absl::optional> raw_signature = + const std::optional> raw_signature = base::Base64Decode(signature); if (!raw_signature) { return false; diff --git a/components/brave_ads/core/internal/common/crypto/crypto_util.h b/components/brave_ads/core/internal/common/crypto/crypto_util.h index 31e046ea93d..69e9c41fd97 100644 --- a/components/brave_ads/core/internal/common/crypto/crypto_util.h +++ b/components/brave_ads/core/internal/common/crypto/crypto_util.h @@ -7,10 +7,10 @@ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_CRYPTO_CRYPTO_UTIL_H_ #include +#include #include #include -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads::crypto { @@ -18,14 +18,14 @@ struct KeyPairInfo; std::vector Sha256(const std::string& value); -absl::optional GenerateSignKeyPairFromSeed( +std::optional GenerateSignKeyPairFromSeed( const std::vector& seed); KeyPairInfo GenerateBoxKeyPair(); std::vector GenerateRandomNonce(); -absl::optional Sign(const std::string& message, - const std::string& secret_key); +std::optional Sign(const std::string& message, + const std::string& secret_key); [[nodiscard]] bool Verify(const std::string& message, const std::string& public_key, const std::string& signature); diff --git a/components/brave_ads/core/internal/common/crypto/crypto_util_unittest.cc b/components/brave_ads/core/internal/common/crypto/crypto_util_unittest.cc index fd8464855ee..aa85353eb26 100644 --- a/components/brave_ads/core/internal/common/crypto/crypto_util_unittest.cc +++ b/components/brave_ads/core/internal/common/crypto/crypto_util_unittest.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/common/crypto/crypto_util.h" +#include + #include "base/base64.h" #include "brave/components/brave_ads/core/internal/common/crypto/key_pair_info.h" #include "testing/gtest/include/gtest/gtest.h" @@ -43,12 +45,12 @@ TEST(BraveAdsCryptoUtilTest, Sha256WithEmptyString) { TEST(BraveAdsCryptoUtilTest, GenerateSignKeyPairFromSeed) { // Arrange - const absl::optional> seed = + const std::optional> seed = base::Base64Decode("x5uBvgI5MTTVY6sjGv65e9EHr8v7i+UxkFB9qVc5fP0="); ASSERT_TRUE(seed); // Act - const absl::optional key_pair = + const std::optional key_pair = GenerateSignKeyPairFromSeed(*seed); ASSERT_TRUE(key_pair); @@ -82,7 +84,7 @@ TEST(BraveAdsCryptoUtilTest, GenerateRandomNonce) { TEST(BraveAdsCryptoUtilTest, Sign) { // Act & Assert - const absl::optional signature = Sign(kMessage, kSecretKey); + const std::optional signature = Sign(kMessage, kSecretKey); EXPECT_TRUE(signature); EXPECT_TRUE(Verify(kMessage, kPublicKey, *signature)); } diff --git a/components/brave_ads/core/internal/common/random/random_util.cc b/components/brave_ads/core/internal/common/random/random_util.cc index f419f2cf624..338b0d2ef07 100644 --- a/components/brave_ads/core/internal/common/random/random_util.cc +++ b/components/brave_ads/core/internal/common/random/random_util.cc @@ -5,14 +5,15 @@ #include "brave/components/brave_ads/core/internal/common/random/random_util.h" +#include + #include "base/time/time.h" #include "brave_base/random.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { namespace { -absl::optional g_rand_time_delta_for_testing; +std::optional g_rand_time_delta_for_testing; } // namespace base::TimeDelta RandTimeDelta(const base::TimeDelta time_delta) { @@ -29,7 +30,7 @@ ScopedRandTimeDeltaSetterForTesting::ScopedRandTimeDeltaSetterForTesting( } ScopedRandTimeDeltaSetterForTesting::~ScopedRandTimeDeltaSetterForTesting() { - g_rand_time_delta_for_testing = absl::nullopt; + g_rand_time_delta_for_testing = std::nullopt; } } // namespace brave_ads diff --git a/components/brave_ads/core/internal/common/resources/resources_util_impl.h b/components/brave_ads/core/internal/common/resources/resources_util_impl.h index 5fc3d894012..ef7f8ff493a 100644 --- a/components/brave_ads/core/internal/common/resources/resources_util_impl.h +++ b/components/brave_ads/core/internal/common/resources/resources_util_impl.h @@ -6,8 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_RESOURCES_RESOURCES_UTIL_IMPL_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_RESOURCES_RESOURCES_UTIL_IMPL_H_ -#include "brave/components/brave_ads/core/internal/common/resources/resources_util.h" - +#include #include #include @@ -17,7 +16,7 @@ #include "base/task/thread_pool.h" #include "base/types/expected.h" #include "base/values.h" -#include "third_party/abseil-cpp/absl/types/optional.h" +#include "brave/components/brave_ads/core/internal/common/resources/resources_util.h" namespace base { class File; @@ -32,7 +31,7 @@ base::expected ReadFileAndParseResourceOnBackgroundThread( return base::ok(T{}); } - absl::optional dict; + std::optional dict; { // `content` can be up to 10 MB, so we keep the scope of this object to this // block to release its memory as soon as possible. diff --git a/components/brave_ads/core/internal/common/search_engine/search_engine_results_page_util.cc b/components/brave_ads/core/internal/common/search_engine/search_engine_results_page_util.cc index fe13dc4935c..26d43dd01e7 100644 --- a/components/brave_ads/core/internal/common/search_engine/search_engine_results_page_util.cc +++ b/components/brave_ads/core/internal/common/search_engine/search_engine_results_page_util.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/common/search_engine/search_engine_results_page_util.h" +#include #include #include "brave/components/brave_ads/core/internal/common/search_engine/search_engine_constants.h" @@ -18,9 +19,9 @@ namespace brave_ads { namespace { -absl::optional FindSearchEngineResultsPage(const GURL& url) { +std::optional FindSearchEngineResultsPage(const GURL& url) { if (!url.is_valid()) { - return absl::nullopt; + return std::nullopt; } const GURL url_with_empty_query = GetUrlWithEmptyQuery(url); @@ -32,13 +33,13 @@ absl::optional FindSearchEngineResultsPage(const GURL& url) { } } - return absl::nullopt; + return std::nullopt; } } // namespace bool IsSearchEngineResultsPage(const GURL& url) { - const absl::optional search_engine = + const std::optional search_engine = FindSearchEngineResultsPage(url); if (!search_engine) { return false; @@ -55,17 +56,17 @@ bool IsSearchEngineResultsPage(const GURL& url) { &search_term_query_value); } -absl::optional ExtractSearchTermQueryValue(const GURL& url) { - const absl::optional search_engine = +std::optional ExtractSearchTermQueryValue(const GURL& url) { + const std::optional search_engine = FindSearchEngineResultsPage(url); if (!search_engine) { - return absl::nullopt; + return std::nullopt; } std::string search_term_query_value; if (!net::GetValueForKeyInQuery(url, search_engine->search_term_query_key, &search_term_query_value)) { - return absl::nullopt; + return std::nullopt; } return search_term_query_value; diff --git a/components/brave_ads/core/internal/common/search_engine/search_engine_results_page_util.h b/components/brave_ads/core/internal/common/search_engine/search_engine_results_page_util.h index fa2604a8542..f6390e9b5cf 100644 --- a/components/brave_ads/core/internal/common/search_engine/search_engine_results_page_util.h +++ b/components/brave_ads/core/internal/common/search_engine/search_engine_results_page_util.h @@ -6,9 +6,9 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_SEARCH_ENGINE_SEARCH_ENGINE_RESULTS_PAGE_UTIL_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_SEARCH_ENGINE_SEARCH_ENGINE_RESULTS_PAGE_UTIL_H_ +#include #include -#include "third_party/abseil-cpp/absl/types/optional.h" class GURL; @@ -16,7 +16,7 @@ namespace brave_ads { bool IsSearchEngineResultsPage(const GURL& url); -absl::optional ExtractSearchTermQueryValue(const GURL& url); +std::optional ExtractSearchTermQueryValue(const GURL& url); } // namespace brave_ads diff --git a/components/brave_ads/core/internal/common/search_engine/search_engine_results_page_util_unittest.cc b/components/brave_ads/core/internal/common/search_engine/search_engine_results_page_util_unittest.cc index c238cb311bb..5e5cfd8916c 100644 --- a/components/brave_ads/core/internal/common/search_engine/search_engine_results_page_util_unittest.cc +++ b/components/brave_ads/core/internal/common/search_engine/search_engine_results_page_util_unittest.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/common/search_engine/search_engine_results_page_util.h" +#include + #include "brave/components/brave_ads/core/internal/common/search_engine/search_engine_results_page_unittest_constants.h" #include "testing/gtest/include/gtest/gtest.h" #include "url/gurl.h" @@ -34,7 +36,7 @@ TEST(BraveAdsSearchEngineResultsPageUtilTest, TEST(BraveAdsSearchEngineResultsPageUtilTest, ExtractSearchTermQueryValue) { // Act & Assert for (const auto& url : GetSearchEngineResultsPageUrls()) { - const absl::optional search_term_query_value = + const std::optional search_term_query_value = ExtractSearchTermQueryValue(url); if (search_term_query_value) { EXPECT_EQ("foobar", search_term_query_value); diff --git a/components/brave_ads/core/internal/common/search_engine/search_engine_util.cc b/components/brave_ads/core/internal/common/search_engine/search_engine_util.cc index 19430380f70..1657b403ef8 100644 --- a/components/brave_ads/core/internal/common/search_engine/search_engine_util.cc +++ b/components/brave_ads/core/internal/common/search_engine/search_engine_util.cc @@ -5,11 +5,11 @@ #include "brave/components/brave_ads/core/internal/common/search_engine/search_engine_util.h" +#include #include #include "brave/components/brave_ads/core/internal/common/search_engine/search_engine_constants.h" #include "brave/components/brave_ads/core/internal/common/search_engine/search_engine_info.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/re2/src/re2/re2.h" #include "url/gurl.h" @@ -17,9 +17,9 @@ namespace brave_ads { namespace { -absl::optional FindSearchEngine(const GURL& url) { +std::optional FindSearchEngine(const GURL& url) { if (!url.is_valid()) { - return absl::nullopt; + return std::nullopt; } const GURL url_with_empty_path = url.GetWithEmptyPath(); @@ -31,7 +31,7 @@ absl::optional FindSearchEngine(const GURL& url) { } } - return absl::nullopt; + return std::nullopt; } } // namespace diff --git a/components/brave_ads/core/internal/common/subdivision/subdivision.cc b/components/brave_ads/core/internal/common/subdivision/subdivision.cc index 2b6cbff9598..d1b11db52a6 100644 --- a/components/brave_ads/core/internal/common/subdivision/subdivision.cc +++ b/components/brave_ads/core/internal/common/subdivision/subdivision.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/common/subdivision/subdivision.h" +#include + #include "brave/components/brave_ads/core/internal/client/ads_client_util.h" #include "brave/components/brave_ads/core/internal/common/logging_util.h" #include "brave/components/brave_ads/core/internal/common/subdivision/subdivision_util.h" @@ -12,7 +14,6 @@ #include "brave/components/brave_ads/core/internal/settings/settings.h" #include "brave/components/brave_news/common/pref_names.h" #include "brave/components/brave_rewards/common/pref_names.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -94,9 +95,9 @@ void Subdivision::OnNotifyPrefDidChange(const std::string& path) { void Subdivision::OnDidFetchSubdivision(const std::string& subdivision) { CHECK(!subdivision.empty()); - const absl::optional country_code = + const std::optional country_code = GetSubdivisionCountryCode(subdivision); - const absl::optional subdivision_code = + const std::optional subdivision_code = GetSubdivisionCode(subdivision); if (!country_code || !subdivision_code) { diff --git a/components/brave_ads/core/internal/common/subdivision/subdivision_util.cc b/components/brave_ads/core/internal/common/subdivision/subdivision_util.cc index 7d4259f24e2..5d58b2419b5 100644 --- a/components/brave_ads/core/internal/common/subdivision/subdivision_util.cc +++ b/components/brave_ads/core/internal/common/subdivision/subdivision_util.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/common/subdivision/subdivision_util.h" +#include #include #include "base/strings/string_split.h" @@ -20,20 +21,20 @@ std::vector SplitComponents(const std::string& subdivision) { } // namespace -absl::optional GetSubdivisionCountryCode( +std::optional GetSubdivisionCountryCode( const std::string& subdivision) { const std::vector components = SplitComponents(subdivision); if (components.size() != 2) { - return absl::nullopt; + return std::nullopt; } return components.front(); } -absl::optional GetSubdivisionCode(const std::string& subdivision) { +std::optional GetSubdivisionCode(const std::string& subdivision) { const std::vector components = SplitComponents(subdivision); if (components.size() != 2) { - return absl::nullopt; + return std::nullopt; } return components.back(); diff --git a/components/brave_ads/core/internal/common/subdivision/subdivision_util.h b/components/brave_ads/core/internal/common/subdivision/subdivision_util.h index 7c3c7634c8f..30ec6d31d67 100644 --- a/components/brave_ads/core/internal/common/subdivision/subdivision_util.h +++ b/components/brave_ads/core/internal/common/subdivision/subdivision_util.h @@ -6,15 +6,15 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_SUBDIVISION_SUBDIVISION_UTIL_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_SUBDIVISION_SUBDIVISION_UTIL_H_ +#include #include -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { -absl::optional GetSubdivisionCountryCode( +std::optional GetSubdivisionCountryCode( const std::string& subdivision); -absl::optional GetSubdivisionCode(const std::string& subdivision); +std::optional GetSubdivisionCode(const std::string& subdivision); } // namespace brave_ads diff --git a/components/brave_ads/core/internal/common/subdivision/url_request/subdivision_url_request.cc b/components/brave_ads/core/internal/common/subdivision/url_request/subdivision_url_request.cc index 196ab482607..38fa027194a 100644 --- a/components/brave_ads/core/internal/common/subdivision/url_request/subdivision_url_request.cc +++ b/components/brave_ads/core/internal/common/subdivision/url_request/subdivision_url_request.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/common/subdivision/url_request/subdivision_url_request.h" +#include #include #include "base/time/time.h" @@ -19,7 +20,6 @@ #include "brave/components/brave_ads/core/internal/flags/debug/debug_flag_util.h" #include "brave/components/brave_ads/core/mojom/brave_ads.mojom.h" #include "net/http/http_status_code.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -80,7 +80,7 @@ void SubdivisionUrlRequest::FetchCallback( } BLOG(1, "Parsing subdivision"); - const absl::optional subdivision = + const std::optional subdivision = json::reader::ParseSubdivision(url_response.body); if (!subdivision) { BLOG(1, "Failed to parse subdivision"); diff --git a/components/brave_ads/core/internal/common/subdivision/url_request/subdivision_url_request_json_reader_util.cc b/components/brave_ads/core/internal/common/subdivision/url_request/subdivision_url_request_json_reader_util.cc index 2a602fa53dc..7dadd9f5f41 100644 --- a/components/brave_ads/core/internal/common/subdivision/url_request/subdivision_url_request_json_reader_util.cc +++ b/components/brave_ads/core/internal/common/subdivision/url_request/subdivision_url_request_json_reader_util.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/common/subdivision/url_request/subdivision_url_request_json_reader_util.h" +#include + #include "base/json/json_reader.h" #include "base/strings/string_util.h" #include "base/values.h" @@ -18,21 +20,21 @@ constexpr char kRegionKey[] = "region"; } // namespace -absl::optional ParseSubdivision(const std::string& json) { - const absl::optional dict = +std::optional ParseSubdivision(const std::string& json) { + const std::optional dict = base::JSONReader::ReadDict(json); if (!dict) { - return absl::nullopt; + return std::nullopt; } const std::string* const country = dict->FindString(kCountryKey); if (!country || country->empty()) { - return absl::nullopt; + return std::nullopt; } const std::string* const region = dict->FindString(kRegionKey); if (!region || region->empty()) { - return absl::nullopt; + return std::nullopt; } return base::ReplaceStringPlaceholders("$1-$2", {*country, *region}, nullptr); diff --git a/components/brave_ads/core/internal/common/subdivision/url_request/subdivision_url_request_json_reader_util.h b/components/brave_ads/core/internal/common/subdivision/url_request/subdivision_url_request_json_reader_util.h index 884f21999e8..4f904c01160 100644 --- a/components/brave_ads/core/internal/common/subdivision/url_request/subdivision_url_request_json_reader_util.h +++ b/components/brave_ads/core/internal/common/subdivision/url_request/subdivision_url_request_json_reader_util.h @@ -6,13 +6,13 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_SUBDIVISION_URL_REQUEST_SUBDIVISION_URL_REQUEST_JSON_READER_UTIL_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_SUBDIVISION_URL_REQUEST_SUBDIVISION_URL_REQUEST_JSON_READER_UTIL_H_ +#include #include -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads::json::reader { -absl::optional ParseSubdivision(const std::string& json); +std::optional ParseSubdivision(const std::string& json); } // namespace brave_ads::json::reader diff --git a/components/brave_ads/core/internal/common/time/time_util_unittest.cc b/components/brave_ads/core/internal/common/time/time_util_unittest.cc index de57eb59ff7..6ae223d4199 100644 --- a/components/brave_ads/core/internal/common/time/time_util_unittest.cc +++ b/components/brave_ads/core/internal/common/time/time_util_unittest.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/common/time/time_util.h" +#include #include #include "base/check.h" @@ -15,7 +16,6 @@ #if BUILDFLAG(IS_LINUX) #include "base/environment.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #endif // BUILDFLAG(IS_LINUX) // npm run test -- brave_unit_tests --filter=BraveAds* @@ -56,7 +56,7 @@ class ScopedLibcTZ { static constexpr char kTZ[] = "TZ"; bool success_ = true; - absl::optional old_timezone_; + std::optional old_timezone_; }; constexpr char ScopedLibcTZ::kTZ[]; diff --git a/components/brave_ads/core/internal/common/timer/timer.cc b/components/brave_ads/core/internal/common/timer/timer.cc index 18706d01aa9..9de1e6c0178 100644 --- a/components/brave_ads/core/internal/common/timer/timer.cc +++ b/components/brave_ads/core/internal/common/timer/timer.cc @@ -5,16 +5,16 @@ #include "brave/components/brave_ads/core/internal/common/timer/timer.h" +#include #include #include "base/time/time.h" #include "brave/components/brave_ads/core/internal/common/random/random_util.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { namespace { -absl::optional g_timer_delay_for_testing; +std::optional g_timer_delay_for_testing; } // namespace Timer::Timer() = default; @@ -65,7 +65,7 @@ ScopedTimerDelaySetterForTesting::ScopedTimerDelaySetterForTesting( } ScopedTimerDelaySetterForTesting::~ScopedTimerDelaySetterForTesting() { - g_timer_delay_for_testing = absl::nullopt; + g_timer_delay_for_testing = std::nullopt; } } // namespace brave_ads diff --git a/components/brave_ads/core/internal/common/unittest/unittest_base_util.cc b/components/brave_ads/core/internal/common/unittest/unittest_base_util.cc index 59e50fc260d..f6a646916e1 100644 --- a/components/brave_ads/core/internal/common/unittest/unittest_base_util.cc +++ b/components/brave_ads/core/internal/common/unittest/unittest_base_util.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/common/unittest/unittest_base_util.h" +#include #include #include #include @@ -30,7 +31,6 @@ #include "brave/components/brave_ads/core/public/database/database.h" #include "brave/components/brave_ads/core/public/flags/flags_util.h" #include "brave/components/brave_ads/core/public/units/notification_ad/notification_ad_info.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -158,7 +158,7 @@ void MockLoad(AdsClientMock& mock, const base::ScopedTempDir& temp_dir) { std::string value; if (!base::ReadFileToString(path, &value)) { - return std::move(callback).Run(absl::nullopt); + return std::move(callback).Run(std::nullopt); } std::move(callback).Run(value); @@ -211,7 +211,7 @@ void MockRunDBTransaction(AdsClientMock& mock, Database& database) { void MockGetProfilePref(const AdsClientMock& mock) { ON_CALL(mock, GetProfilePref) .WillByDefault(::testing::Invoke( - [](const std::string& path) -> absl::optional { + [](const std::string& path) -> std::optional { return GetProfilePrefValue(path); })); } @@ -232,7 +232,7 @@ void MockHasProfilePrefPath(const AdsClientMock& mock) { void MockGetLocalStatePref(const AdsClientMock& mock) { ON_CALL(mock, GetLocalStatePref) .WillByDefault(::testing::Invoke( - [](const std::string& path) -> absl::optional { + [](const std::string& path) -> std::optional { return GetLocalStatePrefValue(path); })); } diff --git a/components/brave_ads/core/internal/common/unittest/unittest_command_line_switch_util.cc b/components/brave_ads/core/internal/common/unittest/unittest_command_line_switch_util.cc index d55eae5b018..699ce47d219 100644 --- a/components/brave_ads/core/internal/common/unittest/unittest_command_line_switch_util.cc +++ b/components/brave_ads/core/internal/common/unittest/unittest_command_line_switch_util.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/common/unittest/unittest_command_line_switch_util.h" +#include + #include "base/check.h" #include "base/command_line.h" #include "base/strings/strcat.h" @@ -44,8 +46,8 @@ void ShutdownCommandLineSwitches() { brave_rewards::RewardsFlags::SetForceParsingForTesting(false); } -absl::optional& DidAppendCommandLineSwitches() { - static absl::optional command_line; +std::optional& DidAppendCommandLineSwitches() { + static std::optional command_line; return command_line; } diff --git a/components/brave_ads/core/internal/common/unittest/unittest_command_line_switch_util.h b/components/brave_ads/core/internal/common/unittest/unittest_command_line_switch_util.h index 222ad637c12..1c41a4c1312 100644 --- a/components/brave_ads/core/internal/common/unittest/unittest_command_line_switch_util.h +++ b/components/brave_ads/core/internal/common/unittest/unittest_command_line_switch_util.h @@ -6,17 +6,17 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_UNITTEST_UNITTEST_COMMAND_LINE_SWITCH_UTIL_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_UNITTEST_UNITTEST_COMMAND_LINE_SWITCH_UTIL_H_ +#include #include #include "brave/components/brave_ads/core/internal/common/unittest/unittest_command_line_switch_info.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { void InitializeCommandLineSwitches(); void ShutdownCommandLineSwitches(); -absl::optional& DidAppendCommandLineSwitches(); +std::optional& DidAppendCommandLineSwitches(); void AppendCommandLineSwitches( const CommandLineSwitchList& command_line_switches); diff --git a/components/brave_ads/core/internal/common/unittest/unittest_file_util.cc b/components/brave_ads/core/internal/common/unittest/unittest_file_util.cc index 8b0977ed304..0a7f40e182e 100644 --- a/components/brave_ads/core/internal/common/unittest/unittest_file_util.cc +++ b/components/brave_ads/core/internal/common/unittest/unittest_file_util.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/common/unittest/unittest_file_util.h" +#include + #include "base/files/file_path.h" #include "base/files/file_util.h" #include "brave/components/brave_ads/core/internal/common/unittest/unittest_file_path_util.h" @@ -12,24 +14,24 @@ namespace brave_ads { -absl::optional MaybeReadFileToString(const std::string& name) { +std::optional MaybeReadFileToString(const std::string& name) { const base::FilePath path = TestDataPath().AppendASCII(name); std::string contents; if (!base::ReadFileToString(path, &contents)) { - return absl::nullopt; + return std::nullopt; } return contents; } -absl::optional MaybeReadFileToStringAndReplaceTags( +std::optional MaybeReadFileToStringAndReplaceTags( const std::string& name) { const base::FilePath path = TestDataPath().AppendASCII(name); std::string contents; if (!base::ReadFileToString(path, &contents)) { - return absl::nullopt; + return std::nullopt; } ParseAndReplaceTags(contents); @@ -37,13 +39,13 @@ absl::optional MaybeReadFileToStringAndReplaceTags( return contents; } -absl::optional MaybeReadDataResourceToString( +std::optional MaybeReadDataResourceToString( const std::string& name) { const base::FilePath path = DataResourcesPath().AppendASCII(name); std::string contents; if (!base::ReadFileToString(path, &contents)) { - return absl::nullopt; + return std::nullopt; } return contents; diff --git a/components/brave_ads/core/internal/common/unittest/unittest_file_util.h b/components/brave_ads/core/internal/common/unittest/unittest_file_util.h index bb0fd715fb6..4d47e11fd93 100644 --- a/components/brave_ads/core/internal/common/unittest/unittest_file_util.h +++ b/components/brave_ads/core/internal/common/unittest/unittest_file_util.h @@ -6,18 +6,18 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_UNITTEST_UNITTEST_FILE_UTIL_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_UNITTEST_UNITTEST_FILE_UTIL_H_ +#include #include -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { -absl::optional MaybeReadFileToString(const std::string& name); +std::optional MaybeReadFileToString(const std::string& name); -absl::optional MaybeReadFileToStringAndReplaceTags( +std::optional MaybeReadFileToStringAndReplaceTags( const std::string& name); -absl::optional MaybeReadDataResourceToString( +std::optional MaybeReadDataResourceToString( const std::string& name); } // namespace brave_ads diff --git a/components/brave_ads/core/internal/common/unittest/unittest_mock_util.cc b/components/brave_ads/core/internal/common/unittest/unittest_mock_util.cc index bb407c8ed09..9f91c7dfb1f 100644 --- a/components/brave_ads/core/internal/common/unittest/unittest_mock_util.cc +++ b/components/brave_ads/core/internal/common/unittest/unittest_mock_util.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/common/unittest/unittest_mock_util.h" +#include #include #include @@ -14,7 +15,6 @@ #include "brave/components/brave_ads/core/internal/common/unittest/unittest_constants.h" #include "brave/components/brave_ads/core/internal/common/unittest/unittest_url_response_util.h" #include "brave/components/brave_ads/core/internal/global_state/global_state.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h" namespace brave_ads { @@ -145,7 +145,7 @@ void MockUrlResponses(AdsClientMock& mock, .WillByDefault(::testing::Invoke( [url_responses](const mojom::UrlRequestInfoPtr& url_request, UrlRequestCallback callback) { - const absl::optional url_response = + const std::optional url_response = GetNextUrlResponseForRequest(url_request, url_responses); if (!url_response) { // URL request should not be mocked. diff --git a/components/brave_ads/core/internal/common/unittest/unittest_pref_info.h b/components/brave_ads/core/internal/common/unittest/unittest_pref_info.h index b34d6a952f5..820407b5e06 100644 --- a/components/brave_ads/core/internal/common/unittest/unittest_pref_info.h +++ b/components/brave_ads/core/internal/common/unittest/unittest_pref_info.h @@ -6,8 +6,9 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_UNITTEST_UNITTEST_PREF_INFO_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_UNITTEST_UNITTEST_PREF_INFO_H_ +#include + #include "base/values.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -24,7 +25,7 @@ struct PrefInfo final { bool operator==(const PrefInfo&) const = default; - absl::optional value; + std::optional value; base::Value default_value; }; diff --git a/components/brave_ads/core/internal/common/unittest/unittest_tag_parser_util.cc b/components/brave_ads/core/internal/common/unittest/unittest_tag_parser_util.cc index 1d2548f9ac4..ed50e46d1a2 100644 --- a/components/brave_ads/core/internal/common/unittest/unittest_tag_parser_util.cc +++ b/components/brave_ads/core/internal/common/unittest/unittest_tag_parser_util.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/common/unittest/unittest_tag_parser_util.h" +#include #include #include @@ -16,7 +17,6 @@ #include "base/strings/string_util.h" #include "base/time/time.h" #include "brave/components/brave_ads/core/internal/common/unittest/unittest_time_util.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/re2/src/re2/re2.h" namespace brave_ads { @@ -32,14 +32,14 @@ constexpr char kMinutesDeltaTimeTagValue[] = "minutes"; constexpr char kHoursDeltaTimeTagValue[] = "hours"; constexpr char kDaysDeltaTimeTagValue[] = "days"; -absl::optional ParseTimeDelta(const std::string& value) { +std::optional ParseTimeDelta(const std::string& value) { const std::vector components = base::SplitString( value, " ", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); CHECK_EQ(2U, components.size()) << "Invalid time tag: " << value; int n; if (!base::StringToInt(components.at(0), &n)) { - return absl::nullopt; + return std::nullopt; } const std::string& period = components.at(1); @@ -59,10 +59,10 @@ absl::optional ParseTimeDelta(const std::string& value) { return base::Days(n); } - return absl::nullopt; + return std::nullopt; } -absl::optional ParseTimeTagValue(const std::string& value) { +std::optional ParseTimeTagValue(const std::string& value) { if (value == kNowTimeTagValue) { return NowAsIso8601(); } @@ -76,12 +76,12 @@ absl::optional ParseTimeTagValue(const std::string& value) { } if (re2::RE2::FullMatch(value, "[-+]?[0-9]*.*(seconds|minutes|hours|days)")) { - const absl::optional time_delta = ParseTimeDelta(value); + const std::optional time_delta = ParseTimeDelta(value); CHECK(time_delta) << "Invalid time tag value: " << value; return base::TimeFormatAsIso8601(Now() + *time_delta); } - return absl::nullopt; + return std::nullopt; } std::vector ParseTagsForText(const std::string& text) { @@ -109,7 +109,7 @@ void ReplaceTagsForText(const std::vector& tags, std::string value = components.at(1); if (key == kTimeTagKey) { - const absl::optional time_tag_value = + const std::optional time_tag_value = ParseTimeTagValue(value); CHECK(time_tag_value) << "Invalid time tag value: " << value; value = *time_tag_value; diff --git a/components/brave_ads/core/internal/common/unittest/unittest_url_response_util.cc b/components/brave_ads/core/internal/common/unittest/unittest_url_response_util.cc index 79765f3978e..b5efc3e7601 100644 --- a/components/brave_ads/core/internal/common/unittest/unittest_url_response_util.cc +++ b/components/brave_ads/core/internal/common/unittest/unittest_url_response_util.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/common/unittest/unittest_url_response_util.h" +#include #include #include "base/check_op.h" @@ -41,7 +42,7 @@ URLResponseList GetUrlResponsesForRequestPath( return iter->second; } -absl::optional GetNextUrlResponseForUrl( +std::optional GetNextUrlResponseForUrl( const GURL& url, const URLResponseMap& url_responses) { CHECK(url.is_valid()) << "Invalid URL: " << url; @@ -53,7 +54,7 @@ absl::optional GetNextUrlResponseForUrl( GetUrlResponsesForRequestPath(url_responses, request_path); if (url_responses_for_request_path.empty()) { // URL responses not found for the given request path. - return absl::nullopt; + return std::nullopt; } size_t index = 0; @@ -88,13 +89,13 @@ std::string ParseFilenameFromResponseBody(const std::string& response_body) { } // namespace -absl::optional GetNextUrlResponseForRequest( +std::optional GetNextUrlResponseForRequest( const mojom::UrlRequestInfoPtr& url_request, const URLResponseMap& url_responses) { - const absl::optional url_response = + const std::optional url_response = GetNextUrlResponseForUrl(url_request->url, url_responses); if (!url_response) { - return absl::nullopt; + return std::nullopt; } std::string response_body = url_response->second; diff --git a/components/brave_ads/core/internal/common/unittest/unittest_url_response_util.h b/components/brave_ads/core/internal/common/unittest/unittest_url_response_util.h index 0bd258e9501..2669e37e366 100644 --- a/components/brave_ads/core/internal/common/unittest/unittest_url_response_util.h +++ b/components/brave_ads/core/internal/common/unittest/unittest_url_response_util.h @@ -6,13 +6,14 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_UNITTEST_UNITTEST_URL_RESPONSE_UTIL_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_UNITTEST_UNITTEST_URL_RESPONSE_UTIL_H_ +#include + #include "brave/components/brave_ads/core/internal/common/unittest/unittest_url_response_alias.h" #include "brave/components/brave_ads/core/mojom/brave_ads.mojom-forward.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { -absl::optional GetNextUrlResponseForRequest( +std::optional GetNextUrlResponseForRequest( const mojom::UrlRequestInfoPtr& url_request, const URLResponseMap& url_responses); diff --git a/components/brave_ads/core/internal/conversions/conversion/conversion_builder.cc b/components/brave_ads/core/internal/conversions/conversion/conversion_builder.cc index 552508c3c0e..53a55b1d4f1 100644 --- a/components/brave_ads/core/internal/conversions/conversion/conversion_builder.cc +++ b/components/brave_ads/core/internal/conversions/conversion/conversion_builder.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/conversions/conversion/conversion_builder.h" +#include + #include "brave/components/brave_ads/core/internal/conversions/actions/conversion_action_types_util.h" #include "brave/components/brave_ads/core/internal/conversions/conversion/conversion_info.h" #include "brave/components/brave_ads/core/internal/user/user_interaction/ad_events/ad_event_info.h" @@ -13,7 +15,7 @@ namespace brave_ads { ConversionInfo BuildConversion( const AdEventInfo& ad_event, - const absl::optional& verifiable_conversion) { + const std::optional& verifiable_conversion) { ConversionInfo conversion; conversion.ad_type = ad_event.type; diff --git a/components/brave_ads/core/internal/conversions/conversion/conversion_builder.h b/components/brave_ads/core/internal/conversions/conversion/conversion_builder.h index 1c1c8a138f7..0ea148f0982 100644 --- a/components/brave_ads/core/internal/conversions/conversion/conversion_builder.h +++ b/components/brave_ads/core/internal/conversions/conversion/conversion_builder.h @@ -6,7 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_CONVERSIONS_CONVERSION_CONVERSION_BUILDER_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_CONVERSIONS_CONVERSION_CONVERSION_BUILDER_H_ -#include "third_party/abseil-cpp/absl/types/optional.h" +#include namespace brave_ads { @@ -16,7 +16,7 @@ struct VerifiableConversionInfo; ConversionInfo BuildConversion( const AdEventInfo& ad_event, - const absl::optional& verifiable_conversion); + const std::optional& verifiable_conversion); } // namespace brave_ads diff --git a/components/brave_ads/core/internal/conversions/conversion/conversion_builder_unittest.cc b/components/brave_ads/core/internal/conversions/conversion/conversion_builder_unittest.cc index 7c3b0b9d364..f9b75541a47 100644 --- a/components/brave_ads/core/internal/conversions/conversion/conversion_builder_unittest.cc +++ b/components/brave_ads/core/internal/conversions/conversion/conversion_builder_unittest.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/conversions/conversion/conversion_builder.h" +#include + #include "brave/components/brave_ads/core/internal/common/unittest/unittest_time_util.h" #include "brave/components/brave_ads/core/internal/conversions/actions/conversion_action_types.h" #include "brave/components/brave_ads/core/internal/conversions/conversion/conversion_info.h" @@ -38,7 +40,7 @@ TEST(BraveAdsConversionBuilderTest, BuildConversion) { EXPECT_EQ(expected_conversion, BuildConversion(BuildAdEvent(ad, ConfirmationType::kViewed, /*created_at=*/Now()), - /*verifiable_conversion=*/absl::nullopt)); + /*verifiable_conversion=*/std::nullopt)); } TEST(BraveAdsConversionBuilderTest, BuildVerifiableConversion) { diff --git a/components/brave_ads/core/internal/conversions/conversion/conversion_info.h b/components/brave_ads/core/internal/conversions/conversion/conversion_info.h index 0c076bd69ce..7201eacf457 100644 --- a/components/brave_ads/core/internal/conversions/conversion/conversion_info.h +++ b/components/brave_ads/core/internal/conversions/conversion/conversion_info.h @@ -6,13 +6,13 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_CONVERSIONS_CONVERSION_CONVERSION_INFO_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_CONVERSIONS_CONVERSION_CONVERSION_INFO_H_ +#include #include #include #include "brave/components/brave_ads/core/internal/conversions/actions/conversion_action_types.h" #include "brave/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_info.h" #include "brave/components/brave_ads/core/public/units/ad_type.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -38,7 +38,7 @@ struct ConversionInfo final { std::string advertiser_id; std::string segment; ConversionActionType action_type = ConversionActionType::kUndefined; - absl::optional verifiable; + std::optional verifiable; }; using ConversionList = std::vector; diff --git a/components/brave_ads/core/internal/conversions/conversions.cc b/components/brave_ads/core/internal/conversions/conversions.cc index 441d2447b43..fcab12a7931 100644 --- a/components/brave_ads/core/internal/conversions/conversions.cc +++ b/components/brave_ads/core/internal/conversions/conversions.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/conversions/conversions.h" +#include + #include "base/check.h" #include "base/functional/bind.h" #include "brave/components/brave_ads/core/internal/common/logging_util.h" @@ -152,7 +154,7 @@ void Conversions::CheckForConversions( } const auto& [_, creative_set_conversion_bucket] = *iter; - const absl::optional creative_set_conversion = + const std::optional creative_set_conversion = FindNonExpiredCreativeSetConversion(creative_set_conversion_bucket, ad_event); if (!creative_set_conversion) { @@ -182,7 +184,7 @@ void Conversions::CheckForConversions( void Conversions::Convert( const AdEventInfo& ad_event, - const absl::optional& verifiable_conversion) { + const std::optional& verifiable_conversion) { BLOG(1, "Conversion for " << ad_event.type << " with creative instance id " << ad_event.creative_instance_id << ", creative set id " << ad_event.creative_set_id @@ -198,7 +200,7 @@ void Conversions::Convert( void Conversions::ConvertCallback( const AdEventInfo& ad_event, - const absl::optional& verifiable_conversion, + const std::optional& verifiable_conversion, const bool success) { if (!success) { BLOG(1, "Failed to log conversion event"); diff --git a/components/brave_ads/core/internal/conversions/conversions.h b/components/brave_ads/core/internal/conversions/conversions.h index bcbfba17d55..93712b6a0da 100644 --- a/components/brave_ads/core/internal/conversions/conversions.h +++ b/components/brave_ads/core/internal/conversions/conversions.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_CONVERSIONS_CONVERSIONS_H_ #include +#include #include #include @@ -18,7 +19,6 @@ #include "brave/components/brave_ads/core/internal/creatives/conversions/creative_set_conversion_info.h" #include "brave/components/brave_ads/core/internal/tabs/tab_manager_observer.h" #include "brave/components/brave_ads/core/internal/user/user_interaction/ad_events/ad_event_info.h" -#include "third_party/abseil-cpp/absl/types/optional.h" class GURL; @@ -75,10 +75,10 @@ class Conversions final : public ConversionQueueDelegate, const AdEventList& ad_events); void Convert( const AdEventInfo& ad_event, - const absl::optional& verifiable_conversion); + const std::optional& verifiable_conversion); void ConvertCallback( const AdEventInfo& ad_event, - const absl::optional& verifiable_conversion, + const std::optional& verifiable_conversion, bool success); void NotifyDidConvertAd(const ConversionInfo& conversion) const; diff --git a/components/brave_ads/core/internal/conversions/conversions_unittest.cc b/components/brave_ads/core/internal/conversions/conversions_unittest.cc index 63e499b879c..867248394f4 100644 --- a/components/brave_ads/core/internal/conversions/conversions_unittest.cc +++ b/components/brave_ads/core/internal/conversions/conversions_unittest.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_ads/core/internal/conversions/conversions.h" #include +#include #include "base/time/time.h" #include "brave/components/brave_ads/core/internal/common/resources/country_components_unittest_constants.h" @@ -22,7 +23,6 @@ #include "brave/components/brave_ads/core/internal/user/user_interaction/ad_events/ad_event_unittest_util.h" #include "brave/components/brave_ads/core/public/account/confirmations/confirmation_type.h" #include "brave/components/brave_ads/core/public/units/ad_info.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h" // npm run test -- brave_unit_tests --filter=BraveAds* @@ -133,7 +133,7 @@ TEST_F(BraveAdsConversionsTest, EXPECT_CALL(observer_mock_, OnDidConvertAd(BuildConversion( BuildAdEvent(ad, ConfirmationType::kViewed, /*created_at=*/Now()), - /*verifiable_conversion=*/absl::nullopt))); + /*verifiable_conversion=*/std::nullopt))); MaybeConvert(BuildRedirectChain(), kHtml); } @@ -176,7 +176,7 @@ TEST_F(BraveAdsConversionsTest, EXPECT_CALL(observer_mock_, OnDidConvertAd(BuildConversion( BuildAdEvent(ad, ConfirmationType::kClicked, /*created_at=*/Now()), - /*verifiable_conversion=*/absl::nullopt))); + /*verifiable_conversion=*/std::nullopt))); MaybeConvert(BuildRedirectChain(), kHtml); } @@ -216,7 +216,7 @@ TEST_F(BraveAdsConversionsTest, EXPECT_CALL(observer_mock_, OnDidConvertAd(BuildConversion( BuildAdEvent(ad, ConfirmationType::kViewed, /*created_at=*/Now()), - /*verifiable_conversion=*/absl::nullopt))); + /*verifiable_conversion=*/std::nullopt))); MaybeConvert(BuildRedirectChain(), kHtml); } @@ -258,7 +258,7 @@ TEST_F(BraveAdsConversionsTest, EXPECT_CALL(observer_mock_, OnDidConvertAd(BuildConversion( BuildAdEvent(ad, ConfirmationType::kClicked, /*created_at=*/Now()), - /*verifiable_conversion=*/absl::nullopt))); + /*verifiable_conversion=*/std::nullopt))); MaybeConvert(BuildRedirectChain(), kHtml); } @@ -299,7 +299,7 @@ TEST_F(BraveAdsConversionsTest, EXPECT_CALL(observer_mock_, OnDidConvertAd(BuildConversion( BuildAdEvent(ad, ConfirmationType::kViewed, /*created_at=*/Now()), - /*verifiable_conversion=*/absl::nullopt))); + /*verifiable_conversion=*/std::nullopt))); MaybeConvert(BuildRedirectChain(), kHtml); } @@ -342,7 +342,7 @@ TEST_F(BraveAdsConversionsTest, EXPECT_CALL(observer_mock_, OnDidConvertAd(BuildConversion( BuildAdEvent(ad, ConfirmationType::kClicked, /*created_at=*/Now()), - /*verifiable_conversion=*/absl::nullopt))); + /*verifiable_conversion=*/std::nullopt))); MaybeConvert(BuildRedirectChain(), kHtml); } @@ -383,7 +383,7 @@ TEST_F(BraveAdsConversionsTest, EXPECT_CALL(observer_mock_, OnDidConvertAd(BuildConversion( BuildAdEvent(ad, ConfirmationType::kViewed, /*created_at=*/Now()), - /*verifiable_conversion=*/absl::nullopt))); + /*verifiable_conversion=*/std::nullopt))); MaybeConvert(BuildRedirectChain(), kHtml); } @@ -426,7 +426,7 @@ TEST_F(BraveAdsConversionsTest, EXPECT_CALL(observer_mock_, OnDidConvertAd(BuildConversion( BuildAdEvent(ad, ConfirmationType::kClicked, /*created_at=*/Now()), - /*verifiable_conversion=*/absl::nullopt))); + /*verifiable_conversion=*/std::nullopt))); MaybeConvert(BuildRedirectChain(), kHtml); } @@ -451,7 +451,7 @@ TEST_F(BraveAdsConversionsTest, ConvertViewedSearchResultAdIfAdsAreDisabled) { EXPECT_CALL(observer_mock_, OnDidConvertAd(BuildConversion( BuildAdEvent(ad, ConfirmationType::kViewed, /*created_at=*/Now()), - /*verifiable_conversion=*/absl::nullopt))); + /*verifiable_conversion=*/std::nullopt))); MaybeConvert(BuildRedirectChain(), kHtml); } @@ -472,7 +472,7 @@ TEST_F(BraveAdsConversionsTest, ConvertViewedSearchResultAdIfAdsAreEnabled) { EXPECT_CALL(observer_mock_, OnDidConvertAd(BuildConversion( BuildAdEvent(ad, ConfirmationType::kViewed, /*created_at=*/Now()), - /*verifiable_conversion=*/absl::nullopt))); + /*verifiable_conversion=*/std::nullopt))); MaybeConvert(BuildRedirectChain(), kHtml); } @@ -498,7 +498,7 @@ TEST_F(BraveAdsConversionsTest, ConvertClickedSearchResultAdIfAdsAreDisabled) { EXPECT_CALL(observer_mock_, OnDidConvertAd(BuildConversion( BuildAdEvent(ad, ConfirmationType::kClicked, /*created_at=*/Now()), - /*verifiable_conversion=*/absl::nullopt))); + /*verifiable_conversion=*/std::nullopt))); MaybeConvert(BuildRedirectChain(), kHtml); } @@ -520,7 +520,7 @@ TEST_F(BraveAdsConversionsTest, ConvertClickedSearchResultAdIfAdsAreEnabled) { EXPECT_CALL(observer_mock_, OnDidConvertAd(BuildConversion( BuildAdEvent(ad, ConfirmationType::kClicked, /*created_at=*/Now()), - /*verifiable_conversion=*/absl::nullopt))); + /*verifiable_conversion=*/std::nullopt))); MaybeConvert(BuildRedirectChain(), kHtml); } @@ -554,12 +554,12 @@ TEST_F(BraveAdsConversionsTest, MultipleAdConversions) { EXPECT_CALL(observer_mock_, OnDidConvertAd(BuildConversion( BuildAdEvent(ad_1, ConfirmationType::kViewed, /*created_at=*/Now()), - /*verifiable_conversion=*/absl::nullopt))); + /*verifiable_conversion=*/std::nullopt))); EXPECT_CALL(observer_mock_, OnDidConvertAd(BuildConversion( BuildAdEvent(ad_2, ConfirmationType::kClicked, /*created_at=*/Now()), - /*verifiable_conversion=*/absl::nullopt))); + /*verifiable_conversion=*/std::nullopt))); MaybeConvert(BuildRedirectChain(), kHtml); } @@ -581,7 +581,7 @@ TEST_F(BraveAdsConversionsTest, ConvertViewedAdAfterTheSameAdWasDismissed) { EXPECT_CALL(observer_mock_, OnDidConvertAd(BuildConversion( BuildAdEvent(ad, ConfirmationType::kViewed, /*created_at=*/Now()), - /*verifiable_conversion=*/absl::nullopt))); + /*verifiable_conversion=*/std::nullopt))); MaybeConvert(BuildRedirectChain(), kHtml); } @@ -673,7 +673,7 @@ TEST_F(BraveAdsConversionsTest, EXPECT_CALL(observer_mock_, OnDidConvertAd(BuildConversion( BuildAdEvent(ad_1, ConfirmationType::kViewed, /*created_at=*/Now()), - /*verifiable_conversion=*/absl::nullopt))); + /*verifiable_conversion=*/std::nullopt))); MaybeConvert(BuildRedirectChain(), kHtml); @@ -724,7 +724,7 @@ TEST_F(BraveAdsConversionsTest, EXPECT_CALL(observer_mock_, OnDidConvertAd(BuildConversion( BuildAdEvent(ad, ConfirmationType::kViewed, /*created_at=*/Now()), - /*verifiable_conversion=*/absl::nullopt))); + /*verifiable_conversion=*/std::nullopt))); MaybeConvert(BuildRedirectChain(), kHtml); } @@ -769,7 +769,7 @@ TEST_F(BraveAdsConversionsTest, EXPECT_CALL(observer_mock_, OnDidConvertAd(BuildConversion( BuildAdEvent(ad, ConfirmationType::kViewed, /*created_at=*/Now()), - /*verifiable_conversion=*/absl::nullopt))); + /*verifiable_conversion=*/std::nullopt))); MaybeConvert( /*redirect_chain=*/{GURL("https://foo.com/bar?qux_id=xyzzy")}, kHtml); @@ -797,7 +797,7 @@ TEST_F( EXPECT_CALL(observer_mock_, OnDidConvertAd(BuildConversion( BuildAdEvent(ad, ConfirmationType::kViewed, /*created_at=*/Now()), - /*verifiable_conversion=*/absl::nullopt))); + /*verifiable_conversion=*/std::nullopt))); MaybeConvert( /*redirect_chain=*/{GURL("https://grault.com/garply"), @@ -826,7 +826,7 @@ TEST_F(BraveAdsConversionsTest, EXPECT_CALL(observer_mock_, OnDidConvertAd(BuildConversion( BuildAdEvent(ad, ConfirmationType::kViewed, /*created_at=*/Now()), - /*verifiable_conversion=*/absl::nullopt))); + /*verifiable_conversion=*/std::nullopt))); MaybeConvert( /*redirect_chain=*/{GURL("https://foo.com/bar?qux=quux")}, kHtml); @@ -880,7 +880,7 @@ TEST_F(BraveAdsConversionsTest, EXPECT_CALL(observer_mock_, OnDidConvertAd(BuildConversion( BuildAdEvent(ad, ConfirmationType::kViewed, /*created_at=*/Now()), - /*verifiable_conversion=*/absl::nullopt))); + /*verifiable_conversion=*/std::nullopt))); MaybeConvert( /*redirect_chain=*/{GURL("https://foo.com/bar")}, kHtml); @@ -935,7 +935,7 @@ TEST_F( EXPECT_CALL(observer_mock_, OnDidConvertAd(BuildConversion( BuildAdEvent(ad, ConfirmationType::kViewed, /*created_at=*/Now()), - /*verifiable_conversion=*/absl::nullopt))); + /*verifiable_conversion=*/std::nullopt))); MaybeConvert(/*redirect_chain=*/{GURL("https://qux.com/quux/corge")}, kHtml); } diff --git a/components/brave_ads/core/internal/conversions/queue/conversion_queue_unittest.cc b/components/brave_ads/core/internal/conversions/queue/conversion_queue_unittest.cc index d5754378d2e..09ed4f550c1 100644 --- a/components/brave_ads/core/internal/conversions/queue/conversion_queue_unittest.cc +++ b/components/brave_ads/core/internal/conversions/queue/conversion_queue_unittest.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_ads/core/internal/conversions/queue/conversion_queue.h" #include +#include #include "brave/components/brave_ads/core/internal/common/unittest/unittest_base.h" #include "brave/components/brave_ads/core/internal/common/unittest/unittest_time_util.h" @@ -14,7 +15,6 @@ #include "brave/components/brave_ads/core/internal/conversions/queue/queue_item/conversion_queue_item_util.h" #include "brave/components/brave_ads/core/internal/units/ad_unittest_util.h" #include "brave/components/brave_ads/core/internal/user/user_interaction/ad_events/ad_event_builder.h" -#include "third_party/abseil-cpp/absl/types/optional.h" // npm run test -- brave_unit_tests --filter=BraveAds* @@ -42,7 +42,7 @@ TEST_F(BraveAdsConversionQueueTest, AddConversionToQueue) { const ConversionInfo conversion = BuildConversion( BuildAdEvent(ad, ConfirmationType::kViewed, /*created_at=*/Now()), - /*verifiable_conversion=*/absl::nullopt); + /*verifiable_conversion=*/std::nullopt); const ScopedDelayBeforeProcessingConversionQueueItemForTesting scoped_delay_before_processing_conversion_queue_item(base::Minutes(5)); @@ -65,7 +65,7 @@ TEST_F(BraveAdsConversionQueueTest, ProcessConversionInQueue) { const ConversionInfo conversion = BuildConversion( BuildAdEvent(ad, ConfirmationType::kViewed, /*created_at=*/Now()), - /*verifiable_conversion=*/absl::nullopt); + /*verifiable_conversion=*/std::nullopt); EXPECT_CALL(delegate_mock_, OnDidAddConversionToQueue(conversion)); EXPECT_CALL(delegate_mock_, OnWillProcessConversionQueue( @@ -87,7 +87,7 @@ TEST_F(BraveAdsConversionQueueTest, ProcessMultipleConversionsInQueue) { /*should_use_random_uuids=*/true); const ConversionInfo conversion_1 = BuildConversion( BuildAdEvent(ad_1, ConfirmationType::kViewed, /*created_at=*/Now()), - /*verifiable_conversion=*/absl::nullopt); + /*verifiable_conversion=*/std::nullopt); { EXPECT_CALL(delegate_mock_, OnDidAddConversionToQueue(conversion_1)); @@ -105,7 +105,7 @@ TEST_F(BraveAdsConversionQueueTest, ProcessMultipleConversionsInQueue) { /*should_use_random_uuids=*/true); const ConversionInfo conversion_2 = BuildConversion( BuildAdEvent(ad_2, ConfirmationType::kViewed, /*created_at=*/Now()), - /*verifiable_conversion=*/absl::nullopt); + /*verifiable_conversion=*/std::nullopt); const ScopedDelayBeforeProcessingConversionQueueItemForTesting scoped_delay_before_processing_conversion_queue_item(base::Minutes(21)); diff --git a/components/brave_ads/core/internal/conversions/queue/queue_item/conversion_queue_item_builder_unittest.cc b/components/brave_ads/core/internal/conversions/queue/queue_item/conversion_queue_item_builder_unittest.cc index c80e6f909ed..e447335e14a 100644 --- a/components/brave_ads/core/internal/conversions/queue/queue_item/conversion_queue_item_builder_unittest.cc +++ b/components/brave_ads/core/internal/conversions/queue/queue_item/conversion_queue_item_builder_unittest.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/conversions/queue/queue_item/conversion_queue_item_builder.h" +#include + #include "brave/components/brave_ads/core/internal/common/unittest/unittest_base.h" #include "brave/components/brave_ads/core/internal/common/unittest/unittest_time_util.h" #include "brave/components/brave_ads/core/internal/conversions/conversion/conversion_builder.h" @@ -26,7 +28,7 @@ TEST_F(BraveAdsConversionQueueItemBuilderTest, BuildConversionQueueItem) { const ConversionInfo conversion = BuildConversion(BuildAdEvent(ad, ConfirmationType::kViewed, /*created_at=*/Now()), - /*verifiable_conversion=*/absl::nullopt); + /*verifiable_conversion=*/std::nullopt); // Act & Assert ConversionQueueItemInfo expected_conversion_queue_item; diff --git a/components/brave_ads/core/internal/conversions/queue/queue_item/conversion_queue_item_unittest_util.cc b/components/brave_ads/core/internal/conversions/queue/queue_item/conversion_queue_item_unittest_util.cc index a9bfc4a68d2..2b793978dc1 100644 --- a/components/brave_ads/core/internal/conversions/queue/queue_item/conversion_queue_item_unittest_util.cc +++ b/components/brave_ads/core/internal/conversions/queue/queue_item/conversion_queue_item_unittest_util.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/conversions/queue/queue_item/conversion_queue_item_unittest_util.h" +#include + #include "base/check.h" #include "base/functional/bind.h" #include "brave/components/brave_ads/core/internal/common/unittest/unittest_time_util.h" @@ -51,7 +53,7 @@ void BuildAndSaveConversionQueue(AdType ad_type, const int count) { const AdInfo ad = BuildAd(ad_type, should_use_random_uuids); - absl::optional verifiable_conversion; + std::optional verifiable_conversion; if (is_verifiable) { verifiable_conversion = VerifiableConversionInfo{ kVerifiableConversionId, kVerifiableConversionAdvertiserPublicKey}; diff --git a/components/brave_ads/core/internal/conversions/queue/queue_item/conversion_queue_item_util.cc b/components/brave_ads/core/internal/conversions/queue/queue_item/conversion_queue_item_util.cc index a221b09e8a0..92c7add5d97 100644 --- a/components/brave_ads/core/internal/conversions/queue/queue_item/conversion_queue_item_util.cc +++ b/components/brave_ads/core/internal/conversions/queue/queue_item/conversion_queue_item_util.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/conversions/queue/queue_item/conversion_queue_item_util.h" +#include + #include "base/time/time.h" #include "brave/components/brave_ads/core/internal/conversions/queue/queue_item/conversion_queue_item_info.h" #include "brave/components/brave_ads/core/internal/conversions/queue/queue_item/conversion_queue_item_util_constants.h" @@ -13,7 +15,7 @@ namespace brave_ads { namespace { -absl::optional +std::optional g_scoped_delay_before_processing_conversion_queue_item_for_testing; base::TimeDelta DelayBeforeProcessingQueueItem( @@ -62,7 +64,7 @@ ScopedDelayBeforeProcessingConversionQueueItemForTesting:: ScopedDelayBeforeProcessingConversionQueueItemForTesting:: ~ScopedDelayBeforeProcessingConversionQueueItemForTesting() { g_scoped_delay_before_processing_conversion_queue_item_for_testing = - absl::nullopt; + std::nullopt; } } // namespace brave_ads diff --git a/components/brave_ads/core/internal/conversions/queue/queue_item/conversion_queue_item_util_unittest.cc b/components/brave_ads/core/internal/conversions/queue/queue_item/conversion_queue_item_util_unittest.cc index 673e13ba20d..a94f92dea9b 100644 --- a/components/brave_ads/core/internal/conversions/queue/queue_item/conversion_queue_item_util_unittest.cc +++ b/components/brave_ads/core/internal/conversions/queue/queue_item/conversion_queue_item_util_unittest.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/conversions/queue/queue_item/conversion_queue_item_util.h" +#include + #include "base/time/time.h" #include "brave/components/brave_ads/core/internal/common/unittest/unittest_base.h" #include "brave/components/brave_ads/core/internal/common/unittest/unittest_time_util.h" @@ -28,7 +30,7 @@ TEST_F(BraveAdsConversionQueueItemDelayTest, const ConversionInfo conversion = BuildConversion(BuildAdEvent(ad, ConfirmationType::kViewed, /*created_at=*/Now()), - /*verifiable_conversion=*/absl::nullopt); + /*verifiable_conversion=*/std::nullopt); const ConversionQueueItemInfo conversion_queue_item = BuildConversionQueueItem(conversion, /*process_at=*/Now() + base::Hours(1)); @@ -46,7 +48,7 @@ TEST_F(BraveAdsConversionQueueItemDelayTest, const ConversionInfo conversion = BuildConversion(BuildAdEvent(ad, ConfirmationType::kViewed, /*created_at=*/DistantPast()), - /*verifiable_conversion=*/absl::nullopt); + /*verifiable_conversion=*/std::nullopt); const ConversionQueueItemInfo conversion_queue_item = BuildConversionQueueItem(conversion, /*process_at=*/DistantPast()); @@ -64,7 +66,7 @@ TEST_F(BraveAdsConversionQueueItemDelayTest, const ConversionInfo conversion = BuildConversion(BuildAdEvent(ad, ConfirmationType::kViewed, /*created_at=*/Now()), - /*verifiable_conversion=*/absl::nullopt); + /*verifiable_conversion=*/std::nullopt); const ConversionQueueItemInfo conversion_queue_item = BuildConversionQueueItem(conversion, /*process_at=*/Now() + base::Milliseconds(1)); diff --git a/components/brave_ads/core/internal/conversions/resource/conversion_resource_info.cc b/components/brave_ads/core/internal/conversions/resource/conversion_resource_info.cc index 7e20ebc0831..246934c8502 100644 --- a/components/brave_ads/core/internal/conversions/resource/conversion_resource_info.cc +++ b/components/brave_ads/core/internal/conversions/resource/conversion_resource_info.cc @@ -5,10 +5,11 @@ #include "brave/components/brave_ads/core/internal/conversions/resource/conversion_resource_info.h" +#include + #include "base/values.h" #include "brave/components/brave_ads/core/internal/conversions/conversions_feature.h" #include "brave/components/brave_ads/core/internal/conversions/resource/conversion_resource_id_pattern_search_in_types.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -34,7 +35,7 @@ base::expected ConversionResourceInfo::CreateFromValue(const base::Value::Dict dict) { ConversionResourceInfo conversions; - if (absl::optional version = dict.FindInt("version")) { + if (std::optional version = dict.FindInt("version")) { if (kConversionResourceVersion.Get() != *version) { return base::unexpected("Failed to load from JSON, version mismatch"); } diff --git a/components/brave_ads/core/internal/conversions/types/verifiable_conversion/envelope/verifiable_conversion_envelope_unittest_util.cc b/components/brave_ads/core/internal/conversions/types/verifiable_conversion/envelope/verifiable_conversion_envelope_unittest_util.cc index b5e8d43c4be..7f67c06948c 100644 --- a/components/brave_ads/core/internal/conversions/types/verifiable_conversion/envelope/verifiable_conversion_envelope_unittest_util.cc +++ b/components/brave_ads/core/internal/conversions/types/verifiable_conversion/envelope/verifiable_conversion_envelope_unittest_util.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_ads/core/internal/conversions/types/verifiable_conversion/envelope/verifiable_conversion_envelope_unittest_util.h" #include +#include #include #include "base/base64.h" @@ -15,40 +16,40 @@ namespace brave_ads::test { -absl::optional OpenVerifiableConversionEnvelope( +std::optional OpenVerifiableConversionEnvelope( const VerifiableConversionEnvelopeInfo& verifiable_conversion_envelope, const std::string& advertiser_secret_key_base64) { CHECK(!advertiser_secret_key_base64.empty()); if (!verifiable_conversion_envelope.IsValid()) { - return absl::nullopt; + return std::nullopt; } - absl::optional> ciphertext = + std::optional> ciphertext = base::Base64Decode(verifiable_conversion_envelope.ciphertext); if (!ciphertext) { - return absl::nullopt; + return std::nullopt; } // API requires `crypto_box_BOXZEROBYTES` leading zero-padding bytes. ciphertext->insert(ciphertext->cbegin(), crypto_box_BOXZEROBYTES, 0); - const absl::optional> nonce = + const std::optional> nonce = base::Base64Decode(verifiable_conversion_envelope.nonce); if (!nonce) { - return absl::nullopt; + return std::nullopt; } - const absl::optional> ephemeral_public_key = + const std::optional> ephemeral_public_key = base::Base64Decode(verifiable_conversion_envelope.ephemeral_public_key); if (!ephemeral_public_key) { - return absl::nullopt; + return std::nullopt; } - const absl::optional> advertiser_secret_key = + const std::optional> advertiser_secret_key = base::Base64Decode(advertiser_secret_key_base64); if (!advertiser_secret_key) { - return absl::nullopt; + return std::nullopt; } const std::vector plaintext = crypto::Decrypt( diff --git a/components/brave_ads/core/internal/conversions/types/verifiable_conversion/envelope/verifiable_conversion_envelope_unittest_util.h b/components/brave_ads/core/internal/conversions/types/verifiable_conversion/envelope/verifiable_conversion_envelope_unittest_util.h index 59e38df75bd..6ea47b7c301 100644 --- a/components/brave_ads/core/internal/conversions/types/verifiable_conversion/envelope/verifiable_conversion_envelope_unittest_util.h +++ b/components/brave_ads/core/internal/conversions/types/verifiable_conversion/envelope/verifiable_conversion_envelope_unittest_util.h @@ -6,9 +6,9 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_CONVERSIONS_TYPES_VERIFIABLE_CONVERSION_ENVELOPE_VERIFIABLE_CONVERSION_ENVELOPE_UNITTEST_UTIL_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_CONVERSIONS_TYPES_VERIFIABLE_CONVERSION_ENVELOPE_VERIFIABLE_CONVERSION_ENVELOPE_UNITTEST_UTIL_H_ +#include #include -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -16,7 +16,7 @@ struct VerifiableConversionEnvelopeInfo; namespace test { -absl::optional OpenVerifiableConversionEnvelope( +std::optional OpenVerifiableConversionEnvelope( const VerifiableConversionEnvelopeInfo& verifiable_conversion_envelope, const std::string& advertiser_secret_key_base64); diff --git a/components/brave_ads/core/internal/conversions/types/verifiable_conversion/envelope/verifiable_conversion_envelope_util.cc b/components/brave_ads/core/internal/conversions/types/verifiable_conversion/envelope/verifiable_conversion_envelope_util.cc index f9143f7bed7..1fd3cad075c 100644 --- a/components/brave_ads/core/internal/conversions/types/verifiable_conversion/envelope/verifiable_conversion_envelope_util.cc +++ b/components/brave_ads/core/internal/conversions/types/verifiable_conversion/envelope/verifiable_conversion_envelope_util.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_ads/core/internal/conversions/types/verifiable_conversion/envelope/verifiable_conversion_envelope_util.h" #include +#include #include #include "base/base64.h" @@ -35,7 +36,7 @@ std::string GetVerifiableConversionEnvelopeAlgorithm() { return kAlgorithm; } -absl::optional +std::optional SealVerifiableConversionEnvelope( const VerifiableConversionInfo& verifiable_conversion) { const std::string message = verifiable_conversion.id; @@ -44,11 +45,11 @@ SealVerifiableConversionEnvelope( if (message.length() < kMinVerifiableConversionEnvelopeMessageLength || message.length() > kMaxVerifiableConversionEnvelopeMessageLength) { - return absl::nullopt; + return std::nullopt; } if (!IsConversionIdValid(message)) { - return absl::nullopt; + return std::nullopt; } // Protocol requires at least 2 trailing zero-padding bytes. @@ -56,18 +57,18 @@ SealVerifiableConversionEnvelope( plaintext.insert(plaintext.cend(), kCipherTextLength - plaintext.size(), 0); CHECK_EQ(kCipherTextLength, plaintext.size()); - const absl::optional> public_key = + const std::optional> public_key = base::Base64Decode(public_key_base64); if (!public_key) { - return absl::nullopt; + return std::nullopt; } if (public_key->size() != crypto_box_PUBLICKEYBYTES) { - return absl::nullopt; + return std::nullopt; } const crypto::KeyPairInfo ephemeral_key_pair = crypto::GenerateBoxKeyPair(); if (!ephemeral_key_pair.IsValid()) { - return absl::nullopt; + return std::nullopt; } const std::vector nonce = crypto::GenerateRandomNonce(); @@ -88,7 +89,7 @@ SealVerifiableConversionEnvelope( envelope.nonce = base::Base64Encode(nonce); if (!envelope.IsValid()) { - return absl::nullopt; + return std::nullopt; } return envelope; diff --git a/components/brave_ads/core/internal/conversions/types/verifiable_conversion/envelope/verifiable_conversion_envelope_util.h b/components/brave_ads/core/internal/conversions/types/verifiable_conversion/envelope/verifiable_conversion_envelope_util.h index f5336fcb21e..dd7d96b58d0 100644 --- a/components/brave_ads/core/internal/conversions/types/verifiable_conversion/envelope/verifiable_conversion_envelope_util.h +++ b/components/brave_ads/core/internal/conversions/types/verifiable_conversion/envelope/verifiable_conversion_envelope_util.h @@ -6,9 +6,9 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_CONVERSIONS_TYPES_VERIFIABLE_CONVERSION_ENVELOPE_VERIFIABLE_CONVERSION_ENVELOPE_UTIL_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_CONVERSIONS_TYPES_VERIFIABLE_CONVERSION_ENVELOPE_VERIFIABLE_CONVERSION_ENVELOPE_UTIL_H_ +#include #include -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -17,7 +17,7 @@ struct VerifiableConversionInfo; std::string GetVerifiableConversionEnvelopeAlgorithm(); -absl::optional +std::optional SealVerifiableConversionEnvelope( const VerifiableConversionInfo& verifiable_conversion); diff --git a/components/brave_ads/core/internal/conversions/types/verifiable_conversion/envelope/verifiable_conversion_envelope_util_unittest.cc b/components/brave_ads/core/internal/conversions/types/verifiable_conversion/envelope/verifiable_conversion_envelope_util_unittest.cc index f730dbb87d2..60785689059 100644 --- a/components/brave_ads/core/internal/conversions/types/verifiable_conversion/envelope/verifiable_conversion_envelope_util_unittest.cc +++ b/components/brave_ads/core/internal/conversions/types/verifiable_conversion/envelope/verifiable_conversion_envelope_util_unittest.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/conversions/types/verifiable_conversion/envelope/verifiable_conversion_envelope_util.h" +#include + #include "brave/components/brave_ads/core/internal/conversions/types/verifiable_conversion/envelope/verifiable_conversion_envelope_info.h" #include "brave/components/brave_ads/core/internal/conversions/types/verifiable_conversion/envelope/verifiable_conversion_envelope_unittest_util.h" #include "brave/components/brave_ads/core/internal/conversions/types/verifiable_conversion/envelope/verifiable_conversion_envelope_util_constants.h" @@ -23,7 +25,7 @@ TEST(BraveAdsVerifiableConversionEnvelopeUtilTest, kVerifiableConversionId, kVerifiableConversionAdvertiserPublicKey}; // Act - const absl::optional + const std::optional verifiable_conversion_envelope = SealVerifiableConversionEnvelope(verifiable_conversion); ASSERT_TRUE(verifiable_conversion_envelope); diff --git a/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_builder.cc b/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_builder.cc index 0b9412f533b..639d4c43a5e 100644 --- a/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_builder.cc +++ b/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_builder.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_builder.h" +#include + #include "brave/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_id_pattern/verifiable_conversion_id_pattern_util.h" #include "brave/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_info.h" #include "brave/components/brave_ads/core/internal/creatives/conversions/creative_set_conversion_info.h" @@ -12,20 +14,20 @@ namespace brave_ads { -absl::optional MaybeBuildVerifiableConversion( +std::optional MaybeBuildVerifiableConversion( const std::vector& redirect_chain, const std::string& html, const ConversionResourceIdPatternMap& resource_id_patterns, const CreativeSetConversionInfo& creative_set_conversion) { if (!creative_set_conversion.verifiable_advertiser_public_key_base64) { - return absl::nullopt; + return std::nullopt; } - const absl::optional verifiable_conversion_id = + const std::optional verifiable_conversion_id = MaybeParseVerifiableConversionId(redirect_chain, html, resource_id_patterns); if (!verifiable_conversion_id) { - return absl::nullopt; + return std::nullopt; } return VerifiableConversionInfo{ diff --git a/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_builder.h b/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_builder.h index 7e3966c05b2..39c9114663e 100644 --- a/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_builder.h +++ b/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_builder.h @@ -6,13 +6,13 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_CONVERSIONS_TYPES_VERIFIABLE_CONVERSION_VERIFIABLE_CONVERSION_BUILDER_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_CONVERSIONS_TYPES_VERIFIABLE_CONVERSION_VERIFIABLE_CONVERSION_BUILDER_H_ +#include #include #include #include "brave/components/brave_ads/core/internal/conversions/resource/conversion_resource_id_pattern_info.h" #include "brave/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_info.h" #include "brave/components/brave_ads/core/internal/creatives/conversions/creative_set_conversion_info.h" -#include "third_party/abseil-cpp/absl/types/optional.h" class GURL; @@ -21,7 +21,7 @@ namespace brave_ads { struct CreativeSetConversionInfo; struct VerifiableConversionInfo; -absl::optional MaybeBuildVerifiableConversion( +std::optional MaybeBuildVerifiableConversion( const std::vector& redirect_chain, const std::string& html, const ConversionResourceIdPatternMap& resource_id_patterns, diff --git a/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_id_pattern/parsers/verifiable_conversion_id_html_meta_tag_parser_util.cc b/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_id_pattern/parsers/verifiable_conversion_id_html_meta_tag_parser_util.cc index f982cf1db03..1d3177c2859 100644 --- a/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_id_pattern/parsers/verifiable_conversion_id_html_meta_tag_parser_util.cc +++ b/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_id_pattern/parsers/verifiable_conversion_id_html_meta_tag_parser_util.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_id_pattern/parsers/verifiable_conversion_id_html_meta_tag_parser_util.h" +#include #include #include "brave/components/brave_ads/core/internal/common/logging_util.h" @@ -13,7 +14,7 @@ namespace brave_ads { -absl::optional MaybeParseVerifableConversionIdFromHtmlMetaTag( +std::optional MaybeParseVerifableConversionIdFromHtmlMetaTag( const std::string& html) { const std::string id_pattern = kHtmlMetaTagConversionIdPattern.Get(); @@ -24,7 +25,7 @@ absl::optional MaybeParseVerifableConversionIdFromHtmlMetaTag( if (!RE2::FindAndConsume(&html_string_piece, r, &verifiable_conversion_id)) { BLOG(1, "Failed to parse verifiable conversion id for " << id_pattern << " id pattern"); - return absl::nullopt; + return std::nullopt; } return verifiable_conversion_id; diff --git a/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_id_pattern/parsers/verifiable_conversion_id_html_meta_tag_parser_util.h b/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_id_pattern/parsers/verifiable_conversion_id_html_meta_tag_parser_util.h index 31c4178d41b..a11ce31aa20 100644 --- a/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_id_pattern/parsers/verifiable_conversion_id_html_meta_tag_parser_util.h +++ b/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_id_pattern/parsers/verifiable_conversion_id_html_meta_tag_parser_util.h @@ -6,13 +6,13 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_CONVERSIONS_TYPES_VERIFIABLE_CONVERSION_VERIFIABLE_CONVERSION_ID_PATTERN_PARSERS_VERIFIABLE_CONVERSION_ID_HTML_META_TAG_PARSER_UTIL_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_CONVERSIONS_TYPES_VERIFIABLE_CONVERSION_VERIFIABLE_CONVERSION_ID_PATTERN_PARSERS_VERIFIABLE_CONVERSION_ID_HTML_META_TAG_PARSER_UTIL_H_ +#include #include -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { -absl::optional MaybeParseVerifableConversionIdFromHtmlMetaTag( +std::optional MaybeParseVerifableConversionIdFromHtmlMetaTag( const std::string& html); } // namespace brave_ads diff --git a/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_id_pattern/parsers/verifiable_conversion_id_html_parser_util.cc b/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_id_pattern/parsers/verifiable_conversion_id_html_parser_util.cc index 2922a16cd75..38405aa3a5e 100644 --- a/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_id_pattern/parsers/verifiable_conversion_id_html_parser_util.cc +++ b/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_id_pattern/parsers/verifiable_conversion_id_html_parser_util.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_id_pattern/parsers/verifiable_conversion_id_html_parser_util.h" +#include #include #include "brave/components/brave_ads/core/internal/common/logging_util.h" @@ -13,7 +14,7 @@ namespace brave_ads { -absl::optional MaybeParseVerifableConversionIdFromHtml( +std::optional MaybeParseVerifableConversionIdFromHtml( const std::string& html, const ConversionResourceIdPatternInfo& resource_id_pattern) { std::string_view html_string_piece(html); @@ -23,7 +24,7 @@ absl::optional MaybeParseVerifableConversionIdFromHtml( if (!RE2::FindAndConsume(&html_string_piece, r, &verifiable_conversion_id)) { BLOG(1, "Failed to parse verifiable conversion id for " << resource_id_pattern.id_pattern << " resource id pattern"); - return absl::nullopt; + return std::nullopt; } return verifiable_conversion_id; diff --git a/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_id_pattern/parsers/verifiable_conversion_id_html_parser_util.h b/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_id_pattern/parsers/verifiable_conversion_id_html_parser_util.h index e7d758219c8..b80e9fd3d43 100644 --- a/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_id_pattern/parsers/verifiable_conversion_id_html_parser_util.h +++ b/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_id_pattern/parsers/verifiable_conversion_id_html_parser_util.h @@ -6,15 +6,15 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_CONVERSIONS_TYPES_VERIFIABLE_CONVERSION_VERIFIABLE_CONVERSION_ID_PATTERN_PARSERS_VERIFIABLE_CONVERSION_ID_HTML_PARSER_UTIL_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_CONVERSIONS_TYPES_VERIFIABLE_CONVERSION_VERIFIABLE_CONVERSION_ID_PATTERN_PARSERS_VERIFIABLE_CONVERSION_ID_HTML_PARSER_UTIL_H_ +#include #include -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { struct ConversionResourceIdPatternInfo; -absl::optional MaybeParseVerifableConversionIdFromHtml( +std::optional MaybeParseVerifableConversionIdFromHtml( const std::string& html, const ConversionResourceIdPatternInfo& resource_id_pattern); diff --git a/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_id_pattern/parsers/verifiable_conversion_id_url_redirects_parser_util.cc b/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_id_pattern/parsers/verifiable_conversion_id_url_redirects_parser_util.cc index c0cbbc0a021..fcc6eec4196 100644 --- a/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_id_pattern/parsers/verifiable_conversion_id_url_redirects_parser_util.cc +++ b/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_id_pattern/parsers/verifiable_conversion_id_url_redirects_parser_util.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_id_pattern/parsers/verifiable_conversion_id_url_redirects_parser_util.h" +#include #include #include "base/ranges/algorithm.h" @@ -16,7 +17,7 @@ namespace brave_ads { -absl::optional MaybeParseVerifableConversionIdFromUrlRedirects( +std::optional MaybeParseVerifableConversionIdFromUrlRedirects( const std::vector& redirect_chain, const ConversionResourceIdPatternInfo& resource_id_pattern) { const auto iter = base::ranges::find_if( @@ -26,7 +27,7 @@ absl::optional MaybeParseVerifableConversionIdFromUrlRedirects( if (iter == redirect_chain.cend()) { // Resource id pattern was not found in the URL redirect chain. - return absl::nullopt; + return std::nullopt; } std::string_view url_string_piece(iter->spec()); @@ -36,7 +37,7 @@ absl::optional MaybeParseVerifableConversionIdFromUrlRedirects( if (!RE2::FindAndConsume(&url_string_piece, r, &verifiable_conversion_id)) { BLOG(1, "Failed to parse verifiable conversion id for " << resource_id_pattern.id_pattern << " resource id pattern"); - return absl::nullopt; + return std::nullopt; } return verifiable_conversion_id; diff --git a/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_id_pattern/parsers/verifiable_conversion_id_url_redirects_parser_util.h b/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_id_pattern/parsers/verifiable_conversion_id_url_redirects_parser_util.h index 32b22f43b79..ab939a79687 100644 --- a/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_id_pattern/parsers/verifiable_conversion_id_url_redirects_parser_util.h +++ b/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_id_pattern/parsers/verifiable_conversion_id_url_redirects_parser_util.h @@ -6,10 +6,10 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_CONVERSIONS_TYPES_VERIFIABLE_CONVERSION_VERIFIABLE_CONVERSION_ID_PATTERN_PARSERS_VERIFIABLE_CONVERSION_ID_URL_REDIRECTS_PARSER_UTIL_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_CONVERSIONS_TYPES_VERIFIABLE_CONVERSION_VERIFIABLE_CONVERSION_ID_PATTERN_PARSERS_VERIFIABLE_CONVERSION_ID_URL_REDIRECTS_PARSER_UTIL_H_ +#include #include #include -#include "third_party/abseil-cpp/absl/types/optional.h" class GURL; @@ -17,7 +17,7 @@ namespace brave_ads { struct ConversionResourceIdPatternInfo; -absl::optional MaybeParseVerifableConversionIdFromUrlRedirects( +std::optional MaybeParseVerifableConversionIdFromUrlRedirects( const std::vector& redirect_chain, const ConversionResourceIdPatternInfo& resource_id_pattern); diff --git a/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_id_pattern/verifiable_conversion_id_pattern_util.cc b/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_id_pattern/verifiable_conversion_id_pattern_util.cc index 4a35da44fd5..9b5d8d5d25b 100644 --- a/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_id_pattern/verifiable_conversion_id_pattern_util.cc +++ b/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_id_pattern/verifiable_conversion_id_pattern_util.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_id_pattern/verifiable_conversion_id_pattern_util.h" +#include + #include "brave/components/brave_ads/core/internal/common/url/url_util.h" #include "brave/components/brave_ads/core/internal/conversions/resource/conversion_resource_id_pattern_search_in_types.h" #include "brave/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_id_pattern/parsers/verifiable_conversion_id_html_meta_tag_parser_util.h" @@ -16,12 +18,12 @@ namespace brave_ads { namespace { -absl::optional +std::optional FindMatchingConversionResourceIdPattern( const ConversionResourceIdPatternMap& resource_id_patterns, const std::vector& redirect_chain) { if (resource_id_patterns.empty() || redirect_chain.empty()) { - return absl::nullopt; + return std::nullopt; } for (const auto& [url_pattern, resource_id_pattern] : resource_id_patterns) { @@ -30,10 +32,10 @@ FindMatchingConversionResourceIdPattern( } } - return absl::nullopt; + return std::nullopt; } -absl::optional +std::optional MaybeParseResourceIdPatternSearchInTypeVerifiableConversionId( const std::vector& redirect_chain, const std::string& html, @@ -49,30 +51,30 @@ MaybeParseResourceIdPatternSearchInTypeVerifiableConversionId( } default: { - return absl::nullopt; + return std::nullopt; } } } -absl::optional MaybeParseDefaultVerifiableConversionId( +std::optional MaybeParseDefaultVerifiableConversionId( const std::string& html) { return MaybeParseVerifableConversionIdFromHtmlMetaTag(html); } } // namespace -absl::optional MaybeParseVerifiableConversionId( +std::optional MaybeParseVerifiableConversionId( const std::vector& redirect_chain, const std::string& html, const ConversionResourceIdPatternMap& resource_id_patterns) { - const absl::optional resource_id_pattern = + const std::optional resource_id_pattern = FindMatchingConversionResourceIdPattern(resource_id_patterns, redirect_chain); if (!resource_id_pattern) { return MaybeParseDefaultVerifiableConversionId(html); } - if (absl::optional verifiable_conversion_id = + if (std::optional verifiable_conversion_id = MaybeParseResourceIdPatternSearchInTypeVerifiableConversionId( redirect_chain, html, *resource_id_pattern)) { return verifiable_conversion_id; diff --git a/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_id_pattern/verifiable_conversion_id_pattern_util.h b/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_id_pattern/verifiable_conversion_id_pattern_util.h index bd435a6de44..6fbeabf0496 100644 --- a/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_id_pattern/verifiable_conversion_id_pattern_util.h +++ b/components/brave_ads/core/internal/conversions/types/verifiable_conversion/verifiable_conversion_id_pattern/verifiable_conversion_id_pattern_util.h @@ -6,17 +6,17 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_CONVERSIONS_TYPES_VERIFIABLE_CONVERSION_VERIFIABLE_CONVERSION_ID_PATTERN_VERIFIABLE_CONVERSION_ID_PATTERN_UTIL_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_CONVERSIONS_TYPES_VERIFIABLE_CONVERSION_VERIFIABLE_CONVERSION_ID_PATTERN_VERIFIABLE_CONVERSION_ID_PATTERN_UTIL_H_ +#include #include #include #include "brave/components/brave_ads/core/internal/conversions/resource/conversion_resource_id_pattern_info.h" -#include "third_party/abseil-cpp/absl/types/optional.h" class GURL; namespace brave_ads { -absl::optional MaybeParseVerifiableConversionId( +std::optional MaybeParseVerifiableConversionId( const std::vector& redirect_chain, const std::string& html, const ConversionResourceIdPatternMap& resource_id_patterns); diff --git a/components/brave_ads/core/internal/creatives/conversions/creative_set_conversion_builder.cc b/components/brave_ads/core/internal/creatives/conversions/creative_set_conversion_builder.cc index 2879aff6068..3043a787fa4 100644 --- a/components/brave_ads/core/internal/creatives/conversions/creative_set_conversion_builder.cc +++ b/components/brave_ads/core/internal/creatives/conversions/creative_set_conversion_builder.cc @@ -5,16 +5,18 @@ #include "brave/components/brave_ads/core/internal/creatives/conversions/creative_set_conversion_builder.h" +#include + #include "base/time/time.h" #include "brave/components/brave_ads/core/internal/creatives/conversions/creative_set_conversion_info.h" #include "brave/components/brave_ads/core/mojom/brave_ads.mojom.h" namespace brave_ads { -absl::optional BuildCreativeSetConversion( +std::optional BuildCreativeSetConversion( const mojom::SearchResultAdInfoPtr& ad_mojom) { if (!ad_mojom || !ad_mojom->conversion) { - return absl::nullopt; + return std::nullopt; } CreativeSetConversionInfo creative_set_conversion; diff --git a/components/brave_ads/core/internal/creatives/conversions/creative_set_conversion_builder.h b/components/brave_ads/core/internal/creatives/conversions/creative_set_conversion_builder.h index 4045e44157c..ea1a69e724a 100644 --- a/components/brave_ads/core/internal/creatives/conversions/creative_set_conversion_builder.h +++ b/components/brave_ads/core/internal/creatives/conversions/creative_set_conversion_builder.h @@ -6,14 +6,15 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_CREATIVES_CONVERSIONS_CREATIVE_SET_CONVERSION_BUILDER_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_CREATIVES_CONVERSIONS_CREATIVE_SET_CONVERSION_BUILDER_H_ +#include + #include "brave/components/brave_ads/core/mojom/brave_ads.mojom-forward.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { struct CreativeSetConversionInfo; -absl::optional BuildCreativeSetConversion( +std::optional BuildCreativeSetConversion( const mojom::SearchResultAdInfoPtr& ad_mojom); } // namespace brave_ads diff --git a/components/brave_ads/core/internal/creatives/conversions/creative_set_conversion_info.h b/components/brave_ads/core/internal/creatives/conversions/creative_set_conversion_info.h index 4c896ee8b61..f88ddb4ac20 100644 --- a/components/brave_ads/core/internal/creatives/conversions/creative_set_conversion_info.h +++ b/components/brave_ads/core/internal/creatives/conversions/creative_set_conversion_info.h @@ -6,11 +6,11 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_CREATIVES_CONVERSIONS_CREATIVE_SET_CONVERSION_INFO_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_CREATIVES_CONVERSIONS_CREATIVE_SET_CONVERSION_INFO_H_ +#include #include #include #include "base/time/time.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -31,7 +31,7 @@ struct CreativeSetConversionInfo final { std::string id; std::string url_pattern; - absl::optional verifiable_advertiser_public_key_base64; + std::optional verifiable_advertiser_public_key_base64; base::TimeDelta observation_window; base::Time expire_at; }; diff --git a/components/brave_ads/core/internal/creatives/conversions/creative_set_conversion_unittest_util.cc b/components/brave_ads/core/internal/creatives/conversions/creative_set_conversion_unittest_util.cc index 70ebea1cd67..6f65a787ab4 100644 --- a/components/brave_ads/core/internal/creatives/conversions/creative_set_conversion_unittest_util.cc +++ b/components/brave_ads/core/internal/creatives/conversions/creative_set_conversion_unittest_util.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/creatives/conversions/creative_set_conversion_unittest_util.h" +#include + #include "brave/components/brave_ads/core/internal/common/unittest/unittest_time_util.h" #include "brave/components/brave_ads/core/internal/creatives/conversions/creative_set_conversion_database_table_util.h" @@ -16,7 +18,7 @@ CreativeSetConversionInfo BuildCreativeSetConversion( const base::TimeDelta observation_window) { return BuildVerifiableCreativeSetConversion( creative_set_id, url_pattern, observation_window, - /*verifiable_advertiser_public_key_base64=*/absl::nullopt); + /*verifiable_advertiser_public_key_base64=*/std::nullopt); } void BuildAndSaveCreativeSetConversion( @@ -25,15 +27,14 @@ void BuildAndSaveCreativeSetConversion( const base::TimeDelta observation_window) { BuildAndSaveVerifiableCreativeSetConversion( creative_set_id, url_pattern, observation_window, - /*verifiable_advertiser_public_key_base64=*/absl::nullopt); + /*verifiable_advertiser_public_key_base64=*/std::nullopt); } CreativeSetConversionInfo BuildVerifiableCreativeSetConversion( const std::string& creative_set_id, const std::string& url_pattern, const base::TimeDelta observation_window, - const absl::optional& - verifiable_advertiser_public_key_base64) { + const std::optional& verifiable_advertiser_public_key_base64) { CreativeSetConversionInfo creative_set_conversion; creative_set_conversion.id = creative_set_id; @@ -51,8 +52,7 @@ void BuildAndSaveVerifiableCreativeSetConversion( const std::string& creative_set_id, const std::string& url_pattern, const base::TimeDelta observation_window, - const absl::optional& - verifiable_advertiser_public_key_base64) { + const std::optional& verifiable_advertiser_public_key_base64) { CreativeSetConversionList creative_set_conversions; const CreativeSetConversionInfo creative_set_conversion = diff --git a/components/brave_ads/core/internal/creatives/conversions/creative_set_conversion_unittest_util.h b/components/brave_ads/core/internal/creatives/conversions/creative_set_conversion_unittest_util.h index 6aa6e8fcacc..760934a937a 100644 --- a/components/brave_ads/core/internal/creatives/conversions/creative_set_conversion_unittest_util.h +++ b/components/brave_ads/core/internal/creatives/conversions/creative_set_conversion_unittest_util.h @@ -6,9 +6,9 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_CREATIVES_CONVERSIONS_CREATIVE_SET_CONVERSION_UNITTEST_UTIL_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_CREATIVES_CONVERSIONS_CREATIVE_SET_CONVERSION_UNITTEST_UTIL_H_ +#include #include -#include "third_party/abseil-cpp/absl/types/optional.h" namespace base { class TimeDelta; @@ -32,12 +32,12 @@ CreativeSetConversionInfo BuildVerifiableCreativeSetConversion( const std::string& creative_set_id, const std::string& url_pattern, base::TimeDelta observation_window, - const absl::optional& verifiable_advertiser_public_key_base64); + const std::optional& verifiable_advertiser_public_key_base64); void BuildAndSaveVerifiableCreativeSetConversion( const std::string& creative_set_id, const std::string& url_pattern, base::TimeDelta observation_window, - const absl::optional& verifiable_advertiser_public_key_base64); + const std::optional& verifiable_advertiser_public_key_base64); } // namespace test diff --git a/components/brave_ads/core/internal/creatives/conversions/creative_set_conversion_util.cc b/components/brave_ads/core/internal/creatives/conversions/creative_set_conversion_util.cc index cbe99c934ad..6b84149c323 100644 --- a/components/brave_ads/core/internal/creatives/conversions/creative_set_conversion_util.cc +++ b/components/brave_ads/core/internal/creatives/conversions/creative_set_conversion_util.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_ads/core/internal/creatives/conversions/creative_set_conversion_util.h" #include +#include #include #include "base/containers/contains.h" @@ -72,7 +73,7 @@ CreativeSetConversionBuckets SortCreativeSetConversionsIntoBuckets( return buckets; } -absl::optional FindNonExpiredCreativeSetConversion( +std::optional FindNonExpiredCreativeSetConversion( const CreativeSetConversionList& creative_set_conversions, const AdEventInfo& ad_event) { const auto iter = base::ranges::find_if( @@ -83,7 +84,7 @@ absl::optional FindNonExpiredCreativeSetConversion( }); if (iter == creative_set_conversions.cend()) { - return absl::nullopt; + return std::nullopt; } return *iter; diff --git a/components/brave_ads/core/internal/creatives/conversions/creative_set_conversion_util.h b/components/brave_ads/core/internal/creatives/conversions/creative_set_conversion_util.h index 2ddb398005d..88ac9f315ab 100644 --- a/components/brave_ads/core/internal/creatives/conversions/creative_set_conversion_util.h +++ b/components/brave_ads/core/internal/creatives/conversions/creative_set_conversion_util.h @@ -7,12 +7,12 @@ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_CREATIVES_CONVERSIONS_CREATIVE_SET_CONVERSION_UTIL_H_ #include +#include #include #include #include "brave/components/brave_ads/core/internal/creatives/conversions/creative_set_conversion_info.h" #include "brave/components/brave_ads/core/internal/user/user_interaction/ad_events/ad_event_info.h" -#include "third_party/abseil-cpp/absl/types/optional.h" class GURL; @@ -29,7 +29,7 @@ CreativeSetConversionList FilterConvertedAndNonMatchingCreativeSetConversions( CreativeSetConversionBuckets SortCreativeSetConversionsIntoBuckets( const CreativeSetConversionList& creative_set_conversions); -absl::optional FindNonExpiredCreativeSetConversion( +std::optional FindNonExpiredCreativeSetConversion( const CreativeSetConversionList& creative_set_conversions, const AdEventInfo& ad_event); diff --git a/components/brave_ads/core/internal/creatives/notification_ads/notification_ad_manager.cc b/components/brave_ads/core/internal/creatives/notification_ads/notification_ad_manager.cc index bbb0108fa12..631b8830732 100644 --- a/components/brave_ads/core/internal/creatives/notification_ads/notification_ad_manager.cc +++ b/components/brave_ads/core/internal/creatives/notification_ads/notification_ad_manager.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/creatives/notification_ads/notification_ad_manager.h" +#include + #include "base/check.h" #include "base/ranges/algorithm.h" #include "base/values.h" @@ -40,15 +42,14 @@ NotificationAdManager& NotificationAdManager::GetInstance() { return GlobalState::GetInstance()->GetNotificationAdManager(); } -absl::optional -NotificationAdManager::MaybeGetForPlacementId( +std::optional NotificationAdManager::MaybeGetForPlacementId( const std::string& placement_id) const { CHECK(!placement_id.empty()); const auto iter = base::ranges::find(ads_, placement_id, &NotificationAdInfo::placement_id); if (iter == ads_.cend()) { - return absl::nullopt; + return std::nullopt; } return *iter; @@ -112,7 +113,7 @@ bool NotificationAdManager::Exists(const std::string& placement_id) const { /////////////////////////////////////////////////////////////////////////////// void NotificationAdManager::Initialize() { - const absl::optional list = + const std::optional list = GetProfileListPref(prefs::kNotificationAds); if (!list) { return; diff --git a/components/brave_ads/core/internal/creatives/notification_ads/notification_ad_manager.h b/components/brave_ads/core/internal/creatives/notification_ads/notification_ad_manager.h index 572da539cd8..ab124f5ff4e 100644 --- a/components/brave_ads/core/internal/creatives/notification_ads/notification_ad_manager.h +++ b/components/brave_ads/core/internal/creatives/notification_ads/notification_ad_manager.h @@ -6,10 +6,10 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_CREATIVES_NOTIFICATION_ADS_NOTIFICATION_AD_MANAGER_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_CREATIVES_NOTIFICATION_ADS_NOTIFICATION_AD_MANAGER_H_ +#include #include #include "base/containers/circular_deque.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -29,7 +29,7 @@ class NotificationAdManager final { static NotificationAdManager& GetInstance(); - absl::optional MaybeGetForPlacementId( + std::optional MaybeGetForPlacementId( const std::string& placement_id) const; void Add(const NotificationAdInfo& ad); diff --git a/components/brave_ads/core/internal/deprecated/client/client_info.cc b/components/brave_ads/core/internal/deprecated/client/client_info.cc index a48c43c73b9..d69a2776604 100644 --- a/components/brave_ads/core/internal/deprecated/client/client_info.cc +++ b/components/brave_ads/core/internal/deprecated/client/client_info.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/deprecated/client/client_info.h" +#include #include #include @@ -16,7 +17,6 @@ #include "brave/components/brave_ads/core/public/history/history_item_value_util.h" #include "brave/components/brave_ads/core/public/units/ad_type.h" #include "build/build_config.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -213,7 +213,7 @@ std::string ClientInfo::ToJson() const { } bool ClientInfo::FromJson(const std::string& json) { - const absl::optional dict = base::JSONReader::ReadDict( + const std::optional dict = base::JSONReader::ReadDict( json, base::JSON_PARSE_CHROMIUM_EXTENSIONS | base::JSONParserOptions::JSON_PARSE_RFC); if (!dict) { diff --git a/components/brave_ads/core/internal/deprecated/client/client_state_manager.cc b/components/brave_ads/core/internal/deprecated/client/client_state_manager.cc index 4e531da3cfb..f18ea95b92b 100644 --- a/components/brave_ads/core/internal/deprecated/client/client_state_manager.cc +++ b/components/brave_ads/core/internal/deprecated/client/client_state_manager.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/deprecated/client/client_state_manager.h" +#include #include #include "base/check.h" @@ -474,7 +475,7 @@ void ClientStateManager::SaveState() { } void ClientStateManager::LoadCallback(InitializeCallback callback, - const absl::optional& json) { + const std::optional& json) { if (!json) { BLOG(3, "Client state does not exist, creating default state"); diff --git a/components/brave_ads/core/internal/deprecated/client/client_state_manager.h b/components/brave_ads/core/internal/deprecated/client/client_state_manager.h index b9cda8f800d..59f2063c185 100644 --- a/components/brave_ads/core/internal/deprecated/client/client_state_manager.h +++ b/components/brave_ads/core/internal/deprecated/client/client_state_manager.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_DEPRECATED_CLIENT_CLIENT_STATE_MANAGER_H_ #include +#include #include #include "base/memory/weak_ptr.h" @@ -21,7 +22,6 @@ #include "brave/components/brave_ads/core/public/ads_callback.h" #include "brave/components/brave_ads/core/public/history/history_item_info.h" #include "brave/components/brave_ads/core/public/units/ad_type.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -90,7 +90,7 @@ class ClientStateManager final { void SaveState(); void LoadCallback(InitializeCallback callback, - const absl::optional& json); + const std::optional& json); [[nodiscard]] bool FromJson(const std::string& json); diff --git a/components/brave_ads/core/internal/deprecated/client/preferences/ad_preferences_info.cc b/components/brave_ads/core/internal/deprecated/client/preferences/ad_preferences_info.cc index cd117df6681..3e9f3996223 100644 --- a/components/brave_ads/core/internal/deprecated/client/preferences/ad_preferences_info.cc +++ b/components/brave_ads/core/internal/deprecated/client/preferences/ad_preferences_info.cc @@ -5,12 +5,12 @@ #include "brave/components/brave_ads/core/internal/deprecated/client/preferences/ad_preferences_info.h" +#include #include #include "base/check.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -145,7 +145,7 @@ std::string AdPreferencesInfo::ToJson() const { } bool AdPreferencesInfo::FromJson(const std::string& json) { - const absl::optional dict = base::JSONReader::ReadDict( + const std::optional dict = base::JSONReader::ReadDict( json, base::JSON_PARSE_CHROMIUM_EXTENSIONS | base::JSONParserOptions::JSON_PARSE_RFC); if (!dict) { diff --git a/components/brave_ads/core/internal/deprecated/confirmations/confirmation_state_manager.cc b/components/brave_ads/core/internal/deprecated/confirmations/confirmation_state_manager.cc index 595ac08b5f5..fa2ab88ee30 100644 --- a/components/brave_ads/core/internal/deprecated/confirmations/confirmation_state_manager.cc +++ b/components/brave_ads/core/internal/deprecated/confirmations/confirmation_state_manager.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/deprecated/confirmations/confirmation_state_manager.h" +#include #include #include "base/check.h" @@ -55,7 +56,7 @@ base::Value::Dict GetConfirmationsAsDictionary( if (confirmation.reward) { // Token - const absl::optional token_base64 = + const std::optional token_base64 = confirmation.reward->token.EncodeBase64(); if (!token_base64) { continue; @@ -63,7 +64,7 @@ base::Value::Dict GetConfirmationsAsDictionary( dict.Set("payment_token", *token_base64); // Blinded token - const absl::optional blinded_token_base64 = + const std::optional blinded_token_base64 = confirmation.reward->blinded_token.EncodeBase64(); if (!blinded_token_base64) { continue; @@ -72,14 +73,14 @@ base::Value::Dict GetConfirmationsAsDictionary( // Unblinded token base::Value::Dict unblinded_token; - const absl::optional unblinded_token_base64 = + const std::optional unblinded_token_base64 = confirmation.reward->unblinded_token.EncodeBase64(); if (!unblinded_token_base64) { continue; } unblinded_token.Set("unblinded_token", *unblinded_token_base64); - const absl::optional public_key_base64 = + const std::optional public_key_base64 = confirmation.reward->public_key.EncodeBase64(); if (!public_key_base64) { continue; @@ -104,7 +105,7 @@ base::Value::Dict GetConfirmationsAsDictionary( // must create a new credential excluding the dynamic user data. ConfirmationInfo mutable_confirmation(confirmation); mutable_confirmation.user_data.dynamic = {}; - const absl::optional reward_credential_base64url = + const std::optional reward_credential_base64url = BuildRewardCredential(mutable_confirmation); if (!reward_credential_base64url) { continue; @@ -134,7 +135,7 @@ ConfirmationStateManager& ConfirmationStateManager::GetInstance() { } void ConfirmationStateManager::LoadState( - const absl::optional& wallet, + const std::optional& wallet, InitializeCallback callback) { BLOG(3, "Loading confirmation state"); @@ -147,7 +148,7 @@ void ConfirmationStateManager::LoadState( void ConfirmationStateManager::LoadCallback( InitializeCallback callback, - const absl::optional& json) { + const std::optional& json) { if (!json) { BLOG(3, "Confirmation state does not exist, creating default state"); @@ -187,7 +188,7 @@ void ConfirmationStateManager::SaveState() { })); } -absl::optional ConfirmationStateManager::GetReward( +std::optional ConfirmationStateManager::GetReward( const base::Value::Dict& dict) const { RewardInfo reward; @@ -195,14 +196,14 @@ absl::optional ConfirmationStateManager::GetReward( if (const auto* const value = dict.FindString("payment_token")) { reward.token = cbr::Token(*value); } else { - return absl::nullopt; + return std::nullopt; } // Blinded token if (const auto* const value = dict.FindString("blinded_payment_token")) { reward.blinded_token = cbr::BlindedToken(*value); } else { - return absl::nullopt; + return std::nullopt; } if (const auto* const unblinded_token_dict = dict.FindDict("token_info")) { @@ -211,7 +212,7 @@ absl::optional ConfirmationStateManager::GetReward( unblinded_token_dict->FindString("unblinded_token")) { reward.unblinded_token = cbr::UnblindedToken(*value); } else { - return absl::nullopt; + return std::nullopt; } // Public key @@ -219,7 +220,7 @@ absl::optional ConfirmationStateManager::GetReward( unblinded_token_dict->FindString("public_key")) { reward.public_key = cbr::PublicKey(*value); } else { - return absl::nullopt; + return std::nullopt; } // Signature @@ -229,19 +230,19 @@ absl::optional ConfirmationStateManager::GetReward( } else { // Legacy migration. if (!wallet_) { - return absl::nullopt; + return std::nullopt; } - const absl::optional unblinded_token_base64 = + const std::optional unblinded_token_base64 = reward.unblinded_token.EncodeBase64(); if (!unblinded_token_base64) { - return absl::nullopt; + return std::nullopt; } - const absl::optional signature = + const std::optional signature = crypto::Sign(*unblinded_token_base64, wallet_->secret_key); if (!signature) { - return absl::nullopt; + return std::nullopt; } reward.signature = *signature; @@ -252,7 +253,7 @@ absl::optional ConfirmationStateManager::GetReward( if (const auto* const value = dict.FindString("credential")) { reward.credential_base64url = *value; } else { - return absl::nullopt; + return std::nullopt; } return reward; @@ -401,7 +402,7 @@ std::string ConfirmationStateManager::ToJson() { } bool ConfirmationStateManager::FromJson(const std::string& json) { - const absl::optional dict = + const std::optional dict = base::JSONReader::ReadDict(json); if (!dict) { return false; @@ -451,7 +452,7 @@ bool ConfirmationStateManager::ParseConfirmationTokensFromDictionary( base::ranges::remove_if( filtered_confirmation_tokens, [&public_key](const ConfirmationTokenInfo& confirmation_token) { - const absl::optional unblinded_token_base64 = + const std::optional unblinded_token_base64 = confirmation_token.unblinded_token.EncodeBase64(); return !unblinded_token_base64 || !crypto::Verify(*unblinded_token_base64, public_key, diff --git a/components/brave_ads/core/internal/deprecated/confirmations/confirmation_state_manager.h b/components/brave_ads/core/internal/deprecated/confirmations/confirmation_state_manager.h index 60ca805dd04..d1c2077097c 100644 --- a/components/brave_ads/core/internal/deprecated/confirmations/confirmation_state_manager.h +++ b/components/brave_ads/core/internal/deprecated/confirmations/confirmation_state_manager.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_DEPRECATED_CONFIRMATIONS_CONFIRMATION_STATE_MANAGER_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_DEPRECATED_CONFIRMATIONS_CONFIRMATION_STATE_MANAGER_H_ +#include #include #include "base/memory/weak_ptr.h" @@ -15,7 +16,6 @@ #include "brave/components/brave_ads/core/internal/account/tokens/payment_tokens/payment_tokens.h" #include "brave/components/brave_ads/core/internal/account/wallet/wallet_info.h" #include "brave/components/brave_ads/core/public/ads_callback.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -34,7 +34,7 @@ class ConfirmationStateManager final { static ConfirmationStateManager& GetInstance(); - void LoadState(const absl::optional& wallet, + void LoadState(const std::optional& wallet, InitializeCallback callback); bool IsInitialized() const { return is_initialized_; } @@ -44,7 +44,7 @@ class ConfirmationStateManager final { std::string ToJson(); [[nodiscard]] bool FromJson(const std::string& json); - absl::optional GetReward(const base::Value::Dict& dict) const; + std::optional GetReward(const base::Value::Dict& dict) const; bool GetConfirmationsFromDictionary(const base::Value::Dict& dict, ConfirmationList* confirmations) const; @@ -75,7 +75,7 @@ class ConfirmationStateManager final { private: void LoadCallback(InitializeCallback callback, - const absl::optional& json); + const std::optional& json); bool ParseConfirmationsFromDictionary(const base::Value::Dict& dict); @@ -85,7 +85,7 @@ class ConfirmationStateManager final { bool is_initialized_ = false; - absl::optional wallet_; + std::optional wallet_; ConfirmationList confirmations_; diff --git a/components/brave_ads/core/internal/diagnostics/diagnostic_manager_unittest.cc b/components/brave_ads/core/internal/diagnostics/diagnostic_manager_unittest.cc index 91661b98e09..52b6737dec2 100644 --- a/components/brave_ads/core/internal/diagnostics/diagnostic_manager_unittest.cc +++ b/components/brave_ads/core/internal/diagnostics/diagnostic_manager_unittest.cc @@ -16,7 +16,6 @@ #include "brave/components/brave_ads/core/internal/diagnostics/entries/last_unidle_time_diagnostic_util.h" #include "brave/components/brave_ads/core/public/ads_callback.h" #include "brave/components/l10n/common/test/scoped_default_locale.h" -#include "third_party/abseil-cpp/absl/types/optional.h" // npm run test -- brave_unit_tests --filter=BraveAds.* diff --git a/components/brave_ads/core/internal/flags/environment/environment_command_line_switch_parser_util.cc b/components/brave_ads/core/internal/flags/environment/environment_command_line_switch_parser_util.cc index 73ecd3f9b5b..1bda65795e7 100644 --- a/components/brave_ads/core/internal/flags/environment/environment_command_line_switch_parser_util.cc +++ b/components/brave_ads/core/internal/flags/environment/environment_command_line_switch_parser_util.cc @@ -5,16 +5,18 @@ #include "brave/components/brave_ads/core/internal/flags/environment/environment_command_line_switch_parser_util.h" +#include + #include "base/notreached.h" #include "brave/components/brave_rewards/common/rewards_flags.h" namespace brave_ads { -absl::optional ParseEnvironmentCommandLineSwitch() { +std::optional ParseEnvironmentCommandLineSwitch() { const brave_rewards::RewardsFlags& flags = brave_rewards::RewardsFlags::ForCurrentProcess(); if (!flags.environment) { - return absl::nullopt; + return std::nullopt; } switch (*flags.environment) { diff --git a/components/brave_ads/core/internal/flags/environment/environment_command_line_switch_parser_util.h b/components/brave_ads/core/internal/flags/environment/environment_command_line_switch_parser_util.h index 7bfece1d8ec..83421b327e3 100644 --- a/components/brave_ads/core/internal/flags/environment/environment_command_line_switch_parser_util.h +++ b/components/brave_ads/core/internal/flags/environment/environment_command_line_switch_parser_util.h @@ -6,12 +6,13 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_FLAGS_ENVIRONMENT_ENVIRONMENT_COMMAND_LINE_SWITCH_PARSER_UTIL_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_FLAGS_ENVIRONMENT_ENVIRONMENT_COMMAND_LINE_SWITCH_PARSER_UTIL_H_ +#include + #include "brave/components/brave_ads/core/mojom/brave_ads.mojom-shared.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { -absl::optional ParseEnvironmentCommandLineSwitch(); +std::optional ParseEnvironmentCommandLineSwitch(); } // namespace brave_ads diff --git a/components/brave_ads/core/internal/flags/flags_util.cc b/components/brave_ads/core/internal/flags/flags_util.cc index a6b678b8f82..7765a8fae54 100644 --- a/components/brave_ads/core/internal/flags/flags_util.cc +++ b/components/brave_ads/core/internal/flags/flags_util.cc @@ -12,7 +12,6 @@ #include "brave/components/brave_ads/core/internal/flags/environment/environment_command_line_switch_parser_util.h" #include "brave/components/brave_ads/core/internal/flags/flag_constants.h" #include "brave/components/brave_ads/core/mojom/brave_ads.mojom.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { diff --git a/components/brave_ads/core/internal/legacy_migration/client/legacy_client_migration.cc b/components/brave_ads/core/internal/legacy_migration/client/legacy_client_migration.cc index 93b094c9e6a..d04d8c7f877 100644 --- a/components/brave_ads/core/internal/legacy_migration/client/legacy_client_migration.cc +++ b/components/brave_ads/core/internal/legacy_migration/client/legacy_client_migration.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/legacy_migration/client/legacy_client_migration.h" +#include #include #include @@ -16,7 +17,6 @@ #include "brave/components/brave_ads/core/internal/deprecated/client/client_state_manager_constants.h" #include "brave/components/brave_ads/core/internal/legacy_migration/client/legacy_client_migration_util.h" #include "brave/components/brave_ads/core/public/prefs/pref_names.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -41,7 +41,7 @@ void MigrateClientState(InitializeCallback callback) { Load(kClientStateFilename, base::BindOnce( [](InitializeCallback callback, - const absl::optional& json) { + const std::optional& json) { if (!json) { // Client state does not exist return SuccessfullyMigrated(std::move(callback)); diff --git a/components/brave_ads/core/internal/legacy_migration/confirmations/legacy_confirmation_migration.cc b/components/brave_ads/core/internal/legacy_migration/confirmations/legacy_confirmation_migration.cc index 0ae84afe7ec..4a517f25f05 100644 --- a/components/brave_ads/core/internal/legacy_migration/confirmations/legacy_confirmation_migration.cc +++ b/components/brave_ads/core/internal/legacy_migration/confirmations/legacy_confirmation_migration.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/legacy_migration/confirmations/legacy_confirmation_migration.h" +#include #include #include @@ -16,7 +17,6 @@ #include "brave/components/brave_ads/core/internal/deprecated/confirmations/confirmation_state_manager_constants.h" #include "brave/components/brave_ads/core/internal/legacy_migration/confirmations/legacy_confirmation_migration_util.h" #include "brave/components/brave_ads/core/public/prefs/pref_names.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -41,7 +41,7 @@ void MigrateConfirmationState(InitializeCallback callback) { Load(kConfirmationStateFilename, base::BindOnce( [](InitializeCallback callback, - const absl::optional& json) { + const std::optional& json) { if (!json) { // Confirmation state does not exist return SuccessfullyMigrated(std::move(callback)); diff --git a/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration.cc b/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration.cc index c285f09ea19..b2e292396b2 100644 --- a/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration.cc +++ b/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration.h" +#include #include #include @@ -17,7 +18,6 @@ #include "brave/components/brave_ads/core/internal/deprecated/confirmations/confirmation_state_manager_constants.h" #include "brave/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_util.h" #include "brave/components/brave_ads/core/public/prefs/pref_names.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads::rewards { @@ -37,7 +37,7 @@ void SuccessfullyMigrated(InitializeCallback callback) { } void MigrateCallback(InitializeCallback callback, - const absl::optional& json) { + const std::optional& json) { if (!json) { // Confirmation state does not exist return SuccessfullyMigrated(std::move(callback)); @@ -45,7 +45,7 @@ void MigrateCallback(InitializeCallback callback, BLOG(3, "Migrating rewards state"); - const absl::optional transactions = + const std::optional transactions = BuildTransactionsFromJson(*json); if (!transactions) { // TODO(https://github.com/brave/brave-browser/issues/32066): Remove diff --git a/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_payment_tokens_json_reader.cc b/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_payment_tokens_json_reader.cc index 3e7499ab467..73e132850e9 100644 --- a/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_payment_tokens_json_reader.cc +++ b/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_payment_tokens_json_reader.cc @@ -5,17 +5,19 @@ #include "brave/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_payment_tokens_json_reader.h" +#include + #include "base/json/json_reader.h" #include "base/values.h" #include "brave/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_payment_tokens_json_reader_util.h" namespace brave_ads::rewards::json::reader { -absl::optional ReadPaymentTokens(const std::string& json) { - const absl::optional dict = +std::optional ReadPaymentTokens(const std::string& json) { + const std::optional dict = base::JSONReader::ReadDict(json); if (!dict) { - return absl::nullopt; + return std::nullopt; } return ParsePaymentTokens(*dict); diff --git a/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_payment_tokens_json_reader.h b/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_payment_tokens_json_reader.h index 017d453624c..d382a7ff494 100644 --- a/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_payment_tokens_json_reader.h +++ b/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_payment_tokens_json_reader.h @@ -6,14 +6,14 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_LEGACY_MIGRATION_REWARDS_LEGACY_REWARDS_MIGRATION_PAYMENT_TOKENS_JSON_READER_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_LEGACY_MIGRATION_REWARDS_LEGACY_REWARDS_MIGRATION_PAYMENT_TOKENS_JSON_READER_H_ +#include #include #include "brave/components/brave_ads/core/internal/account/tokens/payment_tokens/payment_token_info.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads::rewards::json::reader { -absl::optional ReadPaymentTokens(const std::string& json); +std::optional ReadPaymentTokens(const std::string& json); } // namespace brave_ads::rewards::json::reader diff --git a/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_payment_tokens_json_reader_util.cc b/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_payment_tokens_json_reader_util.cc index df10018afb2..b7659223f69 100644 --- a/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_payment_tokens_json_reader_util.cc +++ b/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_payment_tokens_json_reader_util.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_payment_tokens_json_reader_util.h" +#include #include #include "base/values.h" @@ -19,48 +20,48 @@ constexpr char kPaymentTokenListKey[] = "unblinded_payment_tokens"; constexpr char kUnblindedTokenKey[] = "unblinded_token"; constexpr char kPublicKeyKey[] = "public_key"; -absl::optional ParsePaymentToken( +std::optional ParsePaymentToken( const base::Value::Dict& dict) { PaymentTokenInfo payment_token; // Public key const std::string* const public_key = dict.FindString(kPublicKeyKey); if (!public_key) { - return absl::nullopt; + return std::nullopt; } payment_token.public_key = cbr::PublicKey(*public_key); if (!payment_token.public_key.has_value()) { - return absl::nullopt; + return std::nullopt; } // Unblinded token const std::string* const unblinded_token = dict.FindString(kUnblindedTokenKey); if (!unblinded_token) { - return absl::nullopt; + return std::nullopt; } payment_token.unblinded_token = cbr::UnblindedToken(*unblinded_token); if (!payment_token.unblinded_token.has_value()) { - return absl::nullopt; + return std::nullopt; } return payment_token; } -absl::optional GetPaymentTokensFromList( +std::optional GetPaymentTokensFromList( const base::Value::List& list) { PaymentTokenList payment_tokens; for (const auto& item : list) { const auto* item_dict = item.GetIfDict(); if (!item_dict) { - return absl::nullopt; + return std::nullopt; } - const absl::optional payment_token = + const std::optional payment_token = ParsePaymentToken(*item_dict); if (!payment_token) { - return absl::nullopt; + return std::nullopt; } payment_tokens.push_back(*payment_token); @@ -71,7 +72,7 @@ absl::optional GetPaymentTokensFromList( } // namespace -absl::optional ParsePaymentTokens( +std::optional ParsePaymentTokens( const base::Value::Dict& dict) { const auto* const list = dict.FindList(kPaymentTokenListKey); if (!list) { diff --git a/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_payment_tokens_json_reader_util.h b/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_payment_tokens_json_reader_util.h index b083d8ba470..bc2534c322d 100644 --- a/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_payment_tokens_json_reader_util.h +++ b/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_payment_tokens_json_reader_util.h @@ -6,13 +6,14 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_LEGACY_MIGRATION_REWARDS_LEGACY_REWARDS_MIGRATION_PAYMENT_TOKENS_JSON_READER_UTIL_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_LEGACY_MIGRATION_REWARDS_LEGACY_REWARDS_MIGRATION_PAYMENT_TOKENS_JSON_READER_UTIL_H_ +#include + #include "base/values.h" #include "brave/components/brave_ads/core/internal/account/tokens/payment_tokens/payment_token_info.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads::rewards::json::reader { -absl::optional ParsePaymentTokens( +std::optional ParsePaymentTokens( const base::Value::Dict& dict); } // namespace brave_ads::rewards::json::reader diff --git a/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_payments_json_reader.cc b/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_payments_json_reader.cc index f6d7a142cc7..557bcb7bab5 100644 --- a/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_payments_json_reader.cc +++ b/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_payments_json_reader.cc @@ -5,17 +5,19 @@ #include "brave/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_payments_json_reader.h" +#include + #include "base/json/json_reader.h" #include "base/values.h" #include "brave/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_payments_json_reader_util.h" namespace brave_ads::rewards::json::reader { -absl::optional ReadPayments(const std::string& json) { - const absl::optional dict = +std::optional ReadPayments(const std::string& json) { + const std::optional dict = base::JSONReader::ReadDict(json); if (!dict) { - return absl::nullopt; + return std::nullopt; } return ParsePayments(*dict); diff --git a/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_payments_json_reader.h b/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_payments_json_reader.h index 71f6c4b522e..a9234fcc0d6 100644 --- a/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_payments_json_reader.h +++ b/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_payments_json_reader.h @@ -6,14 +6,14 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_LEGACY_MIGRATION_REWARDS_LEGACY_REWARDS_MIGRATION_PAYMENTS_JSON_READER_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_LEGACY_MIGRATION_REWARDS_LEGACY_REWARDS_MIGRATION_PAYMENTS_JSON_READER_H_ +#include #include #include "brave/components/brave_ads/core/internal/legacy_migration/rewards/payment_info.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads::rewards::json::reader { -absl::optional ReadPayments(const std::string& json); +std::optional ReadPayments(const std::string& json); } // namespace brave_ads::rewards::json::reader diff --git a/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_payments_json_reader_util.cc b/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_payments_json_reader_util.cc index 7c54c4024fb..50ed2e41c93 100644 --- a/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_payments_json_reader_util.cc +++ b/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_payments_json_reader_util.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_payments_json_reader_util.h" +#include #include #include "base/strings/string_number_conversions.h" @@ -19,20 +20,20 @@ constexpr char kBalanceKey[] = "balance"; constexpr char kMonthKey[] = "month"; constexpr char kTransactionCountKey[] = "transaction_count"; -absl::optional ParsePayment(const base::Value::Dict& dict) { +std::optional ParsePayment(const base::Value::Dict& dict) { PaymentInfo payment; // Balance - const absl::optional balance = dict.FindDouble(kBalanceKey); + const std::optional balance = dict.FindDouble(kBalanceKey); if (!balance) { - return absl::nullopt; + return std::nullopt; } payment.balance = *balance; // Month const std::string* const month = dict.FindString(kMonthKey); if (!month) { - return absl::nullopt; + return std::nullopt; } payment.month = *month; @@ -40,28 +41,28 @@ absl::optional ParsePayment(const base::Value::Dict& dict) { const std::string* const transaction_count = dict.FindString(kTransactionCountKey); if (!transaction_count) { - return absl::nullopt; + return std::nullopt; } if (!base::StringToInt(*transaction_count, &payment.transaction_count)) { - return absl::nullopt; + return std::nullopt; } return payment; } -absl::optional GetPaymentsFromList(const base::Value::List& list) { +std::optional GetPaymentsFromList(const base::Value::List& list) { PaymentList payments; for (const auto& item : list) { const auto* item_dict = item.GetIfDict(); if (!item_dict) { - return absl::nullopt; + return std::nullopt; } - const absl::optional payment = ParsePayment(*item_dict); + const std::optional payment = ParsePayment(*item_dict); if (!payment) { - return absl::nullopt; + return std::nullopt; } payments.push_back(*payment); @@ -72,7 +73,7 @@ absl::optional GetPaymentsFromList(const base::Value::List& list) { } // namespace -absl::optional ParsePayments(const base::Value::Dict& dict) { +std::optional ParsePayments(const base::Value::Dict& dict) { const auto* const ads_rewards_dict = dict.FindDict(kAdsRewardsKey); if (!ads_rewards_dict) { return PaymentList{}; @@ -80,7 +81,7 @@ absl::optional ParsePayments(const base::Value::Dict& dict) { const auto* const list = ads_rewards_dict->FindList(kPaymentListKey); if (!list) { - return absl::nullopt; + return std::nullopt; } return GetPaymentsFromList(*list); diff --git a/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_payments_json_reader_util.h b/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_payments_json_reader_util.h index 70a8dcafb37..524f8389f17 100644 --- a/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_payments_json_reader_util.h +++ b/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_payments_json_reader_util.h @@ -6,13 +6,14 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_LEGACY_MIGRATION_REWARDS_LEGACY_REWARDS_MIGRATION_PAYMENTS_JSON_READER_UTIL_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_LEGACY_MIGRATION_REWARDS_LEGACY_REWARDS_MIGRATION_PAYMENTS_JSON_READER_UTIL_H_ +#include + #include "base/values.h" #include "brave/components/brave_ads/core/internal/legacy_migration/rewards/payment_info.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads::rewards::json::reader { -absl::optional ParsePayments(const base::Value::Dict& dict); +std::optional ParsePayments(const base::Value::Dict& dict); } // namespace brave_ads::rewards::json::reader diff --git a/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_payments_util.cc b/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_payments_util.cc index e46bc4ed610..a01790a21b0 100644 --- a/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_payments_util.cc +++ b/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_payments_util.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_payments_util.h" +#include #include #include "base/ranges/algorithm.h" @@ -23,14 +24,14 @@ std::string GetFormattedBalanceDate(const base::Time time) { return base::StringPrintf("%04d-%02d", exploded.year, exploded.month); } -absl::optional GetPaymentForMonth(const PaymentList& payments, - const base::Time time) { +std::optional GetPaymentForMonth(const PaymentList& payments, + const base::Time time) { const std::string formatted_date = GetFormattedBalanceDate(time); const auto iter = base::ranges::find(payments, formatted_date, &PaymentInfo::month); if (iter == payments.cend()) { - return absl::nullopt; + return std::nullopt; } return *iter; @@ -38,14 +39,12 @@ absl::optional GetPaymentForMonth(const PaymentList& payments, } // namespace -absl::optional GetPaymentForThisMonth( - const PaymentList& payments) { +std::optional GetPaymentForThisMonth(const PaymentList& payments) { const base::Time time = GetLocalTimeAtBeginningOfThisMonth(); return GetPaymentForMonth(payments, time); } -absl::optional GetPaymentForLastMonth( - const PaymentList& payments) { +std::optional GetPaymentForLastMonth(const PaymentList& payments) { const base::Time time = GetLocalTimeAtBeginningOfLastMonth(); return GetPaymentForMonth(payments, time); } diff --git a/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_payments_util.h b/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_payments_util.h index 71eb540d238..a145b252bb8 100644 --- a/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_payments_util.h +++ b/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_payments_util.h @@ -6,13 +6,14 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_LEGACY_MIGRATION_REWARDS_LEGACY_REWARDS_MIGRATION_PAYMENTS_UTIL_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_LEGACY_MIGRATION_REWARDS_LEGACY_REWARDS_MIGRATION_PAYMENTS_UTIL_H_ +#include + #include "brave/components/brave_ads/core/internal/legacy_migration/rewards/payment_info.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads::rewards { -absl::optional GetPaymentForThisMonth(const PaymentList& payments); -absl::optional GetPaymentForLastMonth(const PaymentList& payments); +std::optional GetPaymentForThisMonth(const PaymentList& payments); +std::optional GetPaymentForLastMonth(const PaymentList& payments); } // namespace brave_ads::rewards diff --git a/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_transaction_history_json_reader.cc b/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_transaction_history_json_reader.cc index 3d24324a6cb..c16d0af62b5 100644 --- a/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_transaction_history_json_reader.cc +++ b/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_transaction_history_json_reader.cc @@ -5,18 +5,19 @@ #include "brave/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_transaction_history_json_reader.h" +#include + #include "base/json/json_reader.h" #include "base/values.h" #include "brave/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_transaction_history_json_reader_util.h" namespace brave_ads::rewards::json::reader { -absl::optional ReadTransactionHistory( - const std::string& json) { - const absl::optional dict = +std::optional ReadTransactionHistory(const std::string& json) { + const std::optional dict = base::JSONReader::ReadDict(json); if (!dict) { - return absl::nullopt; + return std::nullopt; } return ParseTransactionHistory(*dict); diff --git a/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_transaction_history_json_reader.h b/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_transaction_history_json_reader.h index 7d8262c51e7..9419b46c0f0 100644 --- a/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_transaction_history_json_reader.h +++ b/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_transaction_history_json_reader.h @@ -6,14 +6,14 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_LEGACY_MIGRATION_REWARDS_LEGACY_REWARDS_MIGRATION_TRANSACTION_HISTORY_JSON_READER_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_LEGACY_MIGRATION_REWARDS_LEGACY_REWARDS_MIGRATION_TRANSACTION_HISTORY_JSON_READER_H_ +#include #include #include "brave/components/brave_ads/core/internal/account/transactions/transaction_info.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads::rewards::json::reader { -absl::optional ReadTransactionHistory(const std::string& json); +std::optional ReadTransactionHistory(const std::string& json); } // namespace brave_ads::rewards::json::reader diff --git a/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_transaction_history_json_reader_util.cc b/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_transaction_history_json_reader_util.cc index 6c3c253e7e4..195625cb1cb 100644 --- a/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_transaction_history_json_reader_util.cc +++ b/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_transaction_history_json_reader_util.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_transaction_history_json_reader_util.h" +#include #include #include "base/strings/string_number_conversions.h" @@ -21,8 +22,7 @@ constexpr char kCreatedAtKey[] = "timestamp_in_seconds"; constexpr char kRedemptionValueKey[] = "estimated_redemption_value"; constexpr char kConfirmationTypeKey[] = "confirmation_type"; -absl::optional ParseTransaction( - const base::Value::Dict& dict) { +std::optional ParseTransaction(const base::Value::Dict& dict) { TransactionInfo transaction; // Id @@ -31,21 +31,21 @@ absl::optional ParseTransaction( // Created at const std::string* const created_at = dict.FindString(kCreatedAtKey); if (!created_at) { - return absl::nullopt; + return std::nullopt; } double created_at_as_double; if (!base::StringToDouble(*created_at, &created_at_as_double)) { - return absl::nullopt; + return std::nullopt; } transaction.created_at = base::Time::FromSecondsSinceUnixEpoch(created_at_as_double); // Value - const absl::optional redemption_value = + const std::optional redemption_value = dict.FindDouble(kRedemptionValueKey); if (!redemption_value) { - return absl::nullopt; + return std::nullopt; } transaction.value = *redemption_value; @@ -53,26 +53,26 @@ absl::optional ParseTransaction( const std::string* const confirmation_type = dict.FindString(kConfirmationTypeKey); if (!confirmation_type) { - return absl::nullopt; + return std::nullopt; } transaction.confirmation_type = ParseConfirmationType(*confirmation_type); return transaction; } -absl::optional GetTransactionsFromList( +std::optional GetTransactionsFromList( const base::Value::List& list) { TransactionList transactions; for (const auto& item : list) { if (!item.is_dict()) { - return absl::nullopt; + return std::nullopt; } - const absl::optional transaction = + const std::optional transaction = ParseTransaction(item.GetDict()); if (!transaction) { - return absl::nullopt; + return std::nullopt; } transactions.push_back(*transaction); @@ -83,7 +83,7 @@ absl::optional GetTransactionsFromList( } // namespace -absl::optional ParseTransactionHistory( +std::optional ParseTransactionHistory( const base::Value::Dict& dict) { const auto* const transaction_history = dict.FindDict(kTransactionHistoryKey); if (!transaction_history) { @@ -92,7 +92,7 @@ absl::optional ParseTransactionHistory( const auto* const list = transaction_history->FindList(kTransactionListKey); if (!list) { - return absl::nullopt; + return std::nullopt; } return GetTransactionsFromList(*list); diff --git a/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_transaction_history_json_reader_util.h b/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_transaction_history_json_reader_util.h index 00b5ac7ed04..a7c5a5308cc 100644 --- a/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_transaction_history_json_reader_util.h +++ b/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_transaction_history_json_reader_util.h @@ -6,13 +6,14 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_LEGACY_MIGRATION_REWARDS_LEGACY_REWARDS_MIGRATION_TRANSACTION_HISTORY_JSON_READER_UTIL_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_LEGACY_MIGRATION_REWARDS_LEGACY_REWARDS_MIGRATION_TRANSACTION_HISTORY_JSON_READER_UTIL_H_ +#include + #include "base/values.h" #include "brave/components/brave_ads/core/internal/account/transactions/transaction_info.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads::rewards::json::reader { -absl::optional ParseTransactionHistory( +std::optional ParseTransactionHistory( const base::Value::Dict& dict); } // namespace brave_ads::rewards::json::reader diff --git a/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_transaction_util.cc b/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_transaction_util.cc index f4243257b80..f1095c2ea26 100644 --- a/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_transaction_util.cc +++ b/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_transaction_util.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_transaction_util.h" +#include + #include "base/time/time.h" #include "base/uuid.h" #include "brave/components/brave_ads/core/internal/account/transactions/transactions_util.h" @@ -75,16 +77,16 @@ TransactionList GetAllUnreconciledTransactions( return unreconciled_transactions; } -absl::optional +std::optional BuildTransactionsForReconciledTransactionsThisMonth( const PaymentList& payments) { - const absl::optional payment = GetPaymentForThisMonth(payments); + const std::optional payment = GetPaymentForThisMonth(payments); if (!payment) { - return absl::nullopt; + return std::nullopt; } if (payment->balance == 0.0) { - return absl::nullopt; + return std::nullopt; } const base::Time time = GetLocalTimeAtBeginningOfThisMonth(); @@ -104,12 +106,12 @@ BuildTransactionsForReconciledTransactionsThisMonth( return reconciled_transactions; } -absl::optional +std::optional BuildTransactionForReconciledTransactionsLastMonth( const PaymentList& payments) { - const absl::optional payment = GetPaymentForLastMonth(payments); + const std::optional payment = GetPaymentForLastMonth(payments); if (!payment || payment->balance == 0.0) { - return absl::nullopt; + return std::nullopt; } const base::Time time = GetLocalTimeAtBeginningOfLastMonth(); diff --git a/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_transaction_util.h b/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_transaction_util.h index f862e921d42..03e0ba66502 100644 --- a/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_transaction_util.h +++ b/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_transaction_util.h @@ -6,10 +6,11 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_LEGACY_MIGRATION_REWARDS_LEGACY_REWARDS_MIGRATION_TRANSACTION_UTIL_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_LEGACY_MIGRATION_REWARDS_LEGACY_REWARDS_MIGRATION_TRANSACTION_UTIL_H_ +#include + #include "brave/components/brave_ads/core/internal/account/tokens/payment_tokens/payment_token_info.h" #include "brave/components/brave_ads/core/internal/account/transactions/transaction_info.h" #include "brave/components/brave_ads/core/internal/legacy_migration/rewards/payment_info.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads::rewards { @@ -17,11 +18,11 @@ TransactionList GetAllUnreconciledTransactions( const TransactionList& transactions, const PaymentTokenList& payment_tokens); -absl::optional +std::optional BuildTransactionsForReconciledTransactionsThisMonth( const PaymentList& payments); -absl::optional +std::optional BuildTransactionForReconciledTransactionsLastMonth(const PaymentList& payments); } // namespace brave_ads::rewards diff --git a/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_util.cc b/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_util.cc index 20456b7e9af..13fb2e7ffff 100644 --- a/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_util.cc +++ b/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_util.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_util.h" +#include + #include "base/containers/extend.h" #include "brave/components/brave_ads/core/internal/account/tokens/payment_tokens/payment_token_info.h" #include "brave/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_payment_tokens_json_reader.h" @@ -15,23 +17,23 @@ namespace brave_ads::rewards { -absl::optional BuildTransactionsFromJson( +std::optional BuildTransactionsFromJson( const std::string& json) { - const absl::optional payments = json::reader::ReadPayments(json); + const std::optional payments = json::reader::ReadPayments(json); if (!payments) { - return absl::nullopt; + return std::nullopt; } - const absl::optional transaction_history = + const std::optional transaction_history = json::reader::ReadTransactionHistory(json); if (!transaction_history) { - return absl::nullopt; + return std::nullopt; } - const absl::optional payment_tokens = + const std::optional payment_tokens = json::reader::ReadPaymentTokens(json); if (!payment_tokens) { - return absl::nullopt; + return std::nullopt; } // Get a list of all unreconciled transactions @@ -39,7 +41,7 @@ absl::optional BuildTransactionsFromJson( GetAllUnreconciledTransactions(*transaction_history, *payment_tokens); // Append a list of reconciled transactions for this month - const absl::optional reconciled_transactions = + const std::optional reconciled_transactions = BuildTransactionsForReconciledTransactionsThisMonth(*payments); if (reconciled_transactions) { base::Extend(transactions, *reconciled_transactions); @@ -47,7 +49,7 @@ absl::optional BuildTransactionsFromJson( // Append a single transaction with an accumulated value for reconciled // transactions last month for calculating the next payment date - const absl::optional reconciled_transaction = + const std::optional reconciled_transaction = BuildTransactionForReconciledTransactionsLastMonth(*payments); if (reconciled_transaction) { transactions.push_back(*reconciled_transaction); diff --git a/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_util.h b/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_util.h index 1b7b3ea0182..1c90c5b3f21 100644 --- a/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_util.h +++ b/components/brave_ads/core/internal/legacy_migration/rewards/legacy_rewards_migration_util.h @@ -6,14 +6,14 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_LEGACY_MIGRATION_REWARDS_LEGACY_REWARDS_MIGRATION_UTIL_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_LEGACY_MIGRATION_REWARDS_LEGACY_REWARDS_MIGRATION_UTIL_H_ +#include #include #include "brave/components/brave_ads/core/internal/account/transactions/transaction_info.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads::rewards { -absl::optional BuildTransactionsFromJson( +std::optional BuildTransactionsFromJson( const std::string& json); } // namespace brave_ads::rewards diff --git a/components/brave_ads/core/internal/ml/model/linear/linear.cc b/components/brave_ads/core/internal/ml/model/linear/linear.cc index ea1db25f293..dfa855d452c 100644 --- a/components/brave_ads/core/internal/ml/model/linear/linear.cc +++ b/components/brave_ads/core/internal/ml/model/linear/linear.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/ml/model/linear/linear.h" +#include #include #include #include @@ -27,23 +28,23 @@ LinearModel::LinearModel(LinearModel&& other) noexcept = default; LinearModel& LinearModel::operator=(LinearModel&& other) noexcept = default; -absl::optional LinearModel::Predict( +std::optional LinearModel::Predict( const VectorData& data) const { PredictionMap predictions; const auto* classifier = model_->classifier(); if (!classifier || !classifier->biases() || !classifier->segment_weight_vectors()) { - return absl::nullopt; + return std::nullopt; } for (const auto* segment_weight : *classifier->segment_weight_vectors()) { if (!segment_weight || !segment_weight->segment() || !segment_weight->weights()) { - return absl::nullopt; + return std::nullopt; } const std::string segment = segment_weight->segment()->str(); if (segment.empty()) { - return absl::nullopt; + return std::nullopt; } std::vector weights; weights.reserve(segment_weight->weights()->size()); @@ -59,23 +60,23 @@ absl::optional LinearModel::Predict( return predictions; } -absl::optional LinearModel::GetTopPredictions( +std::optional LinearModel::GetTopPredictions( const VectorData& data) const { - return GetTopCountPredictionsImpl(data, absl::nullopt); + return GetTopCountPredictionsImpl(data, std::nullopt); } -absl::optional LinearModel::GetTopCountPredictions( +std::optional LinearModel::GetTopCountPredictions( const VectorData& data, size_t top_count) const { return GetTopCountPredictionsImpl(data, top_count); } -absl::optional LinearModel::GetTopCountPredictionsImpl( +std::optional LinearModel::GetTopCountPredictionsImpl( const VectorData& data, - absl::optional top_count) const { - const absl::optional predictions = Predict(data); + std::optional top_count) const { + const std::optional predictions = Predict(data); if (!predictions) { - return absl::nullopt; + return std::nullopt; } const PredictionMap predictions_softmax = Softmax(*predictions); diff --git a/components/brave_ads/core/internal/ml/model/linear/linear.h b/components/brave_ads/core/internal/ml/model/linear/linear.h index 7f2717d75ed..c375da4f4ab 100644 --- a/components/brave_ads/core/internal/ml/model/linear/linear.h +++ b/components/brave_ads/core/internal/ml/model/linear/linear.h @@ -6,10 +6,11 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ML_MODEL_LINEAR_LINEAR_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ML_MODEL_LINEAR_LINEAR_H_ +#include + #include "base/memory/raw_ptr.h" #include "brave/components/brave_ads/core/internal/ml/data/vector_data.h" #include "brave/components/brave_ads/core/internal/ml/ml_alias.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -33,17 +34,17 @@ class LinearModel final { ~LinearModel() = default; - absl::optional Predict(const VectorData& data) const; + std::optional Predict(const VectorData& data) const; - absl::optional GetTopPredictions(const VectorData& data) const; + std::optional GetTopPredictions(const VectorData& data) const; - absl::optional GetTopCountPredictions(const VectorData& data, - size_t top_count) const; + std::optional GetTopCountPredictions(const VectorData& data, + size_t top_count) const; private: - absl::optional GetTopCountPredictionsImpl( + std::optional GetTopCountPredictionsImpl( const VectorData& data, - absl::optional top_count) const; + std::optional top_count) const; raw_ptr model_; }; diff --git a/components/brave_ads/core/internal/ml/model/linear/linear_unittest.cc b/components/brave_ads/core/internal/ml/model/linear/linear_unittest.cc index 0c6ed16cb38..bc319f0c5b9 100644 --- a/components/brave_ads/core/internal/ml/model/linear/linear_unittest.cc +++ b/components/brave_ads/core/internal/ml/model/linear/linear_unittest.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_ads/core/internal/ml/model/linear/linear.h" #include +#include #include #include @@ -13,7 +14,6 @@ #include "brave/components/brave_ads/core/internal/common/unittest/unittest_base.h" #include "brave/components/brave_ads/core/internal/ml/data/vector_data.h" #include "brave/components/brave_ads/core/internal/ml/pipeline/linear_pipeline_test_util.h" -#include "third_party/abseil-cpp/absl/types/optional.h" // npm run test -- brave_unit_tests --filter=BraveAds* @@ -21,7 +21,7 @@ namespace brave_ads::ml { class BraveAdsLinearTest : public UnitTestBase { public: - absl::optional BuildLinearModel( + std::optional BuildLinearModel( const std::map& raw_weights, const std::map& biases) { buffer_ = pipeline::LinearPipelineBufferBuilder() @@ -32,13 +32,13 @@ class BraveAdsLinearTest : public UnitTestBase { flatbuffers::Verifier verifier( reinterpret_cast(buffer_.data()), buffer_.size()); if (!linear_text_classification::flat::VerifyModelBuffer(verifier)) { - return absl::nullopt; + return std::nullopt; } const auto* raw_model = linear_text_classification::flat::GetModel(buffer_.data()); if (!raw_model) { - return absl::nullopt; + return std::nullopt; } return LinearModel(raw_model); @@ -58,18 +58,18 @@ TEST_F(BraveAdsLinearTest, ThreeClassesPredictionTest) { const std::map biases = { {"class_1", 0.0}, {"class_2", 0.0}, {"class_3", 0.0}}; - absl::optional linear(BuildLinearModel(weights, biases)); + std::optional linear(BuildLinearModel(weights, biases)); ASSERT_TRUE(linear); const VectorData class_1_vector_data({1.0, 0.0, 0.0}); const VectorData class_2_vector_data({0.0, 1.0, 0.0}); const VectorData class_3_vector_data({0.0, 1.0, 2.0}); // Act - const absl::optional predictions_1 = + const std::optional predictions_1 = linear->Predict(class_1_vector_data); - const absl::optional predictions_2 = + const std::optional predictions_2 = linear->Predict(class_2_vector_data); - const absl::optional predictions_3 = + const std::optional predictions_3 = linear->Predict(class_3_vector_data); // Assert @@ -95,12 +95,12 @@ TEST_F(BraveAdsLinearTest, BiasesPredictionTest) { const std::map biases = { {"class_1", 0.5}, {"class_2", 0.25}, {"class_3", 1.0}}; - absl::optional linear_biased(BuildLinearModel(weights, biases)); + std::optional linear_biased(BuildLinearModel(weights, biases)); ASSERT_TRUE(linear_biased); const VectorData avg_vector({1.0, 1.0, 1.0}); // Act - const absl::optional predictions = + const std::optional predictions = linear_biased->Predict(avg_vector); // Assert @@ -118,15 +118,15 @@ TEST_F(BraveAdsLinearTest, BinaryClassifierPredictionTest) { const std::map biases = {{"the_only_class", -0.45}}; - absl::optional linear(BuildLinearModel(weights, biases)); + std::optional linear(BuildLinearModel(weights, biases)); ASSERT_TRUE(linear); const VectorData vector_data_0({1.07, 1.52, 0.91}); const VectorData vector_data_1({1.11, 1.63, 1.21}); // Act - const absl::optional predictions_0 = + const std::optional predictions_0 = linear->Predict(vector_data_0); - const absl::optional predictions_1 = + const std::optional predictions_1 = linear->Predict(vector_data_1); // Assert @@ -154,7 +154,7 @@ TEST_F(BraveAdsLinearTest, TopPredictionsTest) { {"class_4", 0.22}, {"class_5", 0.21}}; - absl::optional linear_biased(BuildLinearModel(weights, biases)); + std::optional linear_biased(BuildLinearModel(weights, biases)); ASSERT_TRUE(linear_biased); const std::vector pt_1 = {1.0, 0.99, 0.98, 0.97, 0.96}; const std::vector pt_2 = {0.83, 0.79, 0.91, 0.87, 0.82}; @@ -164,11 +164,11 @@ TEST_F(BraveAdsLinearTest, TopPredictionsTest) { const VectorData point_3(pt_3); // Act - const absl::optional predictions_1 = + const std::optional predictions_1 = linear_biased->GetTopPredictions(point_1); - const absl::optional predictions_2 = + const std::optional predictions_2 = linear_biased->GetTopCountPredictions(point_2, kPredictionLimits[0]); - const absl::optional predictions_3 = + const std::optional predictions_3 = linear_biased->GetTopCountPredictions(point_3, kPredictionLimits[1]); // Assert diff --git a/components/brave_ads/core/internal/ml/model/neural/neural.cc b/components/brave_ads/core/internal/ml/model/neural/neural.cc index cf92995b2cb..fd23f9afd4c 100644 --- a/components/brave_ads/core/internal/ml/model/neural/neural.cc +++ b/components/brave_ads/core/internal/ml/model/neural/neural.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_ads/core/internal/ml/model/neural/neural.h" #include +#include #include #include #include @@ -33,25 +34,25 @@ NeuralModel::NeuralModel(NeuralModel&& other) noexcept = default; NeuralModel& NeuralModel::operator=(NeuralModel&& other) noexcept = default; -absl::optional NeuralModel::Predict( +std::optional NeuralModel::Predict( const VectorData& data) const { PredictionMap predictions; const neural_text_classification::flat::Classifier* classifier = model_->classifier(); if (!classifier) { - return absl::nullopt; + return std::nullopt; } const auto* matrices = classifier->matrices(); if (!matrices) { - return absl::nullopt; + return std::nullopt; } const auto* activation_functions = classifier->activation_functions(); if (!activation_functions || matrices->size() != activation_functions->size()) { - return absl::nullopt; + return std::nullopt; } VectorData layer_input = data; @@ -59,12 +60,12 @@ absl::optional NeuralModel::Predict( std::vector next_layer_input; const auto* matrix = matrices->Get(i); if (!matrix || !matrix->weights_rows()) { - return absl::nullopt; + return std::nullopt; } for (const auto* matrix_row : *matrix->weights_rows()) { if (!matrix_row || !matrix_row->row()) { - return absl::nullopt; + return std::nullopt; } std::vector row; @@ -78,7 +79,7 @@ absl::optional NeuralModel::Predict( const auto* activation_function = activation_functions->Get(i); if (!activation_function) { - return absl::nullopt; + return std::nullopt; } if (activation_function->str() == kPostMatrixFunctionTypeTanh) { layer_input.Tanh(); @@ -90,17 +91,17 @@ absl::optional NeuralModel::Predict( const std::vector output_layer = layer_input.GetDenseData(); const auto* segments = classifier->segments(); if (!segments || segments->size() != output_layer.size()) { - return absl::nullopt; + return std::nullopt; } for (size_t i = 0; i < segments->size(); i++) { const auto* segment = segments->Get(i); if (!segment) { - return absl::nullopt; + return std::nullopt; } const std::string segment_value = segment->str(); if (segment_value.empty()) { - return absl::nullopt; + return std::nullopt; } predictions[segment_value] = output_layer[i]; } @@ -108,23 +109,23 @@ absl::optional NeuralModel::Predict( return predictions; } -absl::optional NeuralModel::GetTopPredictions( +std::optional NeuralModel::GetTopPredictions( const VectorData& data) const { return GetTopCountPredictionsImpl(data, data.GetDimensionCount()); } -absl::optional NeuralModel::GetTopCountPredictions( +std::optional NeuralModel::GetTopCountPredictions( const VectorData& data, size_t top_count) const { return GetTopCountPredictionsImpl(data, top_count); } -absl::optional NeuralModel::GetTopCountPredictionsImpl( +std::optional NeuralModel::GetTopCountPredictionsImpl( const VectorData& data, size_t top_count) const { - const absl::optional predictions = Predict(data); + const std::optional predictions = Predict(data); if (!predictions) { - return absl::nullopt; + return std::nullopt; } std::vector> prediction_order; diff --git a/components/brave_ads/core/internal/ml/model/neural/neural.h b/components/brave_ads/core/internal/ml/model/neural/neural.h index e64068ea540..a7dc3d0f4df 100644 --- a/components/brave_ads/core/internal/ml/model/neural/neural.h +++ b/components/brave_ads/core/internal/ml/model/neural/neural.h @@ -6,10 +6,11 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ML_MODEL_NEURAL_NEURAL_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ML_MODEL_NEURAL_NEURAL_H_ +#include + #include "base/memory/raw_ptr.h" #include "brave/components/brave_ads/core/internal/ml/data/vector_data.h" #include "brave/components/brave_ads/core/internal/ml/ml_alias.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -35,15 +36,15 @@ class NeuralModel final { return model_.get(); } - absl::optional Predict(const VectorData& data) const; + std::optional Predict(const VectorData& data) const; - absl::optional GetTopPredictions(const VectorData& data) const; + std::optional GetTopPredictions(const VectorData& data) const; - absl::optional GetTopCountPredictions(const VectorData& data, - size_t top_count) const; + std::optional GetTopCountPredictions(const VectorData& data, + size_t top_count) const; private: - absl::optional GetTopCountPredictionsImpl( + std::optional GetTopCountPredictionsImpl( const VectorData& data, size_t top_count) const; diff --git a/components/brave_ads/core/internal/ml/model/neural/neural_unittest.cc b/components/brave_ads/core/internal/ml/model/neural/neural_unittest.cc index 1e32d62078d..a810099e95d 100644 --- a/components/brave_ads/core/internal/ml/model/neural/neural_unittest.cc +++ b/components/brave_ads/core/internal/ml/model/neural/neural_unittest.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/ml/model/neural/neural.h" +#include #include #include @@ -12,7 +13,6 @@ #include "brave/components/brave_ads/core/internal/common/unittest/unittest_base.h" #include "brave/components/brave_ads/core/internal/ml/data/vector_data.h" #include "brave/components/brave_ads/core/internal/ml/pipeline/neural_pipeline_test_util.h" -#include "third_party/abseil-cpp/absl/types/optional.h" // npm run test -- brave_unit_tests --filter=BraveAds* @@ -20,7 +20,7 @@ namespace brave_ads::ml { class BraveAdsNeuralTest : public UnitTestBase { public: - absl::optional BuildNeuralModel( + std::optional BuildNeuralModel( const std::vector>& raw_matrices, const std::vector& raw_activation_functions, const std::vector& raw_segments) { @@ -33,13 +33,13 @@ class BraveAdsNeuralTest : public UnitTestBase { flatbuffers::Verifier verifier( reinterpret_cast(buffer_.data()), buffer_.size()); if (!neural_text_classification::flat::VerifyModelBuffer(verifier)) { - return absl::nullopt; + return std::nullopt; } const auto* raw_model = neural_text_classification::flat::GetModel(buffer_.data()); if (!raw_model) { - return absl::nullopt; + return std::nullopt; } return NeuralModel(raw_model); @@ -64,13 +64,13 @@ TEST_F(BraveAdsNeuralTest, Prediction) { std::vector segments = {"class_1", "class_2", "class_3"}; - absl::optional neural( + std::optional neural( BuildNeuralModel(matrices, activation_functions, segments)); ASSERT_TRUE(neural); const VectorData sample_observation({0.2, 0.65, 0.15}); // Act - const absl::optional sample_predictions = + const std::optional sample_predictions = neural->Predict(sample_observation); ASSERT_TRUE(sample_predictions); @@ -91,13 +91,13 @@ TEST_F(BraveAdsNeuralTest, PredictionNomatrices) { std::vector activation_functions = {}; std::vector segments = {"class_1", "class_2", "class_3"}; - absl::optional neural( + std::optional neural( BuildNeuralModel(matrices, activation_functions, segments)); ASSERT_TRUE(neural); const VectorData sample_observation({0.2, 0.65, 0.15}); // Act - const absl::optional sample_predictions = + const std::optional sample_predictions = neural->Predict(sample_observation); ASSERT_TRUE(sample_predictions); @@ -123,13 +123,13 @@ TEST_F(BraveAdsNeuralTest, PredictionDefaultPostMatrixFunctions) { std::vector segments = {"class_1", "class_2", "class_3"}; - absl::optional neural( + std::optional neural( BuildNeuralModel(matrices, activation_functions, segments)); ASSERT_TRUE(neural); const VectorData sample_observation({0.2, 0.65, 0.15}); // Act - const absl::optional sample_predictions = + const std::optional sample_predictions = neural->Predict(sample_observation); ASSERT_TRUE(sample_predictions); @@ -155,16 +155,16 @@ TEST_F(BraveAdsNeuralTest, TopPredictions) { std::vector segments = {"class_1", "class_2", "class_3"}; - absl::optional neural( + std::optional neural( BuildNeuralModel(matrices, activation_functions, segments)); ASSERT_TRUE(neural); const VectorData sample_observation({0.2, 0.65, 0.15}); // Act - const absl::optional sample_predictions = + const std::optional sample_predictions = neural->GetTopPredictions(sample_observation); ASSERT_TRUE(sample_predictions); - const absl::optional sample_predictions_constrained = + const std::optional sample_predictions_constrained = neural->GetTopCountPredictions(sample_observation, 2); ASSERT_TRUE(sample_predictions_constrained); diff --git a/components/brave_ads/core/internal/ml/pipeline/embedding_pipeline_value_util.cc b/components/brave_ads/core/internal/ml/pipeline/embedding_pipeline_value_util.cc index 86fcde96183..e53b211bdb7 100644 --- a/components/brave_ads/core/internal/ml/pipeline/embedding_pipeline_value_util.cc +++ b/components/brave_ads/core/internal/ml/pipeline/embedding_pipeline_value_util.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/ml/pipeline/embedding_pipeline_value_util.h" +#include #include #include @@ -21,31 +22,31 @@ constexpr char kEmbeddingsKey[] = "embeddings"; namespace brave_ads::ml::pipeline { -absl::optional EmbeddingPipelineFromValue( +std::optional EmbeddingPipelineFromValue( const base::Value::Dict& dict) { EmbeddingPipelineInfo embedding_pipeline; - if (absl::optional value = dict.FindInt(kVersionKey)) { + if (std::optional value = dict.FindInt(kVersionKey)) { embedding_pipeline.version = *value; } else { - return absl::nullopt; + return std::nullopt; } if (const auto* const value = dict.FindString(kTimestampKey)) { if (!base::Time::FromUTCString(value->c_str(), &embedding_pipeline.time)) { - return absl::nullopt; + return std::nullopt; } } if (const auto* const value = dict.FindString(kLocaleKey)) { embedding_pipeline.locale = *value; } else { - return absl::nullopt; + return std::nullopt; } const auto* value = dict.FindDict(kEmbeddingsKey); if (!value) { - return absl::nullopt; + return std::nullopt; } embedding_pipeline.dimension = 1; @@ -59,7 +60,7 @@ absl::optional EmbeddingPipelineFromValue( embedding.reserve(list->size()); for (const base::Value& item : *list) { if (!item.is_double() && !item.is_int()) { - return absl::nullopt; + return std::nullopt; } embedding.push_back(static_cast(item.GetDouble())); @@ -73,7 +74,7 @@ absl::optional EmbeddingPipelineFromValue( } if (embedding_pipeline.dimension == 1) { - return absl::nullopt; + return std::nullopt; } return embedding_pipeline; diff --git a/components/brave_ads/core/internal/ml/pipeline/embedding_pipeline_value_util.h b/components/brave_ads/core/internal/ml/pipeline/embedding_pipeline_value_util.h index ff8bd6dff3b..11cc4ab23ef 100644 --- a/components/brave_ads/core/internal/ml/pipeline/embedding_pipeline_value_util.h +++ b/components/brave_ads/core/internal/ml/pipeline/embedding_pipeline_value_util.h @@ -6,14 +6,15 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ML_PIPELINE_EMBEDDING_PIPELINE_VALUE_UTIL_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ML_PIPELINE_EMBEDDING_PIPELINE_VALUE_UTIL_H_ +#include + #include "base/values.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads::ml::pipeline { struct EmbeddingPipelineInfo; -absl::optional EmbeddingPipelineFromValue( +std::optional EmbeddingPipelineFromValue( const base::Value::Dict& dict); } // namespace brave_ads::ml::pipeline diff --git a/components/brave_ads/core/internal/ml/pipeline/embedding_pipeline_value_util_unittest.cc b/components/brave_ads/core/internal/ml/pipeline/embedding_pipeline_value_util_unittest.cc index 6f291e76c8b..b6153a8f2d2 100644 --- a/components/brave_ads/core/internal/ml/pipeline/embedding_pipeline_value_util_unittest.cc +++ b/components/brave_ads/core/internal/ml/pipeline/embedding_pipeline_value_util_unittest.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/ml/pipeline/embedding_pipeline_value_util.h" +#include #include #include #include @@ -74,7 +75,7 @@ TEST_F(BraveAdsEmbeddingPipelineValueUtilTest, FromValue) { }; // Act - absl::optional pipeline = + std::optional pipeline = EmbeddingPipelineFromValue(dict); ASSERT_TRUE(pipeline); EmbeddingPipelineInfo embedding_pipeline = std::move(pipeline).value(); diff --git a/components/brave_ads/core/internal/ml/pipeline/linear_pipeline_util.cc b/components/brave_ads/core/internal/ml/pipeline/linear_pipeline_util.cc index bb48825f923..76ccba1ad18 100644 --- a/components/brave_ads/core/internal/ml/pipeline/linear_pipeline_util.cc +++ b/components/brave_ads/core/internal/ml/pipeline/linear_pipeline_util.cc @@ -7,6 +7,7 @@ #include #include +#include #include #include #include @@ -27,12 +28,12 @@ namespace brave_ads::ml::pipeline { namespace { -absl::optional LoadHashedNGramsTransformation( +std::optional LoadHashedNGramsTransformation( const linear_text_classification::flat::HashedNGramsTransformation* hashed_ngram_transformation) { if (!hashed_ngram_transformation || !hashed_ngram_transformation->ngrams_range()) { - return absl::nullopt; + return std::nullopt; } std::vector subgrams; @@ -44,21 +45,21 @@ absl::optional LoadHashedNGramsTransformation( hashed_ngram_transformation->num_buckets(), std::move(subgrams)); } -absl::optional LoadTransformations( +std::optional LoadTransformations( const linear_text_classification::flat::Model* text_classification) { CHECK(text_classification); const auto* transformations = text_classification->transformations(); if (!transformations) { - return absl::nullopt; + return std::nullopt; } TransformationVector transformations_vec; for (const auto* transformation_entry : *transformations) { if (!transformation_entry) { - return absl::nullopt; + return std::nullopt; } - absl::optional transformation_ptr; + std::optional transformation_ptr; switch (transformation_entry->transformation_type()) { case linear_text_classification::flat::TransformationType:: TransformationType_LowercaseTransformation: { @@ -83,7 +84,7 @@ absl::optional LoadTransformations( } } if (!transformation_ptr) { - return absl::nullopt; + return std::nullopt; } transformations_vec.emplace_back(std::move(*transformation_ptr)); } @@ -93,17 +94,17 @@ absl::optional LoadTransformations( } // namespace -absl::optional LoadLinearPipeline(const uint8_t* data, - const size_t length) { +std::optional LoadLinearPipeline(const uint8_t* data, + const size_t length) { flatbuffers::Verifier verifier(data, length); if (!linear_text_classification::flat::VerifyModelBuffer(verifier)) { - return absl::nullopt; + return std::nullopt; } const linear_text_classification::flat::Model* model = linear_text_classification::flat::GetModel(data); if (!model) { - return absl::nullopt; + return std::nullopt; } const std::string default_language_code = @@ -111,18 +112,18 @@ absl::optional LoadLinearPipeline(const uint8_t* data, const auto* locale = model->locale(); if (!locale || !base::EqualsCaseInsensitiveASCII(locale->str(), default_language_code)) { - return absl::nullopt; + return std::nullopt; } - absl::optional transformations = + std::optional transformations = LoadTransformations(model); if (!transformations) { - return absl::nullopt; + return std::nullopt; } LinearModel linear_model(model); return PipelineInfo(locale->str(), std::move(*transformations), - std::move(linear_model), absl::nullopt); + std::move(linear_model), std::nullopt); } } // namespace brave_ads::ml::pipeline diff --git a/components/brave_ads/core/internal/ml/pipeline/linear_pipeline_util.h b/components/brave_ads/core/internal/ml/pipeline/linear_pipeline_util.h index 4fff6e536f2..477d85476b2 100644 --- a/components/brave_ads/core/internal/ml/pipeline/linear_pipeline_util.h +++ b/components/brave_ads/core/internal/ml/pipeline/linear_pipeline_util.h @@ -6,14 +6,14 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ML_PIPELINE_LINEAR_PIPELINE_UTIL_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ML_PIPELINE_LINEAR_PIPELINE_UTIL_H_ -#include "third_party/abseil-cpp/absl/types/optional.h" +#include namespace brave_ads::ml::pipeline { struct PipelineInfo; -absl::optional LoadLinearPipeline(const uint8_t* data, - size_t length); +std::optional LoadLinearPipeline(const uint8_t* data, + size_t length); } // namespace brave_ads::ml::pipeline diff --git a/components/brave_ads/core/internal/ml/pipeline/linear_pipeline_util_unittest.cc b/components/brave_ads/core/internal/ml/pipeline/linear_pipeline_util_unittest.cc index d6f7d357833..93fbffe4594 100644 --- a/components/brave_ads/core/internal/ml/pipeline/linear_pipeline_util_unittest.cc +++ b/components/brave_ads/core/internal/ml/pipeline/linear_pipeline_util_unittest.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/ml/pipeline/linear_pipeline_util.h" +#include #include #include @@ -25,7 +26,7 @@ class BraveAdsLinearPipelineUtilTest : public UnitTestBase {}; TEST_F(BraveAdsLinearPipelineUtilTest, LoadLinearPipelineTest) { // Arrange - const absl::optional contents = + const std::optional contents = MaybeReadFileToString(kValidSpamClassificationPipeline); ASSERT_TRUE(contents); diff --git a/components/brave_ads/core/internal/ml/pipeline/neural_pipeline_util.cc b/components/brave_ads/core/internal/ml/pipeline/neural_pipeline_util.cc index 62c19794999..2f2fbd56c6f 100644 --- a/components/brave_ads/core/internal/ml/pipeline/neural_pipeline_util.cc +++ b/components/brave_ads/core/internal/ml/pipeline/neural_pipeline_util.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_ads/core/internal/ml/pipeline/neural_pipeline_util.h" #include +#include #include #include @@ -25,32 +26,32 @@ namespace brave_ads::ml::pipeline { namespace { -absl::optional LoadMappedTokenTransformation( +std::optional LoadMappedTokenTransformation( const neural_text_classification::flat::MappedTokenTransformation* mapped_token_transformation) { if (!mapped_token_transformation) { - return absl::nullopt; + return std::nullopt; } return std::make_unique( mapped_token_transformation); } -absl::optional LoadTransformations( +std::optional LoadTransformations( const neural_text_classification::flat::Model* text_classification) { CHECK(text_classification); const auto* transformations = text_classification->transformations(); if (!transformations) { - return absl::nullopt; + return std::nullopt; } TransformationVector transformations_vec; for (const auto* transformation_entry : *transformations) { if (!transformation_entry) { - return absl::nullopt; + return std::nullopt; } - absl::optional transformation_ptr; + std::optional transformation_ptr; switch (transformation_entry->transformation_type()) { case neural_text_classification::flat::TransformationType:: TransformationType_LowercaseTransformation: { @@ -75,7 +76,7 @@ absl::optional LoadTransformations( } } if (!transformation_ptr) { - return absl::nullopt; + return std::nullopt; } transformations_vec.emplace_back(std::move(*transformation_ptr)); } @@ -85,17 +86,17 @@ absl::optional LoadTransformations( } // namespace -absl::optional LoadNeuralPipeline(const uint8_t* data, - const size_t length) { +std::optional LoadNeuralPipeline(const uint8_t* data, + const size_t length) { flatbuffers::Verifier verifier(data, length); if (!neural_text_classification::flat::VerifyModelBuffer(verifier)) { - return absl::nullopt; + return std::nullopt; } const neural_text_classification::flat::Model* model = neural_text_classification::flat::GetModel(data); if (!model) { - return absl::nullopt; + return std::nullopt; } const std::string default_language_code = @@ -103,17 +104,17 @@ absl::optional LoadNeuralPipeline(const uint8_t* data, const auto* locale = model->locale(); if (!locale || !base::EqualsCaseInsensitiveASCII(locale->str(), default_language_code)) { - return absl::nullopt; + return std::nullopt; } - absl::optional transformations = + std::optional transformations = LoadTransformations(model); if (!transformations) { - return absl::nullopt; + return std::nullopt; } NeuralModel neural_model(model); - return PipelineInfo(locale->str(), std::move(*transformations), absl::nullopt, + return PipelineInfo(locale->str(), std::move(*transformations), std::nullopt, std::move(neural_model)); } diff --git a/components/brave_ads/core/internal/ml/pipeline/neural_pipeline_util.h b/components/brave_ads/core/internal/ml/pipeline/neural_pipeline_util.h index 0d2b33d978c..cc86ce5e37c 100644 --- a/components/brave_ads/core/internal/ml/pipeline/neural_pipeline_util.h +++ b/components/brave_ads/core/internal/ml/pipeline/neural_pipeline_util.h @@ -6,14 +6,14 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ML_PIPELINE_NEURAL_PIPELINE_UTIL_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ML_PIPELINE_NEURAL_PIPELINE_UTIL_H_ -#include "third_party/abseil-cpp/absl/types/optional.h" +#include namespace brave_ads::ml::pipeline { struct PipelineInfo; -absl::optional LoadNeuralPipeline(const uint8_t* data, - size_t length); +std::optional LoadNeuralPipeline(const uint8_t* data, + size_t length); } // namespace brave_ads::ml::pipeline diff --git a/components/brave_ads/core/internal/ml/pipeline/neural_pipeline_util_unittest.cc b/components/brave_ads/core/internal/ml/pipeline/neural_pipeline_util_unittest.cc index 54a6363c171..fbf15dc73cb 100644 --- a/components/brave_ads/core/internal/ml/pipeline/neural_pipeline_util_unittest.cc +++ b/components/brave_ads/core/internal/ml/pipeline/neural_pipeline_util_unittest.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/ml/pipeline/neural_pipeline_util.h" +#include #include #include @@ -25,7 +26,7 @@ class BraveAdsNeuralPipelineUtilTest : public UnitTestBase {}; TEST_F(BraveAdsNeuralPipelineUtilTest, LoadNeuralPipelineTest) { // Arrange - const absl::optional contents = + const std::optional contents = MaybeReadFileToString(kOnlyRequiredFieldsNeuralModelPipeline); ASSERT_TRUE(contents); diff --git a/components/brave_ads/core/internal/ml/pipeline/pipeline_info.cc b/components/brave_ads/core/internal/ml/pipeline/pipeline_info.cc index 6004a6937f4..af10f802858 100644 --- a/components/brave_ads/core/internal/ml/pipeline/pipeline_info.cc +++ b/components/brave_ads/core/internal/ml/pipeline/pipeline_info.cc @@ -5,14 +5,15 @@ #include "brave/components/brave_ads/core/internal/ml/pipeline/pipeline_info.h" +#include #include namespace brave_ads::ml::pipeline { PipelineInfo::PipelineInfo(std::string locale, TransformationVector transformations, - absl::optional linear_model, - absl::optional neural_model) + std::optional linear_model, + std::optional neural_model) : locale(std::move(locale)), transformations(std::move(transformations)), linear_model(std::move(linear_model)), diff --git a/components/brave_ads/core/internal/ml/pipeline/pipeline_info.h b/components/brave_ads/core/internal/ml/pipeline/pipeline_info.h index 0a28c765d1b..c9849a8fc0b 100644 --- a/components/brave_ads/core/internal/ml/pipeline/pipeline_info.h +++ b/components/brave_ads/core/internal/ml/pipeline/pipeline_info.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ML_PIPELINE_PIPELINE_INFO_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ML_PIPELINE_PIPELINE_INFO_H_ +#include #include #include "brave/components/brave_ads/core/internal/ml/ml_alias.h" @@ -18,8 +19,8 @@ struct PipelineInfo final { PipelineInfo(); PipelineInfo(std::string locale, TransformationVector transformations, - absl::optional linear_model, - absl::optional neural_model); + std::optional linear_model, + std::optional neural_model); PipelineInfo(PipelineInfo&&) noexcept; PipelineInfo& operator=(PipelineInfo&&) noexcept; @@ -28,8 +29,8 @@ struct PipelineInfo final { std::string locale; TransformationVector transformations; - absl::optional linear_model; - absl::optional neural_model; + std::optional linear_model; + std::optional neural_model; }; } // namespace brave_ads::ml::pipeline diff --git a/components/brave_ads/core/internal/ml/pipeline/text_processing/embedding_processing.cc b/components/brave_ads/core/internal/ml/pipeline/text_processing/embedding_processing.cc index 41ff9d4fc97..ec781793f1e 100644 --- a/components/brave_ads/core/internal/ml/pipeline/text_processing/embedding_processing.cc +++ b/components/brave_ads/core/internal/ml/pipeline/text_processing/embedding_processing.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_ads/core/internal/ml/pipeline/text_processing/embedding_processing.h" #include +#include #include #include @@ -43,7 +44,7 @@ EmbeddingProcessing& EmbeddingProcessing::operator=( EmbeddingProcessing::~EmbeddingProcessing() = default; bool EmbeddingProcessing::SetEmbeddingPipeline(base::Value::Dict dict) { - absl::optional embedding_pipeline = + std::optional embedding_pipeline = EmbeddingPipelineFromValue(dict); if (!embedding_pipeline) { embedding_pipeline_ = {}; diff --git a/components/brave_ads/core/internal/ml/pipeline/text_processing/embedding_processing_unittest.cc b/components/brave_ads/core/internal/ml/pipeline/text_processing/embedding_processing_unittest.cc index 6e4077cec75..e6c4b10144d 100644 --- a/components/brave_ads/core/internal/ml/pipeline/text_processing/embedding_processing_unittest.cc +++ b/components/brave_ads/core/internal/ml/pipeline/text_processing/embedding_processing_unittest.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_ads/core/internal/ml/pipeline/text_processing/embedding_processing.h" #include +#include #include #include @@ -47,8 +48,8 @@ TEST_F(BraveAdsEmbeddingProcessingTest, EmbedText) { {"this 54 is simple", {0.85F, 0.2F, 1.0F}}, {{}, {}}}; - const absl::optional& - embedding_processing = resource_->get(); + const std::optional& embedding_processing = + resource_->get(); ASSERT_TRUE(embedding_processing); for (const auto& [text, expected_embedding] : k_samples) { diff --git a/components/brave_ads/core/internal/ml/pipeline/text_processing/text_processing.cc b/components/brave_ads/core/internal/ml/pipeline/text_processing/text_processing.cc index 132d0cdced1..53da342c33d 100644 --- a/components/brave_ads/core/internal/ml/pipeline/text_processing/text_processing.cc +++ b/components/brave_ads/core/internal/ml/pipeline/text_processing/text_processing.cc @@ -7,6 +7,7 @@ #include #include +#include #include #include "base/files/file.h" @@ -15,7 +16,6 @@ #include "brave/components/brave_ads/core/internal/ml/pipeline/linear_pipeline_util.h" #include "brave/components/brave_ads/core/internal/ml/pipeline/neural_pipeline_util.h" #include "brave/components/brave_ads/core/internal/ml/pipeline/pipeline_info.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads::ml::pipeline { @@ -45,7 +45,7 @@ TextProcessing& TextProcessing::operator=(TextProcessing&& other) noexcept = TextProcessing::~TextProcessing() = default; TextProcessing::TextProcessing(TransformationVector transformations, - absl::optional linear_model) + std::optional linear_model) : is_initialized_(true) { linear_model_ = std::move(linear_model); transformations_ = std::move(transformations); @@ -69,7 +69,7 @@ void TextProcessing::SetPipeline(PipelineInfo pipeline) { } bool TextProcessing::SetPipeline(base::File file) { - absl::optional pipeline; + std::optional pipeline; if (file.IsValid()) { pipeline_mapped_file_ = std::make_unique(); @@ -95,7 +95,7 @@ bool TextProcessing::SetPipeline(base::File file) { return is_initialized_; } -absl::optional TextProcessing::Predict( +std::optional TextProcessing::Predict( VectorData* vector_data) const { if (linear_model_) { return linear_model_->GetTopPredictions(*vector_data); @@ -103,10 +103,10 @@ absl::optional TextProcessing::Predict( if (neural_model_) { return neural_model_->GetTopPredictions(*vector_data); } - return absl::nullopt; + return std::nullopt; } -absl::optional TextProcessing::Apply( +std::optional TextProcessing::Apply( std::unique_ptr input_data) const { std::unique_ptr mutable_input_data = std::move(input_data); CHECK(mutable_input_data); @@ -115,34 +115,34 @@ absl::optional TextProcessing::Apply( for (size_t i = 0; i < transformation_count; ++i) { mutable_input_data = transformations_[i]->Apply(mutable_input_data); if (!mutable_input_data) { - return absl::nullopt; + return std::nullopt; } } if (mutable_input_data->GetType() != DataType::kVector) { - return absl::nullopt; + return std::nullopt; } return Predict(static_cast(mutable_input_data.get())); } -absl::optional TextProcessing::GetPredictions( +std::optional TextProcessing::GetPredictions( const std::string& text) const { std::string stripped_text = StripNonAlphaCharacters(text); - absl::optional predictions = + std::optional predictions = Apply(std::make_unique(std::move(stripped_text))); return predictions; } -absl::optional TextProcessing::GetTopPredictions( +std::optional TextProcessing::GetTopPredictions( const std::string& text) const { - const absl::optional predictions = GetPredictions(text); + const std::optional predictions = GetPredictions(text); if (!predictions) { - return absl::nullopt; + return std::nullopt; } return FilterPredictions(*predictions); } -absl::optional TextProcessing::ClassifyPage( +std::optional TextProcessing::ClassifyPage( const std::string& text) const { if (!IsInitialized()) { return PredictionMap{}; diff --git a/components/brave_ads/core/internal/ml/pipeline/text_processing/text_processing.h b/components/brave_ads/core/internal/ml/pipeline/text_processing/text_processing.h index e698c92f98b..c6445b6a7c5 100644 --- a/components/brave_ads/core/internal/ml/pipeline/text_processing/text_processing.h +++ b/components/brave_ads/core/internal/ml/pipeline/text_processing/text_processing.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ML_PIPELINE_TEXT_PROCESSING_TEXT_PROCESSING_H_ #include +#include #include #include "base/files/memory_mapped_file.h" @@ -28,7 +29,7 @@ class TextProcessing final { public: TextProcessing(); TextProcessing(TransformationVector transformations, - absl::optional linear_model); + std::optional linear_model); TextProcessing(const TextProcessing&) = delete; TextProcessing& operator=(const TextProcessing&) = delete; @@ -45,17 +46,16 @@ class TextProcessing final { void SetPipeline(PipelineInfo pipeline); bool SetPipeline(base::File file); - absl::optional Predict(VectorData* vector_data) const; + std::optional Predict(VectorData* vector_data) const; - absl::optional Apply( + std::optional Apply( std::unique_ptr mutable_input_data) const; - absl::optional GetPredictions(const std::string& text) const; + std::optional GetPredictions(const std::string& text) const; - absl::optional GetTopPredictions( - const std::string& text) const; + std::optional GetTopPredictions(const std::string& text) const; - absl::optional ClassifyPage(const std::string& text) const; + std::optional ClassifyPage(const std::string& text) const; private: bool is_initialized_ = false; @@ -64,8 +64,8 @@ class TextProcessing final { std::unique_ptr pipeline_mapped_file_; TransformationVector transformations_; - absl::optional linear_model_; - absl::optional neural_model_; + std::optional linear_model_; + std::optional neural_model_; }; } // namespace brave_ads::ml::pipeline diff --git a/components/brave_ads/core/internal/ml/pipeline/text_processing/text_processing_unittest.cc b/components/brave_ads/core/internal/ml/pipeline/text_processing/text_processing_unittest.cc index 2ff6dd84f11..a0458e95916 100644 --- a/components/brave_ads/core/internal/ml/pipeline/text_processing/text_processing_unittest.cc +++ b/components/brave_ads/core/internal/ml/pipeline/text_processing/text_processing_unittest.cc @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -23,7 +24,6 @@ #include "brave/components/brave_ads/core/internal/ml/transformation/hashed_ngrams_transformation.h" #include "brave/components/brave_ads/core/internal/ml/transformation/lowercase_transformation.h" #include "brave/components/l10n/common/test/scoped_default_locale.h" -#include "third_party/abseil-cpp/absl/types/optional.h" // npm run test -- brave_unit_tests --filter=BraveAds* @@ -102,7 +102,7 @@ TEST_F(BraveAdsTextProcessingTest, BuildSimplePipeline) { const std::vector data_4 = {1.0, 0.0, 0.0}; const VectorData data_point_3(data_4); - const absl::optional data_point_3_predictions = + const std::optional data_point_3_predictions = linear_model.Predict(data_point_3); ASSERT_TRUE(data_point_3_predictions); ASSERT_EQ(3U, data_point_3_predictions->size()); @@ -111,7 +111,7 @@ TEST_F(BraveAdsTextProcessingTest, BuildSimplePipeline) { std::move(transformations), std::move(linear_model)); // Act - const absl::optional predictions = + const std::optional predictions = pipeline.GetTopPredictions(kTestString); ASSERT_TRUE(predictions); ASSERT_TRUE(!predictions->empty()); @@ -146,7 +146,7 @@ TEST_F(BraveAdsTextProcessingTest, TestLoadFromValue) { for (size_t i = 0; i < train_texts.size(); ++i) { std::unique_ptr text_data = std::make_unique(train_texts[i]); - const absl::optional prediction_map = + const std::optional prediction_map = text_processing_pipeline.Apply(std::move(text_data)); ASSERT_TRUE(prediction_map); prediction_maps[i] = *prediction_map; @@ -202,7 +202,7 @@ TEST_F(BraveAdsTextProcessingTest, EmptySegmentModelTest) { // Act std::unique_ptr text_data = std::make_unique(input_text); - const absl::optional prediction_map = + const std::optional prediction_map = text_processing_pipeline.Apply(std::move(text_data)); // Assert @@ -223,7 +223,7 @@ TEST_F(BraveAdsTextProcessingTest, EmptyTransformationsModelTest) { // Act std::unique_ptr text_data = std::make_unique(input_text); - const absl::optional prediction_map = + const std::optional prediction_map = text_processing_pipeline.Apply(std::move(text_data)); // Assert @@ -248,7 +248,7 @@ TEST_F(BraveAdsTextProcessingTest, WrongTransformationsOrderModelTest) { // Act & Assert for (const auto& text : input_texts) { std::unique_ptr text_data = std::make_unique(text); - const absl::optional prediction_map = + const std::optional prediction_map = text_processing_pipeline.Apply(std::move(text_data)); EXPECT_FALSE(prediction_map); } @@ -328,7 +328,7 @@ TEST_F(BraveAdsTextProcessingTest, TopPredUnitTest) { ASSERT_TRUE(text_processing_pipeline.SetPipeline(std::move(file))); // Act - const absl::optional predictions = + const std::optional predictions = text_processing_pipeline.ClassifyPage(kTestPage); ASSERT_TRUE(predictions); @@ -354,12 +354,12 @@ TEST_F(BraveAdsTextProcessingTest, TextCMCCrashTest) { pipeline::TextProcessing text_processing_pipeline; ASSERT_TRUE(text_processing_pipeline.SetPipeline(std::move(file))); - const absl::optional contents = + const std::optional contents = MaybeReadFileToString(kTextCMCCrash); ASSERT_TRUE(contents); // Act - const absl::optional predictions = + const std::optional predictions = text_processing_pipeline.ClassifyPage(*contents); ASSERT_TRUE(predictions); diff --git a/components/brave_ads/core/internal/ml/transformation/mapped_tokens_transformation.cc b/components/brave_ads/core/internal/ml/transformation/mapped_tokens_transformation.cc index 2a2a472552c..b6317033051 100644 --- a/components/brave_ads/core/internal/ml/transformation/mapped_tokens_transformation.cc +++ b/components/brave_ads/core/internal/ml/transformation/mapped_tokens_transformation.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_ads/core/internal/ml/transformation/mapped_tokens_transformation.h" #include +#include #include #include "base/check.h" @@ -37,12 +38,12 @@ MappedTokensTransformation::MappedTokensTransformation( MappedTokensTransformation::~MappedTokensTransformation() = default; -absl::optional> +std::optional> MappedTokensTransformation::GetCategoryFrequencies( const std::vector& words) const { const auto* token_categories = mapped_token_transformation_->mapping(); if (!token_categories) { - return absl::nullopt; + return std::nullopt; } std::map frequencies; @@ -84,7 +85,7 @@ std::unique_ptr MappedTokensTransformation::Apply( CHECK(text_data); std::vector words = GetWordsFromText(*text_data); - absl::optional> frequencies = + std::optional> frequencies = GetCategoryFrequencies(words); if (!frequencies) { return {}; diff --git a/components/brave_ads/core/internal/ml/transformation/mapped_tokens_transformation.h b/components/brave_ads/core/internal/ml/transformation/mapped_tokens_transformation.h index 7a45cd0e1eb..0c03a9ecd48 100644 --- a/components/brave_ads/core/internal/ml/transformation/mapped_tokens_transformation.h +++ b/components/brave_ads/core/internal/ml/transformation/mapped_tokens_transformation.h @@ -8,12 +8,12 @@ #include #include +#include #include #include #include "base/memory/raw_ptr.h" #include "brave/components/brave_ads/core/internal/ml/transformation/transformation.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { namespace neural_text_classification::flat { @@ -32,7 +32,7 @@ class MappedTokensTransformation final : public Transformation { explicit MappedTokensTransformation(const std::string& parameters); - absl::optional> GetCategoryFrequencies( + std::optional> GetCategoryFrequencies( const std::vector& words) const; std::unique_ptr Apply( diff --git a/components/brave_ads/core/internal/ml/transformation/mapped_tokens_transformation_unittest.cc b/components/brave_ads/core/internal/ml/transformation/mapped_tokens_transformation_unittest.cc index c5bec35d48c..81a2f8700c2 100644 --- a/components/brave_ads/core/internal/ml/transformation/mapped_tokens_transformation_unittest.cc +++ b/components/brave_ads/core/internal/ml/transformation/mapped_tokens_transformation_unittest.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_ads/core/internal/ml/transformation/mapped_tokens_transformation.h" #include +#include #include #include @@ -15,7 +16,6 @@ #include "brave/components/brave_ads/core/internal/ml/data/text_data.h" #include "brave/components/brave_ads/core/internal/ml/data/vector_data.h" #include "brave/components/brave_ads/core/internal/ml/pipeline/neural_pipeline_test_util.h" -#include "third_party/abseil-cpp/absl/types/optional.h" // npm run test -- brave_unit_tests --filter=BraveAds* @@ -23,7 +23,7 @@ namespace brave_ads::ml { class BraveAdsMappedTokensTransformationTest : public UnitTestBase { public: - absl::optional BuildMappedTokensTransformation( + std::optional BuildMappedTokensTransformation( const int vector_dimension, const std::map>& token_categories_mapping) { @@ -36,24 +36,24 @@ class BraveAdsMappedTokensTransformationTest : public UnitTestBase { flatbuffers::Verifier verifier( reinterpret_cast(buffer_.data()), buffer_.size()); if (!neural_text_classification::flat::VerifyModelBuffer(verifier)) { - return absl::nullopt; + return std::nullopt; } const auto* raw_model = neural_text_classification::flat::GetModel(buffer_.data()); if (!raw_model || !raw_model->transformations()) { - return absl::nullopt; + return std::nullopt; } const auto* transformation_entry = raw_model->transformations()->Get(0); if (!transformation_entry) { - return absl::nullopt; + return std::nullopt; } const auto* transformation = transformation_entry->transformation_as_MappedTokenTransformation(); if (!transformation) { - return absl::nullopt; + return std::nullopt; } return MappedTokensTransformation(transformation); @@ -74,7 +74,7 @@ TEST_F(BraveAdsMappedTokensTransformationTest, ToMappedTokens) { std::map> token_categories_mapping = { {"is", {1}}, {"this", {5}}, {"test-string", {0, 3}}, {"simple", {1, 4}}}; - absl::optional to_mapped_tokens = + std::optional to_mapped_tokens = BuildMappedTokensTransformation(vector_dimension, token_categories_mapping); ASSERT_TRUE(to_mapped_tokens); @@ -110,7 +110,7 @@ TEST_F(BraveAdsMappedTokensTransformationTest, EmptyText) { std::map> token_categories_mapping = { {"is", {1}}, {"this", {5}}, {"test-string", {0, 3}}, {"simple", {1, 4}}}; - absl::optional to_mapped_tokens = + std::optional to_mapped_tokens = BuildMappedTokensTransformation(vector_dimension, token_categories_mapping); ASSERT_TRUE(to_mapped_tokens); @@ -145,7 +145,7 @@ TEST_F(BraveAdsMappedTokensTransformationTest, EmptyMap) { int vector_dimension = 6; std::map> token_categories_mapping = {}; - absl::optional to_mapped_tokens = + std::optional to_mapped_tokens = BuildMappedTokensTransformation(vector_dimension, token_categories_mapping); ASSERT_TRUE(to_mapped_tokens); @@ -179,7 +179,7 @@ TEST_F(BraveAdsMappedTokensTransformationTest, NonTextData) { std::map> token_categories_mapping = { {"is", {1}}, {"this", {5}}, {"test-string", {0, 3}}, {"simple", {1, 4}}}; - absl::optional to_mapped_tokens = + std::optional to_mapped_tokens = BuildMappedTokensTransformation(vector_dimension, token_categories_mapping); ASSERT_TRUE(to_mapped_tokens); diff --git a/components/brave_ads/core/internal/segments/segment_util_unittest.cc b/components/brave_ads/core/internal/segments/segment_util_unittest.cc index 601a87a8b14..45a360f3f85 100644 --- a/components/brave_ads/core/internal/segments/segment_util_unittest.cc +++ b/components/brave_ads/core/internal/segments/segment_util_unittest.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/segments/segment_util.h" +#include + #include "brave/components/brave_ads/core/internal/catalog/catalog_info.h" #include "brave/components/brave_ads/core/internal/catalog/catalog_unittest_constants.h" #include "brave/components/brave_ads/core/internal/catalog/catalog_url_request_json_reader.h" @@ -13,7 +15,6 @@ #include "brave/components/brave_ads/core/internal/deprecated/client/client_state_manager.h" #include "brave/components/brave_ads/core/mojom/brave_ads.mojom-shared.h" #include "brave/components/brave_ads/core/public/history/category_content_info.h" -#include "third_party/abseil-cpp/absl/types/optional.h" // npm run test -- brave_unit_tests --filter=BraveAds* @@ -23,11 +24,11 @@ class BraveAdsSegmentUtilTest : public UnitTestBase {}; TEST_F(BraveAdsSegmentUtilTest, GetSegmentsFromCatalog) { // Arrange - const absl::optional contents = + const std::optional contents = MaybeReadFileToString(kCatalogWithMultipleCampaignsFilename); ASSERT_TRUE(contents); - const absl::optional catalog = + const std::optional catalog = json::reader::ReadCatalog(*contents); ASSERT_TRUE(catalog); diff --git a/components/brave_ads/core/internal/serving/eligible_ads/allocation/seen_ads_util.cc b/components/brave_ads/core/internal/serving/eligible_ads/allocation/seen_ads_util.cc index f1fd61fd167..3dc6ccfb2b4 100644 --- a/components/brave_ads/core/internal/serving/eligible_ads/allocation/seen_ads_util.cc +++ b/components/brave_ads/core/internal/serving/eligible_ads/allocation/seen_ads_util.cc @@ -5,14 +5,16 @@ #include "brave/components/brave_ads/core/internal/serving/eligible_ads/allocation/seen_ads_util.h" +#include + #include "base/ranges/algorithm.h" #include "base/time/time.h" #include "brave/components/brave_ads/core/internal/creatives/creative_ad_info.h" namespace brave_ads { -absl::optional GetLastSeenAdAt(const AdEventList& ad_events, - const CreativeAdInfo& creative_ad) { +std::optional GetLastSeenAdAt(const AdEventList& ad_events, + const CreativeAdInfo& creative_ad) { const auto iter = base::ranges::find_if( ad_events, [&creative_ad](const AdEventInfo& ad_event) -> bool { return ad_event.confirmation_type == ConfirmationType::kViewed && @@ -21,7 +23,7 @@ absl::optional GetLastSeenAdAt(const AdEventList& ad_events, }); if (iter == ad_events.cend()) { - return absl::nullopt; + return std::nullopt; } return iter->created_at; diff --git a/components/brave_ads/core/internal/serving/eligible_ads/allocation/seen_ads_util.h b/components/brave_ads/core/internal/serving/eligible_ads/allocation/seen_ads_util.h index 0cd1d08cc82..d878c007918 100644 --- a/components/brave_ads/core/internal/serving/eligible_ads/allocation/seen_ads_util.h +++ b/components/brave_ads/core/internal/serving/eligible_ads/allocation/seen_ads_util.h @@ -6,8 +6,9 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_SERVING_ELIGIBLE_ADS_ALLOCATION_SEEN_ADS_UTIL_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_SERVING_ELIGIBLE_ADS_ALLOCATION_SEEN_ADS_UTIL_H_ +#include + #include "brave/components/brave_ads/core/internal/user/user_interaction/ad_events/ad_event_info.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace base { class Time; @@ -17,8 +18,8 @@ namespace brave_ads { struct CreativeAdInfo; -absl::optional GetLastSeenAdAt(const AdEventList& ad_events, - const CreativeAdInfo& creative_ad); +std::optional GetLastSeenAdAt(const AdEventList& ad_events, + const CreativeAdInfo& creative_ad); } // namespace brave_ads diff --git a/components/brave_ads/core/internal/serving/eligible_ads/allocation/seen_advertisers_util.cc b/components/brave_ads/core/internal/serving/eligible_ads/allocation/seen_advertisers_util.cc index c1a37fa53b2..ad06a28a73b 100644 --- a/components/brave_ads/core/internal/serving/eligible_ads/allocation/seen_advertisers_util.cc +++ b/components/brave_ads/core/internal/serving/eligible_ads/allocation/seen_advertisers_util.cc @@ -5,13 +5,15 @@ #include "brave/components/brave_ads/core/internal/serving/eligible_ads/allocation/seen_advertisers_util.h" +#include + #include "base/ranges/algorithm.h" #include "base/time/time.h" #include "brave/components/brave_ads/core/internal/creatives/creative_ad_info.h" namespace brave_ads { -absl::optional GetLastSeenAdvertiserAt( +std::optional GetLastSeenAdvertiserAt( const AdEventList& ad_events, const CreativeAdInfo& creative_ad) { const auto iter = base::ranges::find_if( @@ -21,7 +23,7 @@ absl::optional GetLastSeenAdvertiserAt( }); if (iter == ad_events.cend()) { - return absl::nullopt; + return std::nullopt; } return iter->created_at; diff --git a/components/brave_ads/core/internal/serving/eligible_ads/allocation/seen_advertisers_util.h b/components/brave_ads/core/internal/serving/eligible_ads/allocation/seen_advertisers_util.h index 101e8a3a2d9..7a5c8c4be18 100644 --- a/components/brave_ads/core/internal/serving/eligible_ads/allocation/seen_advertisers_util.h +++ b/components/brave_ads/core/internal/serving/eligible_ads/allocation/seen_advertisers_util.h @@ -6,8 +6,9 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_SERVING_ELIGIBLE_ADS_ALLOCATION_SEEN_ADVERTISERS_UTIL_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_SERVING_ELIGIBLE_ADS_ALLOCATION_SEEN_ADVERTISERS_UTIL_H_ +#include + #include "brave/components/brave_ads/core/internal/user/user_interaction/ad_events/ad_event_info.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace base { class Time; @@ -17,7 +18,7 @@ namespace brave_ads { struct CreativeAdInfo; -absl::optional GetLastSeenAdvertiserAt( +std::optional GetLastSeenAdvertiserAt( const AdEventList& ad_events, const CreativeAdInfo& creative_ad); diff --git a/components/brave_ads/core/internal/serving/eligible_ads/exclusion_rules/split_test_exclusion_rule.cc b/components/brave_ads/core/internal/serving/eligible_ads/exclusion_rules/split_test_exclusion_rule.cc index 42a60de7f9e..b49c8b3f943 100644 --- a/components/brave_ads/core/internal/serving/eligible_ads/exclusion_rules/split_test_exclusion_rule.cc +++ b/components/brave_ads/core/internal/serving/eligible_ads/exclusion_rules/split_test_exclusion_rule.cc @@ -5,10 +5,11 @@ #include "brave/components/brave_ads/core/internal/serving/eligible_ads/exclusion_rules/split_test_exclusion_rule.h" +#include + #include "base/metrics/field_trial.h" #include "base/strings/string_util.h" #include "brave/components/brave_ads/core/internal/creatives/creative_ad_info.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -16,18 +17,18 @@ namespace { constexpr char kTrialName[] = "AdvertiserSplitTestStudy"; -absl::optional GetSplitTestGroupName( +std::optional GetSplitTestGroupName( const std::string& trial_name) { base::FieldTrial* field_trial = base::FieldTrialList::Find(trial_name); if (!field_trial) { - return absl::nullopt; + return std::nullopt; } return field_trial->group_name(); } bool DoesRespectCap(const CreativeAdInfo& creative_ad) { - const absl::optional split_test_group = + const std::optional split_test_group = GetSplitTestGroupName(kTrialName); if (!split_test_group) { // Only respect cap if browser has signed up to a field trial diff --git a/components/brave_ads/core/internal/serving/eligible_ads/pacing/pacing_random_util.cc b/components/brave_ads/core/internal/serving/eligible_ads/pacing/pacing_random_util.cc index 0b5d19b1b71..758eab8a7de 100644 --- a/components/brave_ads/core/internal/serving/eligible_ads/pacing/pacing_random_util.cc +++ b/components/brave_ads/core/internal/serving/eligible_ads/pacing/pacing_random_util.cc @@ -5,11 +5,12 @@ #include "brave/components/brave_ads/core/internal/serving/eligible_ads/pacing/pacing_random_util.h" +#include + #include "base/rand_util.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace { -absl::optional g_pacing_random_number_for_testing; +std::optional g_pacing_random_number_for_testing; } // namespace namespace brave_ads { @@ -29,7 +30,7 @@ ScopedPacingRandomNumberSetterForTesting:: ScopedPacingRandomNumberSetterForTesting:: ~ScopedPacingRandomNumberSetterForTesting() { - g_pacing_random_number_for_testing = absl::nullopt; + g_pacing_random_number_for_testing = std::nullopt; } } // namespace brave_ads diff --git a/components/brave_ads/core/internal/serving/eligible_ads/pipelines/inline_content_ads/eligible_inline_content_ads_v2.cc b/components/brave_ads/core/internal/serving/eligible_ads/pipelines/inline_content_ads/eligible_inline_content_ads_v2.cc index 369e7fe7d8e..29b66fdce64 100644 --- a/components/brave_ads/core/internal/serving/eligible_ads/pipelines/inline_content_ads/eligible_inline_content_ads_v2.cc +++ b/components/brave_ads/core/internal/serving/eligible_ads/pipelines/inline_content_ads/eligible_inline_content_ads_v2.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/serving/eligible_ads/pipelines/inline_content_ads/eligible_inline_content_ads_v2.h" +#include #include #include "base/functional/bind.h" @@ -21,7 +22,6 @@ #include "brave/components/brave_ads/core/internal/targeting/geographical/subdivision/subdivision_targeting.h" #include "brave/components/brave_ads/core/internal/user/user_interaction/ad_events/ad_events_database_table.h" #include "brave/components/brave_ads/core/mojom/brave_ads.mojom-shared.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -106,7 +106,7 @@ void EligibleInlineContentAdsV2::GetEligibleAdsCallback( return std::move(callback).Run(/*eligible_ads=*/{}); } - const absl::optional creative_ad = + const std::optional creative_ad = MaybePredictCreativeAd(eligible_creative_ads, user_model, ad_events); if (!creative_ad) { BLOG(1, "No eligible ads"); diff --git a/components/brave_ads/core/internal/serving/eligible_ads/pipelines/new_tab_page_ads/eligible_new_tab_page_ads_v2.cc b/components/brave_ads/core/internal/serving/eligible_ads/pipelines/new_tab_page_ads/eligible_new_tab_page_ads_v2.cc index 87beddb8b5a..d0183b1366d 100644 --- a/components/brave_ads/core/internal/serving/eligible_ads/pipelines/new_tab_page_ads/eligible_new_tab_page_ads_v2.cc +++ b/components/brave_ads/core/internal/serving/eligible_ads/pipelines/new_tab_page_ads/eligible_new_tab_page_ads_v2.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/serving/eligible_ads/pipelines/new_tab_page_ads/eligible_new_tab_page_ads_v2.h" +#include #include #include "base/functional/bind.h" @@ -20,7 +21,6 @@ #include "brave/components/brave_ads/core/internal/targeting/behavioral/anti_targeting/resource/anti_targeting_resource.h" #include "brave/components/brave_ads/core/internal/targeting/geographical/subdivision/subdivision_targeting.h" #include "brave/components/brave_ads/core/internal/user/user_interaction/ad_events/ad_events_database_table.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -102,7 +102,7 @@ void EligibleNewTabPageAdsV2::GetEligibleAdsCallback( return std::move(callback).Run(/*eligible_ads=*/{}); } - const absl::optional creative_ad = + const std::optional creative_ad = MaybePredictCreativeAd(eligible_creative_ads, user_model, ad_events); if (!creative_ad) { BLOG(1, "No eligible ads"); diff --git a/components/brave_ads/core/internal/serving/eligible_ads/pipelines/notification_ads/eligible_notification_ads_v2.cc b/components/brave_ads/core/internal/serving/eligible_ads/pipelines/notification_ads/eligible_notification_ads_v2.cc index ad67f8c2da5..e8b2607461a 100644 --- a/components/brave_ads/core/internal/serving/eligible_ads/pipelines/notification_ads/eligible_notification_ads_v2.cc +++ b/components/brave_ads/core/internal/serving/eligible_ads/pipelines/notification_ads/eligible_notification_ads_v2.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/serving/eligible_ads/pipelines/notification_ads/eligible_notification_ads_v2.h" +#include #include #include "base/functional/bind.h" @@ -21,7 +22,6 @@ #include "brave/components/brave_ads/core/internal/targeting/behavioral/anti_targeting/resource/anti_targeting_resource.h" #include "brave/components/brave_ads/core/internal/targeting/geographical/subdivision/subdivision_targeting.h" #include "brave/components/brave_ads/core/internal/user/user_interaction/ad_events/ad_events_database_table.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -103,7 +103,7 @@ void EligibleNotificationAdsV2::GetEligibleAdsCallback( return std::move(callback).Run(/*eligible_ads=*/{}); } - const absl::optional creative_ad = + const std::optional creative_ad = MaybePredictCreativeAd(eligible_creative_ads, user_model, ad_events); if (!creative_ad) { BLOG(1, "No eligible ads"); diff --git a/components/brave_ads/core/internal/serving/eligible_ads/pipelines/notification_ads/eligible_notification_ads_v3.cc b/components/brave_ads/core/internal/serving/eligible_ads/pipelines/notification_ads/eligible_notification_ads_v3.cc index 47c1a732ed2..a3a767a1068 100644 --- a/components/brave_ads/core/internal/serving/eligible_ads/pipelines/notification_ads/eligible_notification_ads_v3.cc +++ b/components/brave_ads/core/internal/serving/eligible_ads/pipelines/notification_ads/eligible_notification_ads_v3.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/serving/eligible_ads/pipelines/notification_ads/eligible_notification_ads_v3.h" +#include #include #include "base/functional/bind.h" @@ -21,7 +22,6 @@ #include "brave/components/brave_ads/core/internal/targeting/behavioral/anti_targeting/resource/anti_targeting_resource.h" #include "brave/components/brave_ads/core/internal/targeting/geographical/subdivision/subdivision_targeting.h" #include "brave/components/brave_ads/core/internal/user/user_interaction/ad_events/ad_events_database_table.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -103,7 +103,7 @@ void EligibleNotificationAdsV3::GetEligibleAdsCallback( return std::move(callback).Run(/*eligible_ads=*/{}); } - const absl::optional creative_ad = + const std::optional creative_ad = user_model.interest.text_embedding_html_events.empty() ? MaybePredictCreativeAd(eligible_creative_ads, user_model, ad_events) : MaybePredictCreativeAd(eligible_creative_ads, user_model); diff --git a/components/brave_ads/core/internal/serving/inline_content_ad_serving.cc b/components/brave_ads/core/internal/serving/inline_content_ad_serving.cc index 65b6cfc34f0..8a36a381fd7 100644 --- a/components/brave_ads/core/internal/serving/inline_content_ad_serving.cc +++ b/components/brave_ads/core/internal/serving/inline_content_ad_serving.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_ads/core/internal/serving/inline_content_ad_serving.h" #include +#include #include #include "base/functional/bind.h" @@ -24,7 +25,6 @@ #include "brave/components/brave_ads/core/internal/targeting/behavioral/anti_targeting/resource/anti_targeting_resource.h" #include "brave/components/brave_ads/core/internal/targeting/geographical/subdivision/subdivision_targeting.h" #include "brave/components/brave_ads/core/public/units/inline_content_ad/inline_content_ad_info.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -49,7 +49,7 @@ void InlineContentAdServing::MaybeServeAd( return FailedToServeAd(dimensions, std::move(callback)); } - const absl::optional tab = TabManager::GetInstance().GetVisible(); + const std::optional tab = TabManager::GetInstance().GetVisible(); if (!tab) { return FailedToServeAd(dimensions, std::move(callback)); } @@ -145,7 +145,7 @@ void InlineContentAdServing::FailedToServeAd( MaybeServeInlineContentAdCallback callback) const { NotifyFailedToServeInlineContentAd(); - std::move(callback).Run(dimensions, /*ad=*/absl::nullopt); + std::move(callback).Run(dimensions, /*ad=*/std::nullopt); } void InlineContentAdServing::NotifyOpportunityAroseToServeInlineContentAd() diff --git a/components/brave_ads/core/internal/serving/inline_content_ad_serving_unittest.cc b/components/brave_ads/core/internal/serving/inline_content_ad_serving_unittest.cc index 72f1f981571..db068345856 100644 --- a/components/brave_ads/core/internal/serving/inline_content_ad_serving_unittest.cc +++ b/components/brave_ads/core/internal/serving/inline_content_ad_serving_unittest.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/serving/inline_content_ad_serving.h" +#include #include #include "base/test/mock_callback.h" @@ -20,7 +21,6 @@ #include "brave/components/brave_ads/core/internal/targeting/behavioral/anti_targeting/resource/anti_targeting_resource.h" #include "brave/components/brave_ads/core/internal/targeting/geographical/subdivision/subdivision_targeting.h" #include "brave/components/brave_ads/core/public/units/inline_content_ad/inline_content_ad_info.h" -#include "third_party/abseil-cpp/absl/types/optional.h" // npm run test -- brave_unit_tests --filter=BraveAds* @@ -63,7 +63,7 @@ TEST_F(BraveAdsInlineContentAdServingTest, DoNotServeAdForUnsupportedVersion) { base::MockCallback callback; EXPECT_CALL(callback, Run(/*dimensions=*/"200x100", - /*ad=*/::testing::Eq(absl::nullopt))); + /*ad=*/::testing::Eq(std::nullopt))); MaybeServeAd("200x100", callback.Get()); } @@ -83,7 +83,7 @@ TEST_F(BraveAdsInlineContentAdServingTest, ServeAd) { base::MockCallback callback; EXPECT_CALL(callback, - Run(/*dimensions=*/"200x100", ::testing::Ne(absl::nullopt))); + Run(/*dimensions=*/"200x100", ::testing::Ne(std::nullopt))); MaybeServeAd("200x100", callback.Get()); } @@ -103,7 +103,7 @@ TEST_F(BraveAdsInlineContentAdServingTest, base::MockCallback callback; EXPECT_CALL(callback, - Run(/*dimensions=*/"?x?", /*ad=*/::testing::Eq(absl::nullopt))); + Run(/*dimensions=*/"?x?", /*ad=*/::testing::Eq(std::nullopt))); MaybeServeAd("?x?", callback.Get()); } @@ -119,7 +119,7 @@ TEST_F(BraveAdsInlineContentAdServingTest, base::MockCallback callback; EXPECT_CALL(callback, Run(/*dimensions=*/"200x100", - /*ad=*/::testing::Eq(absl::nullopt))); + /*ad=*/::testing::Eq(std::nullopt))); MaybeServeAd("200x100", callback.Get()); } diff --git a/components/brave_ads/core/internal/serving/new_tab_page_ad_serving.cc b/components/brave_ads/core/internal/serving/new_tab_page_ad_serving.cc index 84febf0447f..7787421305a 100644 --- a/components/brave_ads/core/internal/serving/new_tab_page_ad_serving.cc +++ b/components/brave_ads/core/internal/serving/new_tab_page_ad_serving.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/serving/new_tab_page_ad_serving.h" +#include #include #include "base/functional/bind.h" @@ -123,7 +124,7 @@ void NewTabPageAdServing::FailedToServeAd( MaybeServeNewTabPageAdCallback callback) const { NotifyFailedToServeNewTabPageAd(); - std::move(callback).Run(/*ad=*/absl::nullopt); + std::move(callback).Run(/*ad=*/std::nullopt); } void NewTabPageAdServing::NotifyOpportunityAroseToServeNewTabPageAd() const { diff --git a/components/brave_ads/core/internal/serving/new_tab_page_ad_serving_unittest.cc b/components/brave_ads/core/internal/serving/new_tab_page_ad_serving_unittest.cc index 4b044408240..ed23a393a72 100644 --- a/components/brave_ads/core/internal/serving/new_tab_page_ad_serving_unittest.cc +++ b/components/brave_ads/core/internal/serving/new_tab_page_ad_serving_unittest.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/serving/new_tab_page_ad_serving.h" +#include #include #include "base/test/mock_callback.h" @@ -21,7 +22,6 @@ #include "brave/components/brave_ads/core/internal/targeting/geographical/subdivision/subdivision_targeting.h" #include "brave/components/brave_ads/core/public/ads_callback.h" #include "brave/components/brave_ads/core/public/units/new_tab_page_ad/new_tab_page_ad_info.h" -#include "third_party/abseil-cpp/absl/types/optional.h" // npm run test -- brave_unit_tests --filter=BraveAds* @@ -58,7 +58,7 @@ TEST_F(BraveAdsNewTabPageAdServingTest, DoNotServeAdForUnsupportedVersion) { EXPECT_CALL(delegate_mock_, OnFailedToServeNewTabPageAd); base::MockCallback callback; - EXPECT_CALL(callback, Run(/*ad=*/::testing::Eq(absl::nullopt))); + EXPECT_CALL(callback, Run(/*ad=*/::testing::Eq(std::nullopt))); MaybeServeAd(callback.Get()); } @@ -77,7 +77,7 @@ TEST_F(BraveAdsNewTabPageAdServingTest, ServeAd) { EXPECT_CALL(delegate_mock_, OnDidServeNewTabPageAd); base::MockCallback callback; - EXPECT_CALL(callback, Run(::testing::Ne(absl::nullopt))); + EXPECT_CALL(callback, Run(::testing::Ne(std::nullopt))); MaybeServeAd(callback.Get()); } @@ -96,7 +96,7 @@ TEST_F(BraveAdsNewTabPageAdServingTest, DoNotServeAdIfMissingWallpapers) { EXPECT_CALL(delegate_mock_, OnFailedToServeNewTabPageAd); base::MockCallback callback; - EXPECT_CALL(callback, Run(/*ad=*/::testing::Eq(absl::nullopt))); + EXPECT_CALL(callback, Run(/*ad=*/::testing::Eq(std::nullopt))); MaybeServeAd(callback.Get()); } @@ -110,7 +110,7 @@ TEST_F(BraveAdsNewTabPageAdServingTest, DoNotServeAdIfNoEligibleAdsFound) { EXPECT_CALL(delegate_mock_, OnFailedToServeNewTabPageAd); base::MockCallback callback; - EXPECT_CALL(callback, Run(/*ad=*/::testing::Eq(absl::nullopt))); + EXPECT_CALL(callback, Run(/*ad=*/::testing::Eq(std::nullopt))); MaybeServeAd(callback.Get()); } @@ -125,7 +125,7 @@ TEST_F(BraveAdsNewTabPageAdServingTest, EXPECT_CALL(delegate_mock_, OnFailedToServeNewTabPageAd); base::MockCallback callback; - EXPECT_CALL(callback, Run(/*ad=*/::testing::Eq(absl::nullopt))); + EXPECT_CALL(callback, Run(/*ad=*/::testing::Eq(std::nullopt))); MaybeServeAd(callback.Get()); } diff --git a/components/brave_ads/core/internal/serving/permission_rules/permission_rules.cc b/components/brave_ads/core/internal/serving/permission_rules/permission_rules.cc index 811f206cd9e..718b656d99b 100644 --- a/components/brave_ads/core/internal/serving/permission_rules/permission_rules.cc +++ b/components/brave_ads/core/internal/serving/permission_rules/permission_rules.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/serving/permission_rules/permission_rules.h" +#include #include #include "base/time/time.h" @@ -29,7 +30,6 @@ #include "brave/components/brave_ads/core/public/units/ad_type.h" #include "brave/components/brave_ads/core/public/units/notification_ad/notification_ad_feature.h" #include "brave/components/brave_ads/core/public/units/search_result_ad/search_result_ad_feature.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -233,7 +233,7 @@ bool HasMediaPermission() { if (!kShouldOnlyServeAdsIfMediaIsNotPlaying.Get()) { return true; } - const absl::optional tab = TabManager::GetInstance().GetVisible(); + const std::optional tab = TabManager::GetInstance().GetVisible(); if (!tab) { return true; } diff --git a/components/brave_ads/core/internal/serving/prediction/embedding_based/creative_ad_embedding_based_predictor.h b/components/brave_ads/core/internal/serving/prediction/embedding_based/creative_ad_embedding_based_predictor.h index 7b3a595a470..cebac11b8dd 100644 --- a/components/brave_ads/core/internal/serving/prediction/embedding_based/creative_ad_embedding_based_predictor.h +++ b/components/brave_ads/core/internal/serving/prediction/embedding_based/creative_ad_embedding_based_predictor.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_SERVING_PREDICTION_EMBEDDING_BASED_CREATIVE_AD_EMBEDDING_BASED_PREDICTOR_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_SERVING_PREDICTION_EMBEDDING_BASED_CREATIVE_AD_EMBEDDING_BASED_PREDICTOR_H_ +#include #include #include "base/check.h" @@ -13,13 +14,12 @@ #include "brave/components/brave_ads/core/internal/serving/prediction/embedding_based/sampling/creative_ad_embedding_based_predictor_sampling.h" #include "brave/components/brave_ads/core/internal/serving/prediction/embedding_based/voting/creative_ad_embedding_based_predictor_voting.h" #include "brave/components/brave_ads/core/internal/serving/targeting/user_model/user_model_info.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { template -absl::optional MaybePredictCreativeAd(const std::vector& creative_ads, - const UserModelInfo& user_model) { +std::optional MaybePredictCreativeAd(const std::vector& creative_ads, + const UserModelInfo& user_model) { CHECK(!creative_ads.empty()); const std::vector creative_ad_vote_registry = diff --git a/components/brave_ads/core/internal/serving/prediction/embedding_based/creative_ad_embedding_based_predictor_unittest.cc b/components/brave_ads/core/internal/serving/prediction/embedding_based/creative_ad_embedding_based_predictor_unittest.cc index 4403d1b2fd9..d5b5bfe9fa0 100644 --- a/components/brave_ads/core/internal/serving/prediction/embedding_based/creative_ad_embedding_based_predictor_unittest.cc +++ b/components/brave_ads/core/internal/serving/prediction/embedding_based/creative_ad_embedding_based_predictor_unittest.cc @@ -10,7 +10,6 @@ #include "brave/components/brave_ads/core/internal/creatives/notification_ads/creative_notification_ad_unittest_util.h" #include "brave/components/brave_ads/core/internal/targeting/contextual/text_embedding/text_embedding_html_event_unittest_util.h" #include "brave/components/brave_ads/core/internal/targeting/contextual/text_embedding/text_embedding_html_events.h" -#include "third_party/abseil-cpp/absl/types/optional.h" // npm run test -- brave_unit_tests --filter=BraveAds* diff --git a/components/brave_ads/core/internal/serving/prediction/embedding_based/sampling/creative_ad_embedding_based_predictor_sampling.h b/components/brave_ads/core/internal/serving/prediction/embedding_based/sampling/creative_ad_embedding_based_predictor_sampling.h index 1fe960e64a2..f30d5d304ad 100644 --- a/components/brave_ads/core/internal/serving/prediction/embedding_based/sampling/creative_ad_embedding_based_predictor_sampling.h +++ b/components/brave_ads/core/internal/serving/prediction/embedding_based/sampling/creative_ad_embedding_based_predictor_sampling.h @@ -7,16 +7,16 @@ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_SERVING_PREDICTION_EMBEDDING_BASED_SAMPLING_CREATIVE_AD_EMBEDDING_BASED_PREDICTOR_SAMPLING_H_ #include +#include #include #include "base/numerics/ranges.h" #include "base/rand_util.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { template -absl::optional MaybeSampleCreativeAd( +std::optional MaybeSampleCreativeAd( const std::vector& creative_ads, const std::vector& creative_ad_probabilities) { const double rand = base::RandDouble(); @@ -32,7 +32,7 @@ absl::optional MaybeSampleCreativeAd( } } - return absl::nullopt; + return std::nullopt; } } // namespace brave_ads diff --git a/components/brave_ads/core/internal/serving/prediction/model_based/creative_ad_model_based_predictor.h b/components/brave_ads/core/internal/serving/prediction/model_based/creative_ad_model_based_predictor.h index 489cae832d7..1570ed83269 100644 --- a/components/brave_ads/core/internal/serving/prediction/model_based/creative_ad_model_based_predictor.h +++ b/components/brave_ads/core/internal/serving/prediction/model_based/creative_ad_model_based_predictor.h @@ -6,22 +6,22 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_SERVING_PREDICTION_MODEL_BASED_CREATIVE_AD_MODEL_BASED_PREDICTOR_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_SERVING_PREDICTION_MODEL_BASED_CREATIVE_AD_MODEL_BASED_PREDICTOR_H_ +#include #include #include "brave/components/brave_ads/core/internal/serving/prediction/model_based/creative_ad_model_based_predictor_info.h" #include "brave/components/brave_ads/core/internal/serving/prediction/model_based/creative_ad_model_based_predictor_util.h" #include "brave/components/brave_ads/core/internal/serving/prediction/model_based/sampling/creative_ad_model_based_predictor_sampling.h" #include "brave/components/brave_ads/core/internal/user/user_interaction/ad_events/ad_event_info.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { struct UserModelInfo; template -absl::optional MaybePredictCreativeAd(const std::vector& creative_ads, - const UserModelInfo& user_model, - const AdEventList& ad_events) { +std::optional MaybePredictCreativeAd(const std::vector& creative_ads, + const UserModelInfo& user_model, + const AdEventList& ad_events) { CHECK(!creative_ads.empty()); const CreativeAdModelBasedPredictorList creative_ad_predictors = diff --git a/components/brave_ads/core/internal/serving/prediction/model_based/creative_ad_model_based_predictor_unittest.cc b/components/brave_ads/core/internal/serving/prediction/model_based/creative_ad_model_based_predictor_unittest.cc index 2c448a94a53..9e7688ca5b2 100644 --- a/components/brave_ads/core/internal/serving/prediction/model_based/creative_ad_model_based_predictor_unittest.cc +++ b/components/brave_ads/core/internal/serving/prediction/model_based/creative_ad_model_based_predictor_unittest.cc @@ -14,7 +14,6 @@ #include "brave/components/brave_ads/core/internal/serving/targeting/user_model/latent_interest/latent_interest_user_model_info.h" #include "brave/components/brave_ads/core/internal/serving/targeting/user_model/user_model_info.h" #include "brave/components/brave_ads/core/internal/user/user_interaction/ad_events/ad_event_unittest_util.h" -#include "third_party/abseil-cpp/absl/types/optional.h" // npm run test -- brave_unit_tests --filter=BraveAds* diff --git a/components/brave_ads/core/internal/serving/prediction/model_based/input_variable/creative_ad_model_based_predictor_input_variable_util.h b/components/brave_ads/core/internal/serving/prediction/model_based/input_variable/creative_ad_model_based_predictor_input_variable_util.h index b5eec4f7431..01cb3935bcb 100644 --- a/components/brave_ads/core/internal/serving/prediction/model_based/input_variable/creative_ad_model_based_predictor_input_variable_util.h +++ b/components/brave_ads/core/internal/serving/prediction/model_based/input_variable/creative_ad_model_based_predictor_input_variable_util.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_SERVING_PREDICTION_MODEL_BASED_INPUT_VARIABLE_CREATIVE_AD_MODEL_BASED_PREDICTOR_INPUT_VARIABLE_UTIL_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_SERVING_PREDICTION_MODEL_BASED_INPUT_VARIABLE_CREATIVE_AD_MODEL_BASED_PREDICTOR_INPUT_VARIABLE_UTIL_H_ +#include #include #include "brave/components/brave_ads/core/internal/serving/eligible_ads/allocation/seen_ads_util.h" @@ -13,7 +14,6 @@ #include "brave/components/brave_ads/core/internal/serving/prediction/model_based/input_variable/last_seen/creative_ad_model_based_predictor_last_seen_input_variable_info.h" #include "brave/components/brave_ads/core/internal/serving/prediction/model_based/input_variable/priority/creative_ad_model_based_predictor_priority_input_variable_info.h" #include "brave/components/brave_ads/core/internal/serving/prediction/model_based/weight/creative_ad_model_based_predictor_weights_info.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -47,7 +47,7 @@ ComputeCreativeAdModelBasedPredictorLastSeenAdInputVariable( CreativeAdModelBasedPredictorLastSeenInputVariableInfo last_seen_ad_input_variable; - const absl::optional last_seen_at = + const std::optional last_seen_at = GetLastSeenAdAt(ad_events, creative_ad); if (last_seen_at) { last_seen_ad_input_variable.value = base::Time::Now() - *last_seen_at; @@ -67,7 +67,7 @@ ComputeCreativeAdModelBasedPredictorLastSeenAdvertiserInputVariable( CreativeAdModelBasedPredictorLastSeenInputVariableInfo last_seen_advertiser_input_variable; - const absl::optional last_seen_at = + const std::optional last_seen_at = GetLastSeenAdvertiserAt(ad_events, creative_ad); if (last_seen_at) { last_seen_advertiser_input_variable.value = diff --git a/components/brave_ads/core/internal/serving/prediction/model_based/input_variable/last_seen/creative_ad_model_based_predictor_last_seen_input_variable_info.h b/components/brave_ads/core/internal/serving/prediction/model_based/input_variable/last_seen/creative_ad_model_based_predictor_last_seen_input_variable_info.h index a0c57945326..59f85dc1de9 100644 --- a/components/brave_ads/core/internal/serving/prediction/model_based/input_variable/last_seen/creative_ad_model_based_predictor_last_seen_input_variable_info.h +++ b/components/brave_ads/core/internal/serving/prediction/model_based/input_variable/last_seen/creative_ad_model_based_predictor_last_seen_input_variable_info.h @@ -6,8 +6,9 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_SERVING_PREDICTION_MODEL_BASED_INPUT_VARIABLE_LAST_SEEN_CREATIVE_AD_MODEL_BASED_PREDICTOR_LAST_SEEN_INPUT_VARIABLE_INFO_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_SERVING_PREDICTION_MODEL_BASED_INPUT_VARIABLE_LAST_SEEN_CREATIVE_AD_MODEL_BASED_PREDICTOR_LAST_SEEN_INPUT_VARIABLE_INFO_H_ +#include + #include "base/time/time.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -15,7 +16,7 @@ struct CreativeAdModelBasedPredictorLastSeenInputVariableInfo final { bool operator==(const CreativeAdModelBasedPredictorLastSeenInputVariableInfo&) const = default; - absl::optional value; + std::optional value; double weight = 1.0; }; diff --git a/components/brave_ads/core/internal/serving/prediction/model_based/sampling/creative_ad_model_based_predictor_sampling.h b/components/brave_ads/core/internal/serving/prediction/model_based/sampling/creative_ad_model_based_predictor_sampling.h index a420e3c4679..497fd9f3b7b 100644 --- a/components/brave_ads/core/internal/serving/prediction/model_based/sampling/creative_ad_model_based_predictor_sampling.h +++ b/components/brave_ads/core/internal/serving/prediction/model_based/sampling/creative_ad_model_based_predictor_sampling.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_SERVING_PREDICTION_MODEL_BASED_SAMPLING_CREATIVE_AD_MODEL_BASED_PREDICTOR_SAMPLING_H_ #include +#include #include #include "base/notreached.h" @@ -14,15 +15,14 @@ #include "base/rand_util.h" #include "brave/components/brave_ads/core/internal/serving/prediction/model_based/creative_ad_model_based_predictor_info.h" #include "brave/components/brave_ads/core/internal/serving/prediction/model_based/sampling/creative_ad_model_based_predictor_sampling_util.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { template -absl::optional MaybeSampleCreativeAd( +std::optional MaybeSampleCreativeAd( const CreativeAdModelBasedPredictorList& creative_ad_predictors) { if (creative_ad_predictors.empty()) { - return absl::nullopt; + return std::nullopt; } const double normalizing_constant = @@ -32,7 +32,7 @@ absl::optional MaybeSampleCreativeAd( if (normalizing_constant <= 0.0 || base::IsApproximatelyEqual(normalizing_constant, 0.0, std::numeric_limits::epsilon())) { - return absl::nullopt; + return std::nullopt; } const double rand = base::RandDouble(); diff --git a/components/brave_ads/core/internal/serving/prediction/model_based/sampling/creative_ad_model_based_predictor_sampling_unittest.cc b/components/brave_ads/core/internal/serving/prediction/model_based/sampling/creative_ad_model_based_predictor_sampling_unittest.cc index 379525e6fca..815d10140bf 100644 --- a/components/brave_ads/core/internal/serving/prediction/model_based/sampling/creative_ad_model_based_predictor_sampling_unittest.cc +++ b/components/brave_ads/core/internal/serving/prediction/model_based/sampling/creative_ad_model_based_predictor_sampling_unittest.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/serving/prediction/model_based/sampling/creative_ad_model_based_predictor_sampling.h" +#include + #include "brave/components/brave_ads/core/internal/common/unittest/unittest_base.h" #include "brave/components/brave_ads/core/internal/creatives/notification_ads/creative_notification_ad_info.h" #include "brave/components/brave_ads/core/internal/creatives/notification_ads/creative_notification_ad_unittest_util.h" @@ -94,7 +96,7 @@ TEST_F(BraveAdsCreativeAdModelBasedPredictorSamplingTest, for (int i = 0; i < 25; ++i) { // P(X>1) > 0.99999999 with X~Bin(n=25, p=0.5), i.e. less than 1 in 100M // tests are expected to fail. - const absl::optional creative_ad = + const std::optional creative_ad = MaybeSampleCreativeAd(creative_ad_predictors); ASSERT_TRUE(creative_ad); diff --git a/components/brave_ads/core/internal/serving/targeting/segments/top_segments.cc b/components/brave_ads/core/internal/serving/targeting/segments/top_segments.cc index 474cb3dd3b5..cb810c04a61 100644 --- a/components/brave_ads/core/internal/serving/targeting/segments/top_segments.cc +++ b/components/brave_ads/core/internal/serving/targeting/segments/top_segments.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/serving/targeting/segments/top_segments.h" +#include + #include "brave/components/brave_ads/core/internal/segments/segment_util.h" namespace brave_ads { @@ -41,13 +43,13 @@ SegmentList GetTopSegments(const SegmentList& segments, max_count); } -absl::optional GetTopSegment(const SegmentList& segments, - const bool parent_only) { +std::optional GetTopSegment(const SegmentList& segments, + const bool parent_only) { const SegmentList top_segments = FilterTopSegments(parent_only ? GetParentSegments(segments) : segments, /*max_count=*/1); if (top_segments.empty()) { - return absl::nullopt; + return std::nullopt; } return top_segments.front(); diff --git a/components/brave_ads/core/internal/serving/targeting/segments/top_segments.h b/components/brave_ads/core/internal/serving/targeting/segments/top_segments.h index e96326e5482..b1b9f3e2c03 100644 --- a/components/brave_ads/core/internal/serving/targeting/segments/top_segments.h +++ b/components/brave_ads/core/internal/serving/targeting/segments/top_segments.h @@ -6,10 +6,10 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_SERVING_TARGETING_SEGMENTS_TOP_SEGMENTS_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_SERVING_TARGETING_SEGMENTS_TOP_SEGMENTS_H_ +#include #include #include "brave/components/brave_ads/core/internal/segments/segment_alias.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -17,8 +17,8 @@ SegmentList GetTopSegments(const SegmentList& segments, int max_count, bool parent_only); -absl::optional GetTopSegment(const SegmentList& segments, - bool parent_only); +std::optional GetTopSegment(const SegmentList& segments, + bool parent_only); } // namespace brave_ads diff --git a/components/brave_ads/core/internal/tabs/tab_manager.cc b/components/brave_ads/core/internal/tabs/tab_manager.cc index bba99b299ab..30a898dbfdd 100644 --- a/components/brave_ads/core/internal/tabs/tab_manager.cc +++ b/components/brave_ads/core/internal/tabs/tab_manager.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/tabs/tab_manager.h" +#include + #include "base/check.h" #include "base/containers/contains.h" #include "base/hash/hash.h" @@ -47,29 +49,29 @@ bool TabManager::IsVisible(const int32_t tab_id) const { } bool TabManager::IsPlayingMedia(const int32_t tab_id) const { - const absl::optional tab = MaybeGetForId(tab_id); + const std::optional tab = MaybeGetForId(tab_id); return tab ? tab->is_playing_media : false; } -absl::optional TabManager::GetVisible() const { +std::optional TabManager::GetVisible() const { if (!visible_tab_id_) { - return absl::nullopt; + return std::nullopt; } return MaybeGetForId(*visible_tab_id_); } -absl::optional TabManager::GetLastVisible() const { +std::optional TabManager::GetLastVisible() const { if (!last_visible_tab_id_) { - return absl::nullopt; + return std::nullopt; } return MaybeGetForId(*last_visible_tab_id_); } -absl::optional TabManager::MaybeGetForId(const int32_t tab_id) const { +std::optional TabManager::MaybeGetForId(const int32_t tab_id) const { if (!base::Contains(tabs_, tab_id)) { - return absl::nullopt; + return std::nullopt; } return tabs_.at(tab_id); diff --git a/components/brave_ads/core/internal/tabs/tab_manager.h b/components/brave_ads/core/internal/tabs/tab_manager.h index 603934fe2f8..9cff7207cb0 100644 --- a/components/brave_ads/core/internal/tabs/tab_manager.h +++ b/components/brave_ads/core/internal/tabs/tab_manager.h @@ -8,6 +8,7 @@ #include #include +#include #include #include @@ -15,7 +16,6 @@ #include "brave/components/brave_ads/core/internal/tabs/tab_info.h" #include "brave/components/brave_ads/core/internal/tabs/tab_manager_observer.h" #include "brave/components/brave_ads/core/public/client/ads_client_notifier_observer.h" -#include "third_party/abseil-cpp/absl/types/optional.h" class GURL; @@ -42,10 +42,10 @@ class TabManager final : public AdsClientNotifierObserver { bool IsPlayingMedia(int32_t tab_id) const; - absl::optional GetVisible() const; - absl::optional GetLastVisible() const; + std::optional GetVisible() const; + std::optional GetLastVisible() const; - absl::optional MaybeGetForId(int32_t tab_id) const; + std::optional MaybeGetForId(int32_t tab_id) const; private: TabInfo& GetOrCreateForId(int32_t tab_id); @@ -83,8 +83,8 @@ class TabManager final : public AdsClientNotifierObserver { uint32_t last_text_content_hash_ = 0; uint32_t last_html_content_hash_ = 0; - absl::optional visible_tab_id_; - absl::optional last_visible_tab_id_; + std::optional visible_tab_id_; + std::optional last_visible_tab_id_; std::map tabs_; }; diff --git a/components/brave_ads/core/internal/targeting/behavioral/anti_targeting/resource/anti_targeting_info.cc b/components/brave_ads/core/internal/targeting/behavioral/anti_targeting/resource/anti_targeting_info.cc index 0f4bbb2a5e1..61e5cf654a2 100644 --- a/components/brave_ads/core/internal/targeting/behavioral/anti_targeting/resource/anti_targeting_info.cc +++ b/components/brave_ads/core/internal/targeting/behavioral/anti_targeting/resource/anti_targeting_info.cc @@ -5,9 +5,10 @@ #include "brave/components/brave_ads/core/internal/targeting/behavioral/anti_targeting/resource/anti_targeting_info.h" +#include + #include "base/values.h" #include "brave/components/brave_ads/core/internal/targeting/behavioral/anti_targeting/anti_targeting_feature.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h" namespace brave_ads { @@ -34,7 +35,7 @@ base::expected AntiTargetingInfo::CreateFromValue(const base::Value::Dict dict) { AntiTargetingInfo anti_targeting; - if (const absl::optional version = dict.FindInt(kVersionKey)) { + if (const std::optional version = dict.FindInt(kVersionKey)) { if (kAntiTargetingResourceVersion.Get() != *version) { return base::unexpected("Failed to load from JSON, version mismatch"); } diff --git a/components/brave_ads/core/internal/targeting/behavioral/anti_targeting/resource/anti_targeting_resource.h b/components/brave_ads/core/internal/targeting/behavioral/anti_targeting/resource/anti_targeting_resource.h index 2a9af62d16d..a03a436c1f9 100644 --- a/components/brave_ads/core/internal/targeting/behavioral/anti_targeting/resource/anti_targeting_resource.h +++ b/components/brave_ads/core/internal/targeting/behavioral/anti_targeting/resource/anti_targeting_resource.h @@ -6,13 +6,13 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_TARGETING_BEHAVIORAL_ANTI_TARGETING_RESOURCE_ANTI_TARGETING_RESOURCE_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_TARGETING_BEHAVIORAL_ANTI_TARGETING_RESOURCE_ANTI_TARGETING_RESOURCE_H_ +#include #include #include "base/memory/weak_ptr.h" #include "brave/components/brave_ads/core/internal/common/resources/resource_parsing_error_or.h" #include "brave/components/brave_ads/core/internal/targeting/behavioral/anti_targeting/resource/anti_targeting_info.h" #include "brave/components/brave_ads/core/public/client/ads_client_notifier_observer.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -50,10 +50,10 @@ class AntiTargetingResource final : public AdsClientNotifierObserver { const std::string& id) override; void OnNotifyDidUnregisterResourceComponent(const std::string& id) override; - absl::optional anti_targeting_; + std::optional anti_targeting_; bool did_load_ = false; - absl::optional manifest_version_; + std::optional manifest_version_; base::WeakPtrFactory weak_factory_{this}; }; diff --git a/components/brave_ads/core/internal/targeting/behavioral/multi_armed_bandits/epsilon_greedy_bandit_arm_util.cc b/components/brave_ads/core/internal/targeting/behavioral/multi_armed_bandits/epsilon_greedy_bandit_arm_util.cc index 2bbf763d585..2539d2c1173 100644 --- a/components/brave_ads/core/internal/targeting/behavioral/multi_armed_bandits/epsilon_greedy_bandit_arm_util.cc +++ b/components/brave_ads/core/internal/targeting/behavioral/multi_armed_bandits/epsilon_greedy_bandit_arm_util.cc @@ -5,11 +5,12 @@ #include "brave/components/brave_ads/core/internal/targeting/behavioral/multi_armed_bandits/epsilon_greedy_bandit_arm_util.h" +#include + #include "base/values.h" #include "brave/components/brave_ads/core/internal/client/ads_client_util.h" #include "brave/components/brave_ads/core/internal/targeting/behavioral/multi_armed_bandits/epsilon_greedy_bandit_arm_value_util.h" #include "brave/components/brave_ads/core/public/prefs/pref_names.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -23,7 +24,7 @@ void ResetEpsilonGreedyBanditArms() { } EpsilonGreedyBanditArmMap GetEpsilonGreedyBanditArms() { - const absl::optional dict = + const std::optional dict = GetProfileDictPref(prefs::kEpsilonGreedyBanditArms); if (!dict) { return {}; diff --git a/components/brave_ads/core/internal/targeting/behavioral/multi_armed_bandits/epsilon_greedy_bandit_arm_value_util.cc b/components/brave_ads/core/internal/targeting/behavioral/multi_armed_bandits/epsilon_greedy_bandit_arm_value_util.cc index 2557d4bfa33..45fa4bd1198 100644 --- a/components/brave_ads/core/internal/targeting/behavioral/multi_armed_bandits/epsilon_greedy_bandit_arm_value_util.cc +++ b/components/brave_ads/core/internal/targeting/behavioral/multi_armed_bandits/epsilon_greedy_bandit_arm_value_util.cc @@ -5,10 +5,10 @@ #include "brave/components/brave_ads/core/internal/targeting/behavioral/multi_armed_bandits/epsilon_greedy_bandit_arm_value_util.h" +#include #include #include "brave/components/brave_ads/core/internal/common/logging_util.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -18,11 +18,11 @@ constexpr char kSegmentKey[] = "segment"; constexpr char kValueKey[] = "value"; constexpr char kPullsKey[] = "pulls"; -absl::optional MaybeGetArmFromDict( +std::optional MaybeGetArmFromDict( const base::Value::Dict& dict) { const std::string* const segment = dict.FindString(kSegmentKey); if (!segment || segment->empty()) { - return absl::nullopt; + return std::nullopt; } EpsilonGreedyBanditArmInfo arm; @@ -62,7 +62,7 @@ EpsilonGreedyBanditArmMap EpsilonGreedyBanditArmsFromValue( continue; } - const absl::optional arm = + const std::optional arm = MaybeGetArmFromDict(*item_dict); if (!arm) { found_errors = true; diff --git a/components/brave_ads/core/internal/targeting/behavioral/multi_armed_bandits/resource/epsilon_greedy_bandit_resource_util.cc b/components/brave_ads/core/internal/targeting/behavioral/multi_armed_bandits/resource/epsilon_greedy_bandit_resource_util.cc index c21a4e97433..a0d715734dd 100644 --- a/components/brave_ads/core/internal/targeting/behavioral/multi_armed_bandits/resource/epsilon_greedy_bandit_resource_util.cc +++ b/components/brave_ads/core/internal/targeting/behavioral/multi_armed_bandits/resource/epsilon_greedy_bandit_resource_util.cc @@ -5,11 +5,12 @@ #include "brave/components/brave_ads/core/internal/targeting/behavioral/multi_armed_bandits/resource/epsilon_greedy_bandit_resource_util.h" +#include + #include "base/values.h" #include "brave/components/brave_ads/core/internal/client/ads_client_util.h" #include "brave/components/brave_ads/core/internal/segments/segment_value_util.h" #include "brave/components/brave_ads/core/public/prefs/pref_names.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -19,7 +20,7 @@ void SetEpsilonGreedyBanditEligibleSegments(const SegmentList& segments) { } SegmentList GetEpsilonGreedyBanditEligibleSegments() { - const absl::optional list = + const std::optional list = GetProfileListPref(prefs::kEpsilonGreedyBanditEligibleSegments); if (!list) { return {}; diff --git a/components/brave_ads/core/internal/targeting/behavioral/purchase_intent/purchase_intent_processor.cc b/components/brave_ads/core/internal/targeting/behavioral/purchase_intent/purchase_intent_processor.cc index d168e0fd76f..062193c17e9 100644 --- a/components/brave_ads/core/internal/targeting/behavioral/purchase_intent/purchase_intent_processor.cc +++ b/components/brave_ads/core/internal/targeting/behavioral/purchase_intent/purchase_intent_processor.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/targeting/behavioral/purchase_intent/purchase_intent_processor.h" +#include + #include "base/ranges/algorithm.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" @@ -19,7 +21,6 @@ #include "brave/components/brave_ads/core/internal/targeting/behavioral/purchase_intent/resource/purchase_intent_resource.h" #include "brave/components/brave_ads/core/internal/targeting/behavioral/purchase_intent/resource/purchase_intent_signal_history_info.h" #include "brave/components/brave_ads/core/internal/targeting/behavioral/purchase_intent/resource/purchase_intent_site_info.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h" namespace brave_ads { @@ -76,7 +77,7 @@ void PurchaseIntentProcessor::Process(const GURL& url) { "URL is invalid"); } - const absl::optional signal = ExtractSignal(url); + const std::optional signal = ExtractSignal(url); if (!signal || signal->segments.empty()) { return BLOG(1, "No purchase intent matches found for visited URL"); } @@ -88,15 +89,15 @@ void PurchaseIntentProcessor::Process(const GURL& url) { /////////////////////////////////////////////////////////////////////////////// -absl::optional PurchaseIntentProcessor::ExtractSignal( +std::optional PurchaseIntentProcessor::ExtractSignal( const GURL& url) const { - const absl::optional search_query = + const std::optional search_query = ExtractSearchTermQueryValue(url); if (search_query) { - const absl::optional segments = + const std::optional segments = GetSegmentsForSearchQuery(*search_query); if (!segments || segments->empty()) { - return absl::nullopt; + return std::nullopt; } PurchaseIntentSignalInfo purchase_intent_signal; @@ -107,9 +108,9 @@ absl::optional PurchaseIntentProcessor::ExtractSignal( return purchase_intent_signal; } - const absl::optional site = GetSite(url); + const std::optional site = GetSite(url); if (!site || !site->url_netloc.is_valid()) { - return absl::nullopt; + return std::nullopt; } PurchaseIntentSignalInfo purchase_intent_signal; @@ -119,11 +120,11 @@ absl::optional PurchaseIntentProcessor::ExtractSignal( return purchase_intent_signal; } -absl::optional PurchaseIntentProcessor::GetSite( +std::optional PurchaseIntentProcessor::GetSite( const GURL& url) const { - const absl::optional& purchase_intent = resource_->get(); + const std::optional& purchase_intent = resource_->get(); if (!purchase_intent) { - return absl::nullopt; + return std::nullopt; } for (const auto& site : purchase_intent->sites) { @@ -132,14 +133,14 @@ absl::optional PurchaseIntentProcessor::GetSite( } } - return absl::nullopt; + return std::nullopt; } -absl::optional PurchaseIntentProcessor::GetSegmentsForSearchQuery( +std::optional PurchaseIntentProcessor::GetSegmentsForSearchQuery( const std::string& search_query) const { - const absl::optional& purchase_intent = resource_->get(); + const std::optional& purchase_intent = resource_->get(); if (!purchase_intent) { - return absl::nullopt; + return std::nullopt; } const KeywordList search_query_keywords = ToKeywords(search_query); @@ -154,12 +155,12 @@ absl::optional PurchaseIntentProcessor::GetSegmentsForSearchQuery( } } - return absl::nullopt; + return std::nullopt; } uint16_t PurchaseIntentProcessor::GetFunnelWeightForSearchQuery( const std::string& search_query) const { - const absl::optional& purchase_intent = resource_->get(); + const std::optional& purchase_intent = resource_->get(); if (!purchase_intent) { return kPurchaseIntentDefaultSignalWeight; } @@ -196,7 +197,7 @@ void PurchaseIntentProcessor::OnTextContentDidChange( return; } - const absl::optional last_visible_tab = + const std::optional last_visible_tab = TabManager::GetInstance().GetLastVisible(); if (!last_visible_tab) { return; diff --git a/components/brave_ads/core/internal/targeting/behavioral/purchase_intent/purchase_intent_processor.h b/components/brave_ads/core/internal/targeting/behavioral/purchase_intent/purchase_intent_processor.h index 0cb51c443a3..0437aaa45e5 100644 --- a/components/brave_ads/core/internal/targeting/behavioral/purchase_intent/purchase_intent_processor.h +++ b/components/brave_ads/core/internal/targeting/behavioral/purchase_intent/purchase_intent_processor.h @@ -7,13 +7,13 @@ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_TARGETING_BEHAVIORAL_PURCHASE_INTENT_PURCHASE_INTENT_PROCESSOR_H_ #include +#include #include #include #include "base/memory/raw_ref.h" #include "brave/components/brave_ads/core/internal/segments/segment_alias.h" #include "brave/components/brave_ads/core/internal/tabs/tab_manager_observer.h" -#include "third_party/abseil-cpp/absl/types/optional.h" class GURL; @@ -38,11 +38,11 @@ class PurchaseIntentProcessor final : public TabManagerObserver { void Process(const GURL& url); private: - absl::optional ExtractSignal(const GURL& url) const; + std::optional ExtractSignal(const GURL& url) const; - absl::optional GetSite(const GURL& url) const; + std::optional GetSite(const GURL& url) const; - absl::optional GetSegmentsForSearchQuery( + std::optional GetSegmentsForSearchQuery( const std::string& search_query) const; uint16_t GetFunnelWeightForSearchQuery(const std::string& search_query) const; diff --git a/components/brave_ads/core/internal/targeting/behavioral/purchase_intent/resource/purchase_intent_info.cc b/components/brave_ads/core/internal/targeting/behavioral/purchase_intent/resource/purchase_intent_info.cc index 916a376aa0b..4ae12fd0529 100644 --- a/components/brave_ads/core/internal/targeting/behavioral/purchase_intent/resource/purchase_intent_info.cc +++ b/components/brave_ads/core/internal/targeting/behavioral/purchase_intent/resource/purchase_intent_info.cc @@ -5,11 +5,11 @@ #include "brave/components/brave_ads/core/internal/targeting/behavioral/purchase_intent/resource/purchase_intent_info.h" +#include #include #include "base/values.h" #include "brave/components/brave_ads/core/internal/targeting/behavioral/purchase_intent/purchase_intent_feature.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h" namespace brave_ads { @@ -31,7 +31,7 @@ PurchaseIntentInfo::CreateFromValue(const base::Value::Dict dict) { // complexity. PurchaseIntentInfo purchase_intent; - if (absl::optional version = dict.FindInt("version")) { + if (std::optional version = dict.FindInt("version")) { if (kPurchaseIntentResourceVersion.Get() != *version) { return base::unexpected("Failed to load from JSON, version mismatch"); } diff --git a/components/brave_ads/core/internal/targeting/behavioral/purchase_intent/resource/purchase_intent_resource.h b/components/brave_ads/core/internal/targeting/behavioral/purchase_intent/resource/purchase_intent_resource.h index ca84c9be1d7..d2783668086 100644 --- a/components/brave_ads/core/internal/targeting/behavioral/purchase_intent/resource/purchase_intent_resource.h +++ b/components/brave_ads/core/internal/targeting/behavioral/purchase_intent/resource/purchase_intent_resource.h @@ -6,13 +6,13 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_TARGETING_BEHAVIORAL_PURCHASE_INTENT_RESOURCE_PURCHASE_INTENT_RESOURCE_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_TARGETING_BEHAVIORAL_PURCHASE_INTENT_RESOURCE_PURCHASE_INTENT_RESOURCE_H_ +#include #include #include "base/memory/weak_ptr.h" #include "brave/components/brave_ads/core/internal/common/resources/resource_parsing_error_or.h" #include "brave/components/brave_ads/core/internal/targeting/behavioral/purchase_intent/resource/purchase_intent_info.h" #include "brave/components/brave_ads/core/public/client/ads_client_notifier_observer.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -30,7 +30,7 @@ class PurchaseIntentResource final : public AdsClientNotifierObserver { bool IsInitialized() const { return !!purchase_intent_; } - const absl::optional& get() const { + const std::optional& get() const { return purchase_intent_; } @@ -52,10 +52,10 @@ class PurchaseIntentResource final : public AdsClientNotifierObserver { const std::string& id) override; void OnNotifyDidUnregisterResourceComponent(const std::string& id) override; - absl::optional purchase_intent_; + std::optional purchase_intent_; bool did_load_ = false; - absl::optional manifest_version_; + std::optional manifest_version_; base::WeakPtrFactory weak_factory_{this}; }; diff --git a/components/brave_ads/core/internal/targeting/contextual/text_classification/resource/text_classification_resource.h b/components/brave_ads/core/internal/targeting/contextual/text_classification/resource/text_classification_resource.h index 2ea67d25313..fad3869f37f 100644 --- a/components/brave_ads/core/internal/targeting/contextual/text_classification/resource/text_classification_resource.h +++ b/components/brave_ads/core/internal/targeting/contextual/text_classification/resource/text_classification_resource.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_TARGETING_CONTEXTUAL_TEXT_CLASSIFICATION_RESOURCE_TEXT_CLASSIFICATION_RESOURCE_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_TARGETING_CONTEXTUAL_TEXT_CLASSIFICATION_RESOURCE_TEXT_CLASSIFICATION_RESOURCE_H_ +#include #include #include "base/functional/callback_forward.h" @@ -15,12 +16,11 @@ #include "brave/components/brave_ads/core/internal/ml/ml_alias.h" #include "brave/components/brave_ads/core/internal/ml/pipeline/text_processing/text_processing.h" #include "brave/components/brave_ads/core/public/client/ads_client_notifier_observer.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { using ClassifyPageCallback = - base::OnceCallback)>; + base::OnceCallback)>; class TextClassificationResource final : public AdsClientNotifierObserver { public: @@ -59,11 +59,11 @@ class TextClassificationResource final : public AdsClientNotifierObserver { const std::string& id) override; void OnNotifyDidUnregisterResourceComponent(const std::string& id) override; - absl::optional> + std::optional> text_processing_pipeline_; bool did_load_ = false; - absl::optional manifest_version_; + std::optional manifest_version_; base::WeakPtrFactory weak_factory_{this}; }; diff --git a/components/brave_ads/core/internal/targeting/contextual/text_classification/text_classification_processor.cc b/components/brave_ads/core/internal/targeting/contextual/text_classification/text_classification_processor.cc index 20f85d6aca2..2e78de6b076 100644 --- a/components/brave_ads/core/internal/targeting/contextual/text_classification/text_classification_processor.cc +++ b/components/brave_ads/core/internal/targeting/contextual/text_classification/text_classification_processor.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/targeting/contextual/text_classification/text_classification_processor.h" +#include + #include "base/check.h" #include "base/functional/bind.h" #include "base/ranges/algorithm.h" @@ -55,7 +57,7 @@ void TextClassificationProcessor::Process(const std::string& text) { } void TextClassificationProcessor::ClassifyPageCallback( - const absl::optional probabilities) { + const std::optional probabilities) { if (!probabilities) { return BLOG(0, "Text classification failed due to an invalid model"); } diff --git a/components/brave_ads/core/internal/targeting/contextual/text_classification/text_classification_processor.h b/components/brave_ads/core/internal/targeting/contextual/text_classification/text_classification_processor.h index 809569944f6..2e6419cf8df 100644 --- a/components/brave_ads/core/internal/targeting/contextual/text_classification/text_classification_processor.h +++ b/components/brave_ads/core/internal/targeting/contextual/text_classification/text_classification_processor.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_TARGETING_CONTEXTUAL_TEXT_CLASSIFICATION_TEXT_CLASSIFICATION_PROCESSOR_H_ #include +#include #include #include @@ -14,7 +15,6 @@ #include "base/memory/weak_ptr.h" #include "brave/components/brave_ads/core/internal/tabs/tab_manager_observer.h" #include "brave/components/brave_ads/core/internal/targeting/contextual/text_classification/model/text_classification_alias.h" -#include "third_party/abseil-cpp/absl/types/optional.h" class GURL; @@ -40,7 +40,7 @@ class TextClassificationProcessor final : public TabManagerObserver { private: void ClassifyPageCallback( - absl::optional probabilities); + std::optional probabilities); // TabManagerObserver: void OnTextContentDidChange(int32_t tab_id, diff --git a/components/brave_ads/core/internal/targeting/contextual/text_embedding/resource/text_embedding_resource.h b/components/brave_ads/core/internal/targeting/contextual/text_embedding/resource/text_embedding_resource.h index 9f728c755aa..6a8db03fc42 100644 --- a/components/brave_ads/core/internal/targeting/contextual/text_embedding/resource/text_embedding_resource.h +++ b/components/brave_ads/core/internal/targeting/contextual/text_embedding/resource/text_embedding_resource.h @@ -6,13 +6,13 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_TARGETING_CONTEXTUAL_TEXT_EMBEDDING_RESOURCE_TEXT_EMBEDDING_RESOURCE_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_TARGETING_CONTEXTUAL_TEXT_EMBEDDING_RESOURCE_TEXT_EMBEDDING_RESOURCE_H_ +#include #include #include "base/memory/weak_ptr.h" #include "brave/components/brave_ads/core/internal/common/resources/resource_parsing_error_or.h" #include "brave/components/brave_ads/core/internal/ml/pipeline/text_processing/embedding_processing.h" #include "brave/components/brave_ads/core/public/client/ads_client_notifier_observer.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -30,7 +30,7 @@ class TextEmbeddingResource final : public AdsClientNotifierObserver { bool IsInitialized() const { return !!embedding_processing_; } - const absl::optional& get() const { + const std::optional& get() const { return embedding_processing_; } @@ -53,10 +53,10 @@ class TextEmbeddingResource final : public AdsClientNotifierObserver { const std::string& id) override; void OnNotifyDidUnregisterResourceComponent(const std::string& id) override; - absl::optional embedding_processing_; + std::optional embedding_processing_; bool did_load_ = false; - absl::optional manifest_version_; + std::optional manifest_version_; base::WeakPtrFactory weak_factory_{this}; }; diff --git a/components/brave_ads/core/internal/targeting/contextual/text_embedding/text_embedding_processor.cc b/components/brave_ads/core/internal/targeting/contextual/text_embedding/text_embedding_processor.cc index d8d73f4ab89..d118b076583 100644 --- a/components/brave_ads/core/internal/targeting/contextual/text_embedding/text_embedding_processor.cc +++ b/components/brave_ads/core/internal/targeting/contextual/text_embedding/text_embedding_processor.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/targeting/contextual/text_embedding/text_embedding_processor.h" +#include + #include "base/ranges/algorithm.h" #include "brave/components/brave_ads/core/internal/common/logging_util.h" #include "brave/components/brave_ads/core/internal/common/search_engine/search_engine_results_page_util.h" @@ -17,7 +19,6 @@ #include "brave/components/brave_ads/core/internal/targeting/contextual/text_embedding/text_embedding_feature.h" #include "brave/components/brave_ads/core/internal/targeting/contextual/text_embedding/text_embedding_html_events.h" #include "brave/components/brave_ads/core/internal/targeting/contextual/text_embedding/text_embedding_processor_util.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h" namespace brave_ads { @@ -49,8 +50,8 @@ void TextEmbeddingProcessor::Process(const std::string& html) { return BLOG(1, "No text available for embedding"); } - const absl::optional& - embedding_processing = resource_->get(); + const std::optional& embedding_processing = + resource_->get(); CHECK(embedding_processing); const ml::pipeline::TextEmbeddingInfo text_embedding = diff --git a/components/brave_ads/core/internal/targeting/geographical/subdivision/subdivision_targeting.cc b/components/brave_ads/core/internal/targeting/geographical/subdivision/subdivision_targeting.cc index b721cea2f6b..b8bc1c15da1 100644 --- a/components/brave_ads/core/internal/targeting/geographical/subdivision/subdivision_targeting.cc +++ b/components/brave_ads/core/internal/targeting/geographical/subdivision/subdivision_targeting.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/targeting/geographical/subdivision/subdivision_targeting.h" +#include + #include "brave/components/brave_ads/core/internal/client/ads_client_util.h" #include "brave/components/brave_ads/core/internal/common/locale/locale_util.h" #include "brave/components/brave_ads/core/internal/common/logging_util.h" @@ -57,7 +59,7 @@ const std::string& SubdivisionTargeting::GetSubdivision() const { void SubdivisionTargeting::MaybeInitialize() { const std::string& auto_detected_subdivision = GetLazyAutoDetectedSubdivision(); - absl::optional country_code = + std::optional country_code = GetSubdivisionCountryCode(auto_detected_subdivision); if (!country_code) { @@ -99,7 +101,7 @@ void SubdivisionTargeting::MaybeAllowForCountry( const std::string& subdivision = GetSubdivision(); - absl::optional subdivision_country_code; + std::optional subdivision_country_code; if (!subdivision.empty()) { subdivision_country_code = GetSubdivisionCountryCode(subdivision); } @@ -224,7 +226,7 @@ void SubdivisionTargeting::OnNotifyPrefDidChange(const std::string& path) { void SubdivisionTargeting::OnDidUpdateSubdivision( const std::string& subdivision) { - absl::optional country_code = + std::optional country_code = GetSubdivisionCountryCode(subdivision); if (!country_code) { return; diff --git a/components/brave_ads/core/internal/targeting/geographical/subdivision/subdivision_targeting.h b/components/brave_ads/core/internal/targeting/geographical/subdivision/subdivision_targeting.h index 2501d1c0156..a604ed15447 100644 --- a/components/brave_ads/core/internal/targeting/geographical/subdivision/subdivision_targeting.h +++ b/components/brave_ads/core/internal/targeting/geographical/subdivision/subdivision_targeting.h @@ -6,11 +6,11 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_TARGETING_GEOGRAPHICAL_SUBDIVISION_SUBDIVISION_TARGETING_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_TARGETING_GEOGRAPHICAL_SUBDIVISION_SUBDIVISION_TARGETING_H_ +#include #include #include "brave/components/brave_ads/core/internal/common/subdivision/subdivision_observer.h" #include "brave/components/brave_ads/core/public/client/ads_client_notifier_observer.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -66,8 +66,8 @@ class SubdivisionTargeting final : public AdsClientNotifierObserver, // SubdivisionObserver: void OnDidUpdateSubdivision(const std::string& subdivision) override; - mutable absl::optional auto_detected_subdivision_; - mutable absl::optional user_selected_subdivision_; + mutable std::optional auto_detected_subdivision_; + mutable std::optional user_selected_subdivision_; }; } // namespace brave_ads diff --git a/components/brave_ads/core/internal/transfer/transfer.cc b/components/brave_ads/core/internal/transfer/transfer.cc index b042d862034..b570e1db949 100644 --- a/components/brave_ads/core/internal/transfer/transfer.cc +++ b/components/brave_ads/core/internal/transfer/transfer.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/transfer/transfer.h" +#include + #include "base/check.h" #include "base/functional/bind.h" #include "base/time/time.h" @@ -16,7 +18,6 @@ #include "brave/components/brave_ads/core/internal/user/user_interaction/ad_events/ad_events.h" #include "brave/components/brave_ads/core/public/account/confirmations/confirmation_type.h" #include "brave/components/brave_ads/core/public/transfer/transfer_feature.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h" namespace brave_ads { @@ -90,7 +91,7 @@ void Transfer::TransferAdCallback(const int32_t tab_id, return FailedToTransferAd(ad); } - const absl::optional tab = + const std::optional tab = TabManager::GetInstance().MaybeGetForId(tab_id); if (!tab) { return FailedToTransferAd(ad); diff --git a/components/brave_ads/core/internal/transfer/transfer.h b/components/brave_ads/core/internal/transfer/transfer.h index bcea8456ffe..24ebcc0f30a 100644 --- a/components/brave_ads/core/internal/transfer/transfer.h +++ b/components/brave_ads/core/internal/transfer/transfer.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_TRANSFER_TRANSFER_H_ #include +#include #include #include "base/memory/weak_ptr.h" @@ -15,7 +16,6 @@ #include "brave/components/brave_ads/core/internal/tabs/tab_manager_observer.h" #include "brave/components/brave_ads/core/internal/transfer/transfer_observer.h" #include "brave/components/brave_ads/core/public/units/ad_info.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace base { class Time; @@ -72,7 +72,7 @@ class Transfer final : public TabManagerObserver { Timer timer_; - absl::optional last_clicked_ad_; + std::optional last_clicked_ad_; base::WeakPtrFactory weak_factory_{this}; }; diff --git a/components/brave_ads/core/internal/units/inline_content_ad/inline_content_ad_handler.cc b/components/brave_ads/core/internal/units/inline_content_ad/inline_content_ad_handler.cc index 8d73b8a6e98..c63b3ffb117 100644 --- a/components/brave_ads/core/internal/units/inline_content_ad/inline_content_ad_handler.cc +++ b/components/brave_ads/core/internal/units/inline_content_ad/inline_content_ad_handler.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/units/inline_content_ad/inline_content_ad_handler.h" +#include #include #include "base/check.h" @@ -36,7 +37,7 @@ void FireServedEventCallback( const std::string& /*placement_id*/, const mojom::InlineContentAdEventType /*event_type*/) { if (!success) { - return std::move(callback).Run(dimensions, /*ad=*/absl::nullopt); + return std::move(callback).Run(dimensions, /*ad=*/std::nullopt); } std::move(callback).Run(dimensions, ad); @@ -72,7 +73,7 @@ void InlineContentAdHandler::MaybeServe( const std::string& dimensions, MaybeServeInlineContentAdCallback callback) { if (!UserHasOptedInToBraveNewsAds()) { - return std::move(callback).Run(dimensions, /*ad=*/absl::nullopt); + return std::move(callback).Run(dimensions, /*ad=*/std::nullopt); } serving_.MaybeServeAd( @@ -109,7 +110,7 @@ void InlineContentAdHandler::TriggerEvent( void InlineContentAdHandler::MaybeServeCallback( MaybeServeInlineContentAdCallback callback, const std::string& dimensions, - const absl::optional& ad) { + const std::optional& ad) { if (!ad) { return std::move(callback).Run(dimensions, ad); } diff --git a/components/brave_ads/core/internal/units/inline_content_ad/inline_content_ad_handler.h b/components/brave_ads/core/internal/units/inline_content_ad/inline_content_ad_handler.h index 4aeca455dfa..2469d82c831 100644 --- a/components/brave_ads/core/internal/units/inline_content_ad/inline_content_ad_handler.h +++ b/components/brave_ads/core/internal/units/inline_content_ad/inline_content_ad_handler.h @@ -8,6 +8,7 @@ #include #include +#include #include #include @@ -20,7 +21,6 @@ #include "brave/components/brave_ads/core/internal/user/user_interaction/ad_events/inline_content_ads/inline_content_ad_event_handler_delegate.h" #include "brave/components/brave_ads/core/mojom/brave_ads.mojom-shared.h" #include "brave/components/brave_ads/core/public/ads_callback.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -59,7 +59,7 @@ class InlineContentAdHandler final : public InlineContentAdEventHandlerDelegate, private: void MaybeServeCallback(MaybeServeInlineContentAdCallback callback, const std::string& dimensions, - const absl::optional& ad); + const std::optional& ad); void CacheAdPlacement(int32_t tab_id, const InlineContentAdInfo& ad); void PurgeOrphanedCachedAdPlacements(int32_t tab_id); diff --git a/components/brave_ads/core/internal/units/inline_content_ad/inline_content_ad_test.cc b/components/brave_ads/core/internal/units/inline_content_ad/inline_content_ad_test.cc index 3938c8a5ab2..c6abc000fb4 100644 --- a/components/brave_ads/core/internal/units/inline_content_ad/inline_content_ad_test.cc +++ b/components/brave_ads/core/internal/units/inline_content_ad/inline_content_ad_test.cc @@ -3,6 +3,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include + #include "base/test/mock_callback.h" #include "brave/components/brave_ads/core/internal/analytics/p2a/opportunities/p2a_opportunity_util.h" #include "brave/components/brave_ads/core/internal/catalog/catalog_url_request_builder_util.h" @@ -16,7 +18,6 @@ #include "brave/components/brave_ads/core/public/units/ad_type.h" #include "brave/components/brave_ads/core/public/units/inline_content_ad/inline_content_ad_info.h" #include "net/http/http_status_code.h" -#include "third_party/abseil-cpp/absl/types/optional.h" // npm run test -- brave_unit_tests --filter=BraveAds* @@ -77,7 +78,7 @@ TEST_F(BraveAdsInlineContentAdIntegrationTest, ServeAd) { AdType::kInlineContentAd, /*segments=*/{}))); base::MockCallback callback; - EXPECT_CALL(callback, Run(kDimensions, ::testing::Ne(absl::nullopt))); + EXPECT_CALL(callback, Run(kDimensions, ::testing::Ne(std::nullopt))); GetAds().MaybeServeInlineContentAd(kDimensions, callback.Get()); } @@ -87,7 +88,7 @@ TEST_F(BraveAdsInlineContentAdIntegrationTest, EXPECT_CALL(ads_client_mock_, RecordP2AEvents).Times(0); base::MockCallback callback; - EXPECT_CALL(callback, Run(kDimensions, /*ad=*/::testing::Eq(absl::nullopt))); + EXPECT_CALL(callback, Run(kDimensions, /*ad=*/::testing::Eq(std::nullopt))); GetAds().MaybeServeInlineContentAd(kDimensions, callback.Get()); } @@ -102,7 +103,7 @@ TEST_F(BraveAdsInlineContentAdIntegrationTest, EXPECT_CALL(ads_client_mock_, RecordP2AEvents).Times(0); base::MockCallback callback; - EXPECT_CALL(callback, Run(kDimensions, /*ad=*/::testing::Eq(absl::nullopt))); + EXPECT_CALL(callback, Run(kDimensions, /*ad=*/::testing::Eq(std::nullopt))); GetAds().MaybeServeInlineContentAd(kDimensions, callback.Get()); } @@ -113,7 +114,7 @@ TEST_F(BraveAdsInlineContentAdIntegrationTest, TriggerViewedEvent) { base::MockCallback callback; EXPECT_CALL(callback, Run) .WillOnce([=](const std::string& dimensions, - const absl::optional& ad) { + const std::optional& ad) { ASSERT_EQ(kDimensions, dimensions); ASSERT_TRUE(ad); ASSERT_TRUE(ad->IsValid()); @@ -134,7 +135,7 @@ TEST_F(BraveAdsInlineContentAdIntegrationTest, TriggerClickedEvent) { base::MockCallback callback; EXPECT_CALL(callback, Run) .WillOnce([=](const std::string& dimensions, - const absl::optional& ad) { + const std::optional& ad) { ASSERT_EQ(kDimensions, dimensions); ASSERT_TRUE(ad); ASSERT_TRUE(ad->IsValid()); @@ -160,7 +161,7 @@ TEST_F(BraveAdsInlineContentAdIntegrationTest, base::MockCallback callback; EXPECT_CALL(callback, Run) .WillOnce([=](const std::string& dimensions, - const absl::optional& ad) { + const std::optional& ad) { ASSERT_EQ(kDimensions, dimensions); ASSERT_TRUE(ad); ASSERT_TRUE(ad->IsValid()); diff --git a/components/brave_ads/core/internal/units/new_tab_page_ad/new_tab_page_ad_handler.cc b/components/brave_ads/core/internal/units/new_tab_page_ad/new_tab_page_ad_handler.cc index 69c44fbf34e..1fd8778f916 100644 --- a/components/brave_ads/core/internal/units/new_tab_page_ad/new_tab_page_ad_handler.cc +++ b/components/brave_ads/core/internal/units/new_tab_page_ad/new_tab_page_ad_handler.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/units/new_tab_page_ad/new_tab_page_ad_handler.h" +#include #include #include "base/check.h" @@ -35,7 +36,7 @@ void FireServedEventCallback( const std::string& /*placement_id*/, const mojom::NewTabPageAdEventType /*event_type*/) { if (!success) { - return std::move(callback).Run(/*ad=*/absl::nullopt); + return std::move(callback).Run(/*ad=*/std::nullopt); } std::move(callback).Run(ad); @@ -66,12 +67,12 @@ NewTabPageAdHandler::~NewTabPageAdHandler() = default; void NewTabPageAdHandler::MaybeServe(MaybeServeNewTabPageAdCallback callback) { if (!UserHasOptedInToNewTabPageAds()) { - return std::move(callback).Run(/*ad=*/absl::nullopt); + return std::move(callback).Run(/*ad=*/std::nullopt); } if (!ShouldAlwaysTriggerNewTabPageAdEvents() && !UserHasJoinedBraveRewards()) { - return std::move(callback).Run(/*ad=*/absl::nullopt); + return std::move(callback).Run(/*ad=*/std::nullopt); } serving_.MaybeServeAd(base::BindOnce(&NewTabPageAdHandler::MaybeServeCallback, @@ -121,7 +122,7 @@ void NewTabPageAdHandler::TriggerEvent( void NewTabPageAdHandler::MaybeServeCallback( MaybeServeNewTabPageAdCallback callback, - const absl::optional& ad) { + const std::optional& ad) { if (!ad) { return std::move(callback).Run(ad); } diff --git a/components/brave_ads/core/internal/units/new_tab_page_ad/new_tab_page_ad_handler.h b/components/brave_ads/core/internal/units/new_tab_page_ad/new_tab_page_ad_handler.h index 9f34146b6e5..dbf7db546cf 100644 --- a/components/brave_ads/core/internal/units/new_tab_page_ad/new_tab_page_ad_handler.h +++ b/components/brave_ads/core/internal/units/new_tab_page_ad/new_tab_page_ad_handler.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_UNITS_NEW_TAB_PAGE_AD_NEW_TAB_PAGE_AD_HANDLER_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_UNITS_NEW_TAB_PAGE_AD_NEW_TAB_PAGE_AD_HANDLER_H_ +#include #include #include "base/memory/raw_ref.h" @@ -16,7 +17,6 @@ #include "brave/components/brave_ads/core/internal/user/user_interaction/ad_events/new_tab_page_ads/new_tab_page_ad_event_handler_delegate.h" #include "brave/components/brave_ads/core/mojom/brave_ads.mojom-shared.h" #include "brave/components/brave_ads/core/public/ads_callback.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -51,7 +51,7 @@ class NewTabPageAdHandler final : public NewTabPageAdEventHandlerDelegate, private: void MaybeServeCallback(MaybeServeNewTabPageAdCallback callback, - const absl::optional& ad); + const std::optional& ad); void TriggerServedEventCallback(const std::string& creative_instance_id, TriggerAdEventCallback callback, diff --git a/components/brave_ads/core/internal/units/new_tab_page_ad/new_tab_page_ad_test.cc b/components/brave_ads/core/internal/units/new_tab_page_ad/new_tab_page_ad_test.cc index 1d87ad3c7f1..897d52fae0d 100644 --- a/components/brave_ads/core/internal/units/new_tab_page_ad/new_tab_page_ad_test.cc +++ b/components/brave_ads/core/internal/units/new_tab_page_ad/new_tab_page_ad_test.cc @@ -3,6 +3,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include + #include "base/test/mock_callback.h" #include "base/test/scoped_feature_list.h" #include "brave/components/brave_ads/core/internal/analytics/p2a/opportunities/p2a_opportunity_util.h" @@ -17,7 +19,6 @@ #include "brave/components/brave_ads/core/public/units/ad_type.h" #include "brave/components/brave_ads/core/public/units/new_tab_page_ad/new_tab_page_ad_info.h" #include "net/http/http_status_code.h" -#include "third_party/abseil-cpp/absl/types/optional.h" // npm run test -- brave_unit_tests --filter=BraveAds* @@ -69,7 +70,7 @@ TEST_F(BraveAdsNewTabPageAdIntegrationTest, ServeAd) { AdType::kNewTabPageAd, /*segments=*/{}))); base::MockCallback callback; - EXPECT_CALL(callback, Run(::testing::Ne(absl::nullopt))); + EXPECT_CALL(callback, Run(::testing::Ne(std::nullopt))); GetAds().MaybeServeNewTabPageAd(callback.Get()); } @@ -83,7 +84,7 @@ TEST_F(BraveAdsNewTabPageAdIntegrationTest, EXPECT_CALL(ads_client_mock_, RecordP2AEvents).Times(0); base::MockCallback callback; - EXPECT_CALL(callback, Run(/*ad=*/::testing::Eq(absl::nullopt))); + EXPECT_CALL(callback, Run(/*ad=*/::testing::Eq(std::nullopt))); GetAds().MaybeServeNewTabPageAd(callback.Get()); } @@ -101,7 +102,7 @@ TEST_F(BraveAdsNewTabPageAdIntegrationTest, EXPECT_CALL(ads_client_mock_, RecordP2AEvents).Times(0); base::MockCallback callback; - EXPECT_CALL(callback, Run(::testing::Eq(absl::nullopt))); + EXPECT_CALL(callback, Run(::testing::Eq(std::nullopt))); GetAds().MaybeServeNewTabPageAd(callback.Get()); } @@ -117,7 +118,7 @@ TEST_F( EXPECT_CALL(ads_client_mock_, RecordP2AEvents).Times(0); base::MockCallback callback; - EXPECT_CALL(callback, Run(::testing::Eq(absl::nullopt))); + EXPECT_CALL(callback, Run(::testing::Eq(std::nullopt))); GetAds().MaybeServeNewTabPageAd(callback.Get()); } @@ -130,7 +131,7 @@ TEST_F(BraveAdsNewTabPageAdIntegrationTest, TriggerViewedEvent) { base::MockCallback callback; EXPECT_CALL(callback, Run) - .WillOnce([=](const absl::optional& ad) { + .WillOnce([=](const std::optional& ad) { ASSERT_TRUE(ad); ASSERT_TRUE(ad->IsValid()); @@ -178,7 +179,7 @@ TEST_F(BraveAdsNewTabPageAdIntegrationTest, TriggerClickedEvent) { base::MockCallback callback; EXPECT_CALL(callback, Run) - .WillOnce([=](const absl::optional& ad) { + .WillOnce([=](const std::optional& ad) { ASSERT_TRUE(ad); ASSERT_TRUE(ad->IsValid()); @@ -242,7 +243,7 @@ TEST_F(BraveAdsNewTabPageAdIntegrationTest, base::MockCallback callback; EXPECT_CALL(callback, Run) - .WillOnce([=](const absl::optional& ad) { + .WillOnce([=](const std::optional& ad) { ASSERT_TRUE(ad); ASSERT_TRUE(ad->IsValid()); diff --git a/components/brave_ads/core/internal/units/new_tab_page_ad/new_tab_page_ad_value_util.cc b/components/brave_ads/core/internal/units/new_tab_page_ad/new_tab_page_ad_value_util.cc index fcfee3a00d0..d65647d3643 100644 --- a/components/brave_ads/core/internal/units/new_tab_page_ad/new_tab_page_ad_value_util.cc +++ b/components/brave_ads/core/internal/units/new_tab_page_ad/new_tab_page_ad_value_util.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/public/units/new_tab_page_ad/new_tab_page_ad_value_util.h" +#include #include #include @@ -114,13 +115,13 @@ NewTabPageAdInfo NewTabPageAdFromValue(const base::Value::Dict& dict) { continue; } - const absl::optional focal_point_x = + const std::optional focal_point_x = focal_point_dict->FindInt(kNewTabPageAdFocalPointXKey); if (!focal_point_x) { continue; } - const absl::optional focal_point_y = + const std::optional focal_point_y = focal_point_dict->FindInt(kNewTabPageAdFocalPointYKey); if (!focal_point_y) { continue; diff --git a/components/brave_ads/core/internal/user/user_attention/user_activity/page_transition_util.cc b/components/brave_ads/core/internal/user/user_attention/user_activity/page_transition_util.cc index 3236e015d2d..3e61c352390 100644 --- a/components/brave_ads/core/internal/user/user_attention/user_activity/page_transition_util.cc +++ b/components/brave_ads/core/internal/user/user_attention/user_activity/page_transition_util.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/user/user_attention/user_activity/page_transition_util.h" +#include + namespace brave_ads { namespace { @@ -41,7 +43,7 @@ bool DidTransitionFromExternalApplication(const PageTransitionType type) { return PageTransitionGetQualifier(type) == kPageTransitionFromAPI; } -absl::optional ToUserActivityEventType( +std::optional ToUserActivityEventType( const PageTransitionType type) { const PageTransitionType core_value = PageTransitionGetCoreValue(type); @@ -79,7 +81,7 @@ absl::optional ToUserActivityEventType( } default: { - return absl::nullopt; + return std::nullopt; } } } diff --git a/components/brave_ads/core/internal/user/user_attention/user_activity/page_transition_util.h b/components/brave_ads/core/internal/user/user_attention/user_activity/page_transition_util.h index a87412b44ba..03b86bd3748 100644 --- a/components/brave_ads/core/internal/user/user_attention/user_activity/page_transition_util.h +++ b/components/brave_ads/core/internal/user/user_attention/user_activity/page_transition_util.h @@ -6,9 +6,10 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_USER_USER_ATTENTION_USER_ACTIVITY_PAGE_TRANSITION_UTIL_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_USER_USER_ATTENTION_USER_ACTIVITY_PAGE_TRANSITION_UTIL_H_ +#include + #include "brave/components/brave_ads/core/internal/user/user_attention/user_activity/user_activity_event_types.h" #include "brave/components/brave_ads/core/public/user/user_attention/user_activity/page_transition_types.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -22,7 +23,7 @@ bool DidNavigateToHomePage(PageTransitionType type); bool DidTransitionFromExternalApplication(PageTransitionType type); -absl::optional ToUserActivityEventType( +std::optional ToUserActivityEventType( PageTransitionType type); } // namespace brave_ads diff --git a/components/brave_ads/core/internal/user/user_attention/user_activity/user_activity_manager.cc b/components/brave_ads/core/internal/user/user_attention/user_activity/user_activity_manager.cc index 4a1e374fd26..4b79f417f32 100644 --- a/components/brave_ads/core/internal/user/user_attention/user_activity/user_activity_manager.cc +++ b/components/brave_ads/core/internal/user/user_attention/user_activity/user_activity_manager.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_ads/core/internal/user/user_attention/user_activity/user_activity_manager.h" +#include + #include "base/ranges/algorithm.h" #include "base/strings/string_number_conversions.h" #include "base/time/time.h" @@ -20,7 +22,6 @@ #include "brave/components/brave_ads/core/internal/user/user_attention/user_activity/user_activity_scoring.h" #include "brave/components/brave_ads/core/internal/user/user_attention/user_activity/user_activity_trigger_info.h" #include "brave/components/brave_ads/core/internal/user/user_attention/user_activity/user_activity_util.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -118,7 +119,7 @@ void UserActivityManager::RecordEventForPageTransition( RecordEvent(UserActivityEventType::kOpenedLinkFromExternalApplication); } - const absl::optional event_type = + const std::optional event_type = ToUserActivityEventType(type); if (!event_type) { return; diff --git a/components/brave_ads/core/internal/user/user_interaction/ad_events/notification_ads/notification_ad_event_handler.cc b/components/brave_ads/core/internal/user/user_interaction/ad_events/notification_ads/notification_ad_event_handler.cc index 4931e2948ce..9f8cf4be925 100644 --- a/components/brave_ads/core/internal/user/user_interaction/ad_events/notification_ads/notification_ad_event_handler.cc +++ b/components/brave_ads/core/internal/user/user_interaction/ad_events/notification_ads/notification_ad_event_handler.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/user/user_interaction/ad_events/notification_ads/notification_ad_event_handler.h" +#include #include #include "base/check.h" @@ -12,7 +13,6 @@ #include "brave/components/brave_ads/core/internal/creatives/notification_ads/notification_ad_manager.h" #include "brave/components/brave_ads/core/internal/user/user_interaction/ad_events/notification_ads/notification_ad_event_factory.h" #include "brave/components/brave_ads/core/public/units/notification_ad/notification_ad_info.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -29,7 +29,7 @@ void NotificationAdEventHandler::FireEvent( CHECK(!placement_id.empty()); CHECK(mojom::IsKnownEnumValue(event_type)); - const absl::optional ad = + const std::optional ad = NotificationAdManager::GetInstance().MaybeGetForPlacementId(placement_id); if (!ad) { BLOG(1, "Failed to fire notification ad event due to missing placement id " diff --git a/components/brave_ads/core/internal/user/user_interaction/ad_events/search_result_ads/search_result_ad_event_handler.cc b/components/brave_ads/core/internal/user/user_interaction/ad_events/search_result_ads/search_result_ad_event_handler.cc index 3c29abd46fe..a1309158d42 100644 --- a/components/brave_ads/core/internal/user/user_interaction/ad_events/search_result_ads/search_result_ad_event_handler.cc +++ b/components/brave_ads/core/internal/user/user_interaction/ad_events/search_result_ads/search_result_ad_event_handler.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/user/user_interaction/ad_events/search_result_ads/search_result_ad_event_handler.h" +#include #include #include "base/check.h" @@ -144,7 +145,7 @@ void SearchResultAdEventHandler::SaveCreativeSetConversion( CHECK(ad_mojom); CreativeSetConversionList creative_set_conversions; - if (const absl::optional creative_set_conversion = + if (const std::optional creative_set_conversion = BuildCreativeSetConversion(ad_mojom)) { if (creative_set_conversion->IsValid()) { creative_set_conversions.push_back(*creative_set_conversion); diff --git a/components/brave_ads/core/internal/user/user_interaction/ad_events/search_result_ads/search_result_ad_event_handler_unittest.cc b/components/brave_ads/core/internal/user/user_interaction/ad_events/search_result_ads/search_result_ad_event_handler_unittest.cc index 425c60056a5..b5e8edfff86 100644 --- a/components/brave_ads/core/internal/user/user_interaction/ad_events/search_result_ads/search_result_ad_event_handler_unittest.cc +++ b/components/brave_ads/core/internal/user/user_interaction/ad_events/search_result_ads/search_result_ad_event_handler_unittest.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_ads/core/internal/user/user_interaction/ad_events/search_result_ads/search_result_ad_event_handler.h" +#include #include #include #include @@ -36,7 +37,7 @@ void ExpectDepositExistsForCreativeInstanceId( const std::string& creative_instance_id) { base::MockCallback callback; EXPECT_CALL(callback, - Run(/*success=*/true, /*deposit=*/::testing::Ne(absl::nullopt))); + Run(/*success=*/true, /*deposit=*/::testing::Ne(std::nullopt))); const database::table::Deposits database_table; database_table.GetForCreativeInstanceId(creative_instance_id, callback.Get()); } diff --git a/components/brave_ads/core/public/ads.h b/components/brave_ads/core/public/ads.h index 0e6484966b3..e232935b63a 100644 --- a/components/brave_ads/core/public/ads.h +++ b/components/brave_ads/core/public/ads.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_PUBLIC_ADS_H_ #include +#include #include #include "brave/components/brave_ads/core/mojom/brave_ads.mojom-forward.h" @@ -16,7 +17,6 @@ #include "brave/components/brave_ads/core/public/history/history_filter_types.h" #include "brave/components/brave_ads/core/public/history/history_item_info.h" #include "brave/components/brave_ads/core/public/history/history_sort_types.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace base { class Time; @@ -109,7 +109,7 @@ class ADS_EXPORT Ads { // Called to get the notification ad specified by `placement_id`. Returns // `NotificationAdInfo` containing the info of the ad. - virtual absl::optional MaybeGetNotificationAd( + virtual std::optional MaybeGetNotificationAd( const std::string& placement_id) = 0; // Called when a user views or interacts with a notification ad or the ad diff --git a/components/brave_ads/core/public/ads_callback.h b/components/brave_ads/core/public/ads_callback.h index 5950d92a5dd..092df7d2a1c 100644 --- a/components/brave_ads/core/public/ads_callback.h +++ b/components/brave_ads/core/public/ads_callback.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_PUBLIC_ADS_CALLBACK_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_PUBLIC_ADS_CALLBACK_H_ +#include #include #include "base/functional/callback.h" @@ -13,7 +14,6 @@ #include "brave/components/brave_ads/core/mojom/brave_ads.mojom-forward.h" #include "brave/components/brave_ads/core/public/units/inline_content_ad/inline_content_ad_info.h" #include "brave/components/brave_ads/core/public/units/new_tab_page_ad/new_tab_page_ad_info.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -21,11 +21,11 @@ using InitializeCallback = base::OnceCallback; using ShutdownCallback = base::OnceCallback; using MaybeServeNewTabPageAdCallback = - base::OnceCallback& ad)>; + base::OnceCallback& ad)>; using MaybeServeInlineContentAdCallback = base::OnceCallback& ad)>; + const std::optional& ad)>; using TriggerAdEventCallback = base::OnceCallback; @@ -33,7 +33,7 @@ using GetStatementOfAccountsCallback = base::OnceCallback; using GetDiagnosticsCallback = - base::OnceCallback diagnostics)>; + base::OnceCallback diagnostics)>; using PurgeOrphanedAdEventsForTypeCallback = base::OnceCallback; diff --git a/components/brave_ads/core/public/client/ads_client.h b/components/brave_ads/core/public/client/ads_client.h index d8c3629a3ee..5c921605b19 100644 --- a/components/brave_ads/core/public/client/ads_client.h +++ b/components/brave_ads/core/public/client/ads_client.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_PUBLIC_CLIENT_ADS_CLIENT_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_PUBLIC_CLIENT_ADS_CLIENT_H_ +#include #include #include @@ -15,7 +16,6 @@ #include "brave/components/brave_ads/core/public/client/ads_client_callback.h" #include "brave/components/brave_ads/core/public/export.h" #include "brave/components/brave_federated/public/interfaces/brave_federated.mojom-forward.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_ads { @@ -137,7 +137,7 @@ class ADS_EXPORT AdsClient { // Get the value from the specified profile preference `path`. Returns the // default value if the path does not exist. - virtual absl::optional GetProfilePref( + virtual std::optional GetProfilePref( const std::string& path) = 0; // Update the value for the specified profile preference `path`. @@ -152,7 +152,7 @@ class ADS_EXPORT AdsClient { // Get the value from the specified local state preference `path`. Returns the // default value if the path does not exist. - virtual absl::optional GetLocalStatePref( + virtual std::optional GetLocalStatePref( const std::string& path) = 0; // Update the value for the specified local state preference `path`. diff --git a/components/brave_ads/core/public/client/ads_client_callback.h b/components/brave_ads/core/public/client/ads_client_callback.h index 400a9234d9d..8e72204983d 100644 --- a/components/brave_ads/core/public/client/ads_client_callback.h +++ b/components/brave_ads/core/public/client/ads_client_callback.h @@ -6,13 +6,13 @@ #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_PUBLIC_CLIENT_ADS_CLIENT_CALLBACK_H_ #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_PUBLIC_CLIENT_ADS_CLIENT_CALLBACK_H_ +#include #include #include #include "base/files/file.h" #include "base/functional/callback.h" #include "brave/components/brave_ads/core/mojom/brave_ads.mojom-forward.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h" namespace brave_ads { @@ -22,7 +22,7 @@ using ResultCallback = base::OnceCallback; using SaveCallback = base::OnceCallback; using LoadCallback = - base::OnceCallback& value)>; + base::OnceCallback& value)>; using LoadFileCallback = base::OnceCallback; diff --git a/components/brave_news/browser/brave_news_controller.cc b/components/brave_news/browser/brave_news_controller.cc index f9dda61bc0c..e55eadcb618 100644 --- a/components/brave_news/browser/brave_news_controller.cc +++ b/components/brave_news/browser/brave_news_controller.cc @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -50,7 +51,6 @@ #include "mojo/public/cpp/bindings/remote_set.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" namespace brave_news { namespace { @@ -307,7 +307,7 @@ void BraveNewsController::SubscribeToNewDirectFeed( // Verify the url points at a valid feed VLOG(1) << "SubscribeToNewDirectFeed: " << feed_url.spec(); if (!feed_url.is_valid()) { - std::move(callback).Run(false, false, absl::nullopt); + std::move(callback).Run(false, false, std::nullopt); return; } direct_feed_controller_.VerifyFeedUrl( @@ -319,13 +319,13 @@ void BraveNewsController::SubscribeToNewDirectFeed( VLOG(1) << "Is new feed valid? " << is_valid << " Title: " << feed_title; if (!is_valid) { - std::move(callback).Run(false, false, absl::nullopt); + std::move(callback).Run(false, false, std::nullopt); return; } if (!controller->direct_feed_controller_.AddDirectFeedPref( feed_url, feed_title)) { - std::move(callback).Run(true, true, absl::nullopt); + std::move(callback).Run(true, true, std::nullopt); return; } @@ -354,7 +354,7 @@ void BraveNewsController::SubscribeToNewDirectFeed( Publishers publishers) { std::move(callback).Run( true, false, - absl::optional(std::move(publishers))); + std::optional(std::move(publishers))); }, std::move(callback)), true); @@ -386,7 +386,7 @@ void BraveNewsController::GetImageData(const GURL& padded_image_url, // Validate VLOG(2) << "getimagedata " << padded_image_url.spec(); if (!padded_image_url.is_valid()) { - absl::optional> args; + std::optional> args; std::move(callback).Run(std::move(args)); return; } @@ -397,7 +397,7 @@ void BraveNewsController::GetImageData(const GURL& padded_image_url, const std::string ending = ".pad"; if (file_name.length() >= file_name.max_size() - 1 || file_name.length() <= ending.length()) { - absl::optional> args; + std::optional> args; std::move(callback).Run(std::move(args)); return; } @@ -420,7 +420,7 @@ void BraveNewsController::GetImageData(const GURL& padded_image_url, !brave::PrivateCdnHelper::GetInstance()->RemovePadding( &body_payload))) { // Byte padding removal failed - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(std::nullopt); return; } // Download (and optional unpadding) was successful, @@ -440,7 +440,7 @@ void BraveNewsController::GetFavIconData(const std::string& publisher_id, // If the publisher doesn't exist, there's nothing we can do. const auto& it = publishers.find(publisher_id); if (it == publishers.end()) { - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(std::nullopt); return; } @@ -464,7 +464,7 @@ void BraveNewsController::GetFavIconData(const std::string& publisher_id, [](GetFavIconDataCallback callback, const favicon_base::FaviconRawBitmapResult& result) { if (!result.is_valid()) { - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(std::nullopt); return; } @@ -566,7 +566,7 @@ void BraveNewsController::GetDisplayAd(GetDisplayAdCallback callback) { } auto on_ad_received = base::BindOnce( [](GetDisplayAdCallback callback, const std::string& dimensions, - absl::optional ad_data) { + std::optional ad_data) { if (!ad_data) { VLOG(1) << "GetDisplayAd: no ad"; std::move(callback).Run(nullptr); diff --git a/components/brave_news/browser/combined_feed_parsing.cc b/components/brave_news/browser/combined_feed_parsing.cc index b57c4cf22fa..68e84bb9751 100644 --- a/components/brave_news/browser/combined_feed_parsing.cc +++ b/components/brave_news/browser/combined_feed_parsing.cc @@ -19,7 +19,6 @@ #include "brave/components/brave_news/common/brave_news.mojom-forward.h" #include "brave/components/brave_news/common/brave_news.mojom-shared.h" #include "brave/components/brave_news/common/brave_news.mojom.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/base/l10n/time_format.h" #include "url/gurl.h" diff --git a/components/brave_news/browser/direct_feed_controller.cc b/components/brave_news/browser/direct_feed_controller.cc index da27b5fdcef..39c30a31680 100644 --- a/components/brave_news/browser/direct_feed_controller.cc +++ b/components/brave_news/browser/direct_feed_controller.cc @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -52,7 +53,7 @@ DirectFeedController::~DirectFeedController() = default; bool DirectFeedController::AddDirectFeedPref( const GURL& feed_url, const std::string& title, - const absl::optional& id) { + const std::optional& id) { // Check if feed url already exists const auto& existing_feeds = prefs_->GetDict(prefs::kBraveNewsDirectFeeds); for (const auto&& [key, value] : existing_feeds) { diff --git a/components/brave_news/browser/direct_feed_controller.h b/components/brave_news/browser/direct_feed_controller.h index 630e8fa317d..d12e7f92f26 100644 --- a/components/brave_news/browser/direct_feed_controller.h +++ b/components/brave_news/browser/direct_feed_controller.h @@ -8,6 +8,7 @@ #include #include +#include #include #include #include @@ -17,7 +18,6 @@ #include "base/memory/scoped_refptr.h" #include "brave/components/brave_news/browser/direct_feed_fetcher.h" #include "brave/components/brave_news/common/brave_news.mojom.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h" class PrefService; @@ -42,7 +42,7 @@ class DirectFeedController { // true otherwise. bool AddDirectFeedPref(const GURL& feed_url, const std::string& title, - const absl::optional& id = absl::nullopt); + const std::optional& id = std::nullopt); // Removes a direct feed pref void RemoveDirectFeedPref(const std::string& publisher_id); diff --git a/components/brave_news/browser/feed_building.cc b/components/brave_news/browser/feed_building.cc index 00229d64867..4fb9e73584d 100644 --- a/components/brave_news/browser/feed_building.cc +++ b/components/brave_news/browser/feed_building.cc @@ -32,7 +32,6 @@ #include "brave/components/brave_news/common/features.h" #include "components/history/core/browser/history_service.h" #include "components/prefs/pref_service.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h" namespace brave_news { diff --git a/components/brave_news/browser/feed_building_unittest.cc b/components/brave_news/browser/feed_building_unittest.cc index 80bab2531c4..9cba31b5608 100644 --- a/components/brave_news/browser/feed_building_unittest.cc +++ b/components/brave_news/browser/feed_building_unittest.cc @@ -3,9 +3,12 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this file, // You can obtain one at https://mozilla.org/MPL/2.0/. +#include "brave/components/brave_news/browser/feed_building.h" + #include #include #include +#include #include #include #include @@ -18,13 +21,11 @@ #include "base/values.h" #include "brave/components/brave_news/browser/channels_controller.h" #include "brave/components/brave_news/browser/combined_feed_parsing.h" -#include "brave/components/brave_news/browser/feed_building.h" #include "brave/components/brave_news/common/brave_news.mojom-shared.h" #include "brave/components/brave_news/common/brave_news.mojom.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/browser_task_environment.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/mojom/url.mojom.h" namespace brave_news { @@ -129,26 +130,26 @@ void PopulatePublishers(Publishers* publisher_list) { auto publisher1 = mojom::Publisher::New( "111", mojom::PublisherType::COMBINED_SOURCE, "First Publisher", "Top News", true, CreateLocales({"en_US"}, {"Top News", "Top Sources"}), - GURL("https://www.example.com"), absl::nullopt, absl::nullopt, - absl::nullopt, GURL("https://first-publisher.com/feed.xml"), + GURL("https://www.example.com"), std::nullopt, std::nullopt, std::nullopt, + GURL("https://first-publisher.com/feed.xml"), mojom::UserEnabled::NOT_MODIFIED); auto publisher2 = mojom::Publisher::New( "222", mojom::PublisherType::COMBINED_SOURCE, "Second Publisher", "Top News", true, CreateLocales({"en_US"}, {"Top News", "Top Sources"}), - GURL("https://www.example.com"), absl::nullopt, absl::nullopt, - absl::nullopt, GURL("https://second-publisher.com/feed.xml"), + GURL("https://www.example.com"), std::nullopt, std::nullopt, std::nullopt, + GURL("https://second-publisher.com/feed.xml"), mojom::UserEnabled::NOT_MODIFIED); auto publisher3 = mojom::Publisher::New( "333", mojom::PublisherType::COMBINED_SOURCE, "Third Publisher", "Top News", true, CreateLocales({"en_US"}, {"Top News"}), - GURL("https://www.example.com"), absl::nullopt, absl::nullopt, - absl::nullopt, GURL("https://third-publisher.com/feed.xml"), + GURL("https://www.example.com"), std::nullopt, std::nullopt, std::nullopt, + GURL("https://third-publisher.com/feed.xml"), mojom::UserEnabled::NOT_MODIFIED); auto publisher4 = mojom::Publisher::New( "444", mojom::PublisherType::COMBINED_SOURCE, "Fourth Publisher", "f", false, CreateLocales({}, {}), GURL("https://fourth.example.com"), - absl::nullopt, absl::nullopt, absl::nullopt, + std::nullopt, std::nullopt, std::nullopt, GURL("https://fourth-publisher.com/feed.xml"), mojom::UserEnabled::ENABLED); diff --git a/components/brave_news/browser/feed_v2_builder.cc b/components/brave_news/browser/feed_v2_builder.cc index 53f83a2816a..ed66b8898b8 100644 --- a/components/brave_news/browser/feed_v2_builder.cc +++ b/components/brave_news/browser/feed_v2_builder.cc @@ -4,12 +4,14 @@ // You can obtain one at https://mozilla.org/MPL/2.0/. #include "brave/components/brave_news/browser/feed_v2_builder.h" + #include #include #include #include #include +#include #include #include #include @@ -40,7 +42,6 @@ #include "components/prefs/pref_service.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "services/network/public/cpp/shared_url_loader_factory.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_news { @@ -859,7 +860,7 @@ void FeedV2Builder::NotifyUpdateCompleted() { // If we have a |next_update_| then request an update with that data. current_update_ = std::move(next_update_); - next_update_ = absl::nullopt; + next_update_ = std::nullopt; if (current_update_) { UpdateData(current_update_->settings); diff --git a/components/brave_news/browser/feed_v2_builder.h b/components/brave_news/browser/feed_v2_builder.h index f30e8813b61..2f712826f31 100644 --- a/components/brave_news/browser/feed_v2_builder.h +++ b/components/brave_news/browser/feed_v2_builder.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_NEWS_BROWSER_FEED_V2_BUILDER_H_ #include +#include #include #include @@ -27,7 +28,6 @@ #include "mojo/public/cpp/bindings/pending_remote.h" #include "mojo/public/cpp/bindings/remote_set.h" #include "services/network/public/cpp/shared_url_loader_factory.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_news { @@ -145,8 +145,8 @@ class FeedV2Builder { std::vector suggested_publisher_ids_; TopicsResult topics_; - absl::optional current_update_; - absl::optional next_update_; + std::optional current_update_; + std::optional next_update_; mojo::RemoteSet listeners_; diff --git a/components/brave_news/browser/locales_helper.cc b/components/brave_news/browser/locales_helper.cc index a4d7cb3f7bd..7b1acdd2ba6 100644 --- a/components/brave_news/browser/locales_helper.cc +++ b/components/brave_news/browser/locales_helper.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_news/browser/locales_helper.h" +#include #include #include #include @@ -24,7 +25,6 @@ #include "brave/components/brave_news/common/brave_news.mojom.h" #include "brave/components/brave_news/common/features.h" #include "brave/components/l10n/common/locale_util.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_news { namespace { @@ -57,7 +57,7 @@ bool HasAnyLocale(const base::flat_set& locales, }); } -absl::optional GetBestMissingLocale( +std::optional GetBestMissingLocale( const base::flat_set& locales, const std::vector publishers) { base::flat_map missing_locale_counts; @@ -116,7 +116,7 @@ base::flat_set GetMinimalLocalesSet( // While there are publishers which won't be included in the feed, add a new // locale and recalculate what's missing. - absl::optional best_missing_locale; + std::optional best_missing_locale; while ((best_missing_locale = GetBestMissingLocale(result, subscribed_publishers))) { result.insert(best_missing_locale.value()); diff --git a/components/brave_news/browser/publishers_controller.cc b/components/brave_news/browser/publishers_controller.cc index b9aec87f7a6..9edf7f6efc5 100644 --- a/components/brave_news/browser/publishers_controller.cc +++ b/components/brave_news/browser/publishers_controller.cc @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -199,7 +200,7 @@ void PublishersController::EnsurePublishersIsUpdating() { [](PublishersController* controller, api_request_helper::APIRequestResult api_request_result) { // TODO(petemill): handle bad status or response - absl::optional publisher_list = + std::optional publisher_list = ParseCombinedPublisherList(api_request_result.value_body()); if (!publisher_list) { return; diff --git a/components/brave_news/browser/publishers_parsing.cc b/components/brave_news/browser/publishers_parsing.cc index 438256252a3..ce1d4743ba3 100644 --- a/components/brave_news/browser/publishers_parsing.cc +++ b/components/brave_news/browser/publishers_parsing.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_news/browser/publishers_parsing.h" +#include #include #include #include @@ -14,16 +15,14 @@ #include "brave/components/brave_news/api/publisher.h" #include "brave/components/brave_news/common/brave_news.mojom.h" #include "brave/components/brave_news/common/pref_names.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h" namespace brave_news { -absl::optional ParseCombinedPublisherList( - const base::Value& value) { +std::optional ParseCombinedPublisherList(const base::Value& value) { if (!value.is_list()) { LOG(ERROR) << "Publisher data expected to be a list"; - return absl::nullopt; + return std::nullopt; } Publishers result; @@ -33,7 +32,7 @@ absl::optional ParseCombinedPublisherList( if (!parsed_publisher.has_value()) { LOG(ERROR) << "Invalid Brave Publisher data. error=" << parsed_publisher.error(); - return absl::nullopt; + return std::nullopt; } auto& entry = *parsed_publisher; diff --git a/components/brave_news/browser/publishers_parsing.h b/components/brave_news/browser/publishers_parsing.h index e03e25018a5..05538c7ecdb 100644 --- a/components/brave_news/browser/publishers_parsing.h +++ b/components/brave_news/browser/publishers_parsing.h @@ -6,17 +6,17 @@ #ifndef BRAVE_COMPONENTS_BRAVE_NEWS_BROWSER_PUBLISHERS_PARSING_H_ #define BRAVE_COMPONENTS_BRAVE_NEWS_BROWSER_PUBLISHERS_PARSING_H_ +#include #include #include #include "base/values.h" #include "brave/components/brave_news/browser/publishers_controller.h" #include "brave/components/brave_news/common/brave_news.mojom-forward.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_news { -absl::optional ParseCombinedPublisherList(const base::Value& value); +std::optional ParseCombinedPublisherList(const base::Value& value); void ParseDirectPublisherList(const base::Value::Dict& direct_feeds_pref_dict, std::vector* publishers); diff --git a/components/brave_news/browser/publishers_parsing_unittest.cc b/components/brave_news/browser/publishers_parsing_unittest.cc index f2f0ab17765..31ee6fd6397 100644 --- a/components/brave_news/browser/publishers_parsing_unittest.cc +++ b/components/brave_news/browser/publishers_parsing_unittest.cc @@ -3,13 +3,15 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this file, // You can obtain one at https://mozilla.org/MPL/2.0/. +#include "brave/components/brave_news/browser/publishers_parsing.h" + #include +#include #include #include #include "base/containers/flat_map.h" #include "base/test/values_test_util.h" -#include "brave/components/brave_news/browser/publishers_parsing.h" #include "brave/components/brave_news/common/brave_news.mojom-forward.h" #include "testing/gtest/include/gtest/gtest.h" @@ -45,7 +47,7 @@ TEST(BraveNewsPublisherParsing, ParsePublisherList) { } ] )"); - absl::optional publisher_list = + std::optional publisher_list = ParseCombinedPublisherList(base::test::ParseJson(json)); ASSERT_TRUE(publisher_list); ASSERT_EQ(publisher_list->size(), 3UL); @@ -95,7 +97,7 @@ TEST(BraveNewsPublisherParsing, PublisherListWithNoneValuesInOptionalFields) { } ] )"); - absl::optional publisher_list = + std::optional publisher_list = ParseCombinedPublisherList(base::test::ParseJson(json)); ASSERT_TRUE(publisher_list); ASSERT_EQ(publisher_list->size(), 3UL); diff --git a/components/brave_news/browser/suggestions_controller.cc b/components/brave_news/browser/suggestions_controller.cc index 87a24fb158b..b9cec8ade7b 100644 --- a/components/brave_news/browser/suggestions_controller.cc +++ b/components/brave_news/browser/suggestions_controller.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_news/browser/suggestions_controller.h" #include +#include #include #include #include @@ -105,7 +106,7 @@ double GetVisitWeighting(const mojom::PublisherPtr& publisher, SuggestionsController::PublisherSimilarities ParseSimilarityResponse( const std::string& json, const std::string& locale) { - absl::optional records_v = + std::optional records_v = base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS | base::JSONParserOptions::JSON_PARSE_RFC); if (!records_v) { diff --git a/components/brave_news/browser/unsupported_publisher_migrator.cc b/components/brave_news/browser/unsupported_publisher_migrator.cc index e761a6b9415..e8faf4a4dd6 100644 --- a/components/brave_news/browser/unsupported_publisher_migrator.cc +++ b/components/brave_news/browser/unsupported_publisher_migrator.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_news/browser/unsupported_publisher_migrator.h" #include +#include #include #include #include @@ -56,7 +57,7 @@ void UnsupportedPublisherMigrator::EnsureInitialized() { // can try and migrate the sources again next time the browser is // launched. if (result.Is2XXResponseCode()) { - absl::optional publishers = + std::optional publishers = ParseCombinedPublisherList(result.value_body()); if (publishers) { migrator->v1_api_publishers_ = std::move(*publishers); diff --git a/components/brave_perf_predictor/browser/named_third_party_registry.cc b/components/brave_perf_predictor/browser/named_third_party_registry.cc index db81cf0726c..d7eee5899e2 100644 --- a/components/brave_perf_predictor/browser/named_third_party_registry.cc +++ b/components/brave_perf_predictor/browser/named_third_party_registry.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_perf_predictor/browser/named_third_party_registry.h" +#include #include #include @@ -19,7 +20,6 @@ #include "brave/components/brave_perf_predictor/browser/bandwidth_linreg_parameters.h" #include "components/grit/brave_components_resources.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/base/resource/resource_bundle.h" #include "url/gurl.h" @@ -34,7 +34,7 @@ ParseMappings(const std::string_view entities, bool discard_irrelevant) { base::flat_map entity_by_root_domain; // Parse the JSON - absl::optional document = base::JSONReader::Read(entities); + std::optional document = base::JSONReader::Read(entities); if (!document || !document->is_list()) { LOG(ERROR) << "Cannot parse the third-party entities list"; return {}; @@ -126,16 +126,16 @@ void NamedThirdPartyRegistry::UpdateMappings( initialized_ = true; } -absl::optional NamedThirdPartyRegistry::GetThirdParty( +std::optional NamedThirdPartyRegistry::GetThirdParty( const std::string_view request_url) const { if (!IsInitialized()) { VLOG(2) << "Named Third Party Registry not initialized"; - return absl::nullopt; + return std::nullopt; } const GURL url(request_url); if (!url.is_valid()) - return absl::nullopt; + return std::nullopt; if (url.has_host()) { auto domain_entry = entity_by_domain_.find(url.host()); @@ -150,7 +150,7 @@ absl::optional NamedThirdPartyRegistry::GetThirdParty( return root_domain_entry->second; } - return absl::nullopt; + return std::nullopt; } NamedThirdPartyRegistry::NamedThirdPartyRegistry() = default; diff --git a/components/brave_perf_predictor/browser/named_third_party_registry.h b/components/brave_perf_predictor/browser/named_third_party_registry.h index 861d7daba10..5961e669cf6 100644 --- a/components/brave_perf_predictor/browser/named_third_party_registry.h +++ b/components/brave_perf_predictor/browser/named_third_party_registry.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_PERF_PREDICTOR_BROWSER_NAMED_THIRD_PARTY_REGISTRY_H_ #define BRAVE_COMPONENTS_BRAVE_PERF_PREDICTOR_BROWSER_NAMED_THIRD_PARTY_REGISTRY_H_ +#include #include #include #include @@ -34,8 +35,7 @@ class NamedThirdPartyRegistry : public KeyedService { bool LoadMappings(const std::string_view entities, bool discard_irrelevant); // Default initialization - asynchronously load from bundled resource void InitializeDefault(); - absl::optional GetThirdParty( - const std::string_view domain) const; + std::optional GetThirdParty(const std::string_view domain) const; private: bool IsInitialized() const { return initialized_; } diff --git a/components/brave_rewards/browser/publisher_utils.cc b/components/brave_rewards/browser/publisher_utils.cc index f0e1c539f2a..48f9de54cca 100644 --- a/components/brave_rewards/browser/publisher_utils.cc +++ b/components/brave_rewards/browser/publisher_utils.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_rewards/browser/publisher_utils.h" #include +#include #include "base/ranges/algorithm.h" #include "brave/components/ipfs/buildflags/buildflags.h" @@ -34,33 +35,33 @@ bool IsMediaPlatformURL(const GURL& url) { } // namespace -absl::optional GetPublisherIdFromURL(const GURL& url) { +std::optional GetPublisherIdFromURL(const GURL& url) { if (IsMediaPlatformURL(url)) { - return absl::nullopt; + return std::nullopt; } return GetPublisherDomainFromURL(url); } -absl::optional GetPublisherDomainFromURL(const GURL& url) { +std::optional GetPublisherDomainFromURL(const GURL& url) { #if BUILDFLAG(ENABLE_IPFS) if (url.SchemeIs(ipfs::kIPNSScheme)) { std::string domain = ipfs::GetRegistryDomainFromIPNS(url); if (domain.empty()) { - return absl::nullopt; + return std::nullopt; } return domain; } #endif if (!url.SchemeIsHTTPOrHTTPS()) { - return absl::nullopt; + return std::nullopt; } std::string domain = net::registry_controlled_domains::GetDomainAndRegistry( url, net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES); if (domain.empty()) { - return absl::nullopt; + return std::nullopt; } return domain; } diff --git a/components/brave_rewards/browser/publisher_utils.h b/components/brave_rewards/browser/publisher_utils.h index ecbea2c1f41..f248fe77f4b 100644 --- a/components/brave_rewards/browser/publisher_utils.h +++ b/components/brave_rewards/browser/publisher_utils.h @@ -6,9 +6,9 @@ #ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_BROWSER_PUBLISHER_UTILS_H_ #define BRAVE_COMPONENTS_BRAVE_REWARDS_BROWSER_PUBLISHER_UTILS_H_ +#include #include -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h" namespace brave_rewards { @@ -17,11 +17,11 @@ namespace brave_rewards { // the publisher ID cannot be statically determined from the URL. For example, // a `nullopt` will be returned if the URL points to a configured social media // platform where multiple publishers can be registered. -absl::optional GetPublisherIdFromURL(const GURL& url); +std::optional GetPublisherIdFromURL(const GURL& url); // Returns the publisher domain for the specified URL. For social media // platforms, the site domain will be returned (e.g "twitter.com"). -absl::optional GetPublisherDomainFromURL(const GURL& url); +std::optional GetPublisherDomainFromURL(const GURL& url); // Returns a value indicating whether content scripting is used to measure AC. bool IsAutoContributeHandledByContentScript(const GURL& url); diff --git a/components/brave_rewards/browser/publisher_utils_unittest.cc b/components/brave_rewards/browser/publisher_utils_unittest.cc index ae1403f2f21..db329b670fc 100644 --- a/components/brave_rewards/browser/publisher_utils_unittest.cc +++ b/components/brave_rewards/browser/publisher_utils_unittest.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_rewards/browser/publisher_utils.h" +#include #include #include "testing/gtest/include/gtest/gtest.h" @@ -14,7 +15,7 @@ namespace brave_rewards { class RewardsPublisherUtilsTest : public testing::Test { protected: - absl::optional GetPublisherId(const std::string& url) { + std::optional GetPublisherId(const std::string& url) { return GetPublisherIdFromURL(GURL(url)); } }; @@ -28,15 +29,15 @@ TEST_F(RewardsPublisherUtilsTest, GetPublisherIdFromURL) { EXPECT_EQ(GetPublisherId("https://brave.co.uk"), "brave.co.uk"); EXPECT_EQ(GetPublisherId("https://www.brave.co.uk"), "brave.co.uk"); - EXPECT_EQ(GetPublisherId("file:///a/b/c/"), absl::nullopt); - EXPECT_EQ(GetPublisherId("invalid-url"), absl::nullopt); + EXPECT_EQ(GetPublisherId("file:///a/b/c/"), std::nullopt); + EXPECT_EQ(GetPublisherId("invalid-url"), std::nullopt); - EXPECT_EQ(GetPublisherId("https://twitter.com/foo"), absl::nullopt); - EXPECT_EQ(GetPublisherId("https://github.com/foo"), absl::nullopt); - EXPECT_EQ(GetPublisherId("https://reddit.com/foo"), absl::nullopt); - EXPECT_EQ(GetPublisherId("https://youtube.com/foo"), absl::nullopt); - EXPECT_EQ(GetPublisherId("https://vimeo.com/foo"), absl::nullopt); - EXPECT_EQ(GetPublisherId("https://twitch.tv/foo"), absl::nullopt); + EXPECT_EQ(GetPublisherId("https://twitter.com/foo"), std::nullopt); + EXPECT_EQ(GetPublisherId("https://github.com/foo"), std::nullopt); + EXPECT_EQ(GetPublisherId("https://reddit.com/foo"), std::nullopt); + EXPECT_EQ(GetPublisherId("https://youtube.com/foo"), std::nullopt); + EXPECT_EQ(GetPublisherId("https://vimeo.com/foo"), std::nullopt); + EXPECT_EQ(GetPublisherId("https://twitch.tv/foo"), std::nullopt); } } // namespace brave_rewards diff --git a/components/brave_rewards/browser/rewards_notification_service_impl.cc b/components/brave_rewards/browser/rewards_notification_service_impl.cc index bcaef9abcac..1447c8feb8d 100644 --- a/components/brave_rewards/browser/rewards_notification_service_impl.cc +++ b/components/brave_rewards/browser/rewards_notification_service_impl.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_rewards/browser/rewards_notification_service_impl.h" #include +#include #include #include "base/containers/contains.h" @@ -144,7 +145,7 @@ void RewardsNotificationServiceImpl::ReadRewardsNotificationsJSON() { profile_->GetPrefs()->GetString(prefs::kNotifications); if (json.empty()) return; - absl::optional parsed = base::JSONReader::Read(json); + std::optional parsed = base::JSONReader::Read(json); // legacy read if (!parsed || (!parsed->is_dict() && !parsed->is_list())) { diff --git a/components/brave_rewards/browser/rewards_p3a.h b/components/brave_rewards/browser/rewards_p3a.h index 59ea7ad8004..17ca224486f 100644 --- a/components/brave_rewards/browser/rewards_p3a.h +++ b/components/brave_rewards/browser/rewards_p3a.h @@ -6,12 +6,13 @@ #ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_BROWSER_REWARDS_P3A_H_ #define BRAVE_COMPONENTS_BRAVE_REWARDS_BROWSER_REWARDS_P3A_H_ +#include + #include "base/memory/raw_ptr.h" #include "base/time/time.h" #include "base/timer/timer.h" #include "base/timer/wall_clock_timer.h" #include "brave/components/time_period_storage/weekly_storage.h" -#include "third_party/abseil-cpp/absl/types/optional.h" class PrefService; @@ -89,7 +90,7 @@ class ConversionMonitor { base::OneShotTimer mobile_trigger_timer_; base::WallClockTimer daily_timer_; #else - absl::optional last_trigger_; + std::optional last_trigger_; base::Time last_trigger_time_; #endif }; diff --git a/components/brave_rewards/browser/rewards_service_impl.cc b/components/brave_rewards/browser/rewards_service_impl.cc index 249067a7262..9e8f7226a44 100644 --- a/components/brave_rewards/browser/rewards_service_impl.cc +++ b/components/brave_rewards/browser/rewards_service_impl.cc @@ -6,9 +6,11 @@ #include "brave/components/brave_rewards/browser/rewards_service_impl.h" #include + #include #include #include +#include #include #include #include @@ -1131,7 +1133,7 @@ void ParseCaptchaResponse( std::string* image, std::string* id, std::string* hint) { - absl::optional value = base::JSONReader::Read(response); + std::optional value = base::JSONReader::Read(response); if (!value || !value->is_dict()) { return; } @@ -2604,7 +2606,7 @@ void RewardsServiceImpl::EncryptString(const std::string& value, return std::move(callback).Run(std::move(encrypted)); } - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(std::nullopt); } void RewardsServiceImpl::DecryptString(const std::string& value, @@ -2614,7 +2616,7 @@ void RewardsServiceImpl::DecryptString(const std::string& value, return std::move(callback).Run(std::move(decrypted)); } - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(std::nullopt); } void RewardsServiceImpl::GetRewardsWallet(GetRewardsWalletCallback callback) { diff --git a/components/brave_rewards/browser/test/common/rewards_browsertest_util.cc b/components/brave_rewards/browser/test/common/rewards_browsertest_util.cc index fe5409e7b0c..3329483a2d0 100644 --- a/components/brave_rewards/browser/test/common/rewards_browsertest_util.cc +++ b/components/brave_rewards/browser/test/common/rewards_browsertest_util.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_rewards/browser/test/common/rewards_browsertest_util.h" +#include #include #include "base/base64.h" @@ -179,7 +180,7 @@ void SetOnboardingBypassed(Browser* browser, bool bypassed) { prefs->SetBoolean(prefs::kEnabled, bypassed); } -absl::optional EncryptPrefString( +std::optional EncryptPrefString( RewardsServiceImpl* rewards_service, const std::string& value) { DCHECK(rewards_service); @@ -194,7 +195,7 @@ absl::optional EncryptPrefString( return encoded; } -absl::optional DecryptPrefString( +std::optional DecryptPrefString( RewardsServiceImpl* rewards_service, const std::string& value) { DCHECK(rewards_service); diff --git a/components/brave_rewards/browser/test/common/rewards_browsertest_util.h b/components/brave_rewards/browser/test/common/rewards_browsertest_util.h index 0af819d8ae7..c435dc7fb43 100644 --- a/components/brave_rewards/browser/test/common/rewards_browsertest_util.h +++ b/components/brave_rewards/browser/test/common/rewards_browsertest_util.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_BROWSER_TEST_COMMON_REWARDS_BROWSERTEST_UTIL_H_ #define BRAVE_COMPONENTS_BRAVE_REWARDS_BROWSER_TEST_COMMON_REWARDS_BROWSERTEST_UTIL_H_ +#include #include #include "base/files/file_path.h" @@ -61,11 +62,11 @@ void SetOnboardingBypassed(Browser* browser, bool bypassed = true); // TODO(zenparsing): Remove these functions when browser tests that read or // write encrypted "state" are migrated to the bat rewards library. -absl::optional EncryptPrefString( +std::optional EncryptPrefString( RewardsServiceImpl* rewards_service, const std::string& value); -absl::optional DecryptPrefString( +std::optional DecryptPrefString( RewardsServiceImpl* rewards_service, const std::string& value); diff --git a/components/brave_rewards/browser/test/rewards_state_browsertest.cc b/components/brave_rewards/browser/test/rewards_state_browsertest.cc index f37f7f5b59b..9be8e7b4c50 100644 --- a/components/brave_rewards/browser/test/rewards_state_browsertest.cc +++ b/components/brave_rewards/browser/test/rewards_state_browsertest.cc @@ -4,6 +4,7 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ #include +#include #include #include "base/base64.h" @@ -34,7 +35,6 @@ #include "content/public/test/browser_test.h" #include "crypto/sha2.h" #include "net/dns/mock_host_resolver.h" -#include "third_party/abseil-cpp/absl/types/optional.h" // npm run test -- brave_browser_tests --filter=RewardsStateBrowserTest* @@ -358,7 +358,7 @@ class V10 : public RewardsStateBrowserTest, static std::string from_json(const std::string& json) { std::string suffix = ""; - absl::optional value = base::JSONReader::Read(json); + std::optional value = base::JSONReader::Read(json); if (value && value->is_dict()) { const auto& dict = value->GetDict(); suffix += to_string(dict.FindInt("status").value_or(-1)); diff --git a/components/brave_rewards/common/rewards_flags.cc b/components/brave_rewards/common/rewards_flags.cc index 835678d21c6..36cfa88ba8e 100644 --- a/components/brave_rewards/common/rewards_flags.cc +++ b/components/brave_rewards/common/rewards_flags.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_rewards/common/rewards_flags.h" +#include #include #include "base/command_line.h" @@ -28,7 +29,7 @@ bool ReadBoolFlag(const std::string& value) { } template -absl::optional ReadInt(const std::string& value, F fn) { +std::optional ReadInt(const std::string& value, F fn) { int int_value; if (base::StringToInt(value, &int_value) && fn(int_value)) { return int_value; @@ -36,7 +37,7 @@ absl::optional ReadInt(const std::string& value, F fn) { return {}; } -absl::optional ReadPositiveInt(const std::string& value) { +std::optional ReadPositiveInt(const std::string& value) { return ReadInt(value, [](int v) { return v > 0; }); } @@ -101,7 +102,7 @@ const std::string& RewardsFlags::GetCommandLineSwitchASCII() { } const RewardsFlags& RewardsFlags::ForCurrentProcess() { - static absl::optional parsed_flags; + static std::optional parsed_flags; if (parsed_flags && !g_force_parsing_for_testing) { return *parsed_flags; diff --git a/components/brave_rewards/common/rewards_flags.h b/components/brave_rewards/common/rewards_flags.h index 1aa265f6007..f239e10ffdc 100644 --- a/components/brave_rewards/common/rewards_flags.h +++ b/components/brave_rewards/common/rewards_flags.h @@ -6,9 +6,9 @@ #ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_COMMON_REWARDS_FLAGS_H_ #define BRAVE_COMPONENTS_BRAVE_REWARDS_COMMON_REWARDS_FLAGS_H_ +#include #include -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_rewards { @@ -21,11 +21,11 @@ struct RewardsFlags { static const RewardsFlags& ForCurrentProcess(); - absl::optional environment; + std::optional environment; bool debug = false; bool persist_logs = false; - absl::optional reconcile_interval; - absl::optional retry_interval; + std::optional reconcile_interval; + std::optional retry_interval; }; } // namespace brave_rewards diff --git a/components/brave_rewards/core/attestation/attestation_androidx.cc b/components/brave_rewards/core/attestation/attestation_androidx.cc index fb9c12a3fde..61f884fc3be 100644 --- a/components/brave_rewards/core/attestation/attestation_androidx.cc +++ b/components/brave_rewards/core/attestation/attestation_androidx.cc @@ -3,12 +3,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include "brave/components/brave_rewards/core/attestation/attestation_androidx.h" + +#include #include #include #include "base/json/json_reader.h" #include "base/json/json_writer.h" -#include "brave/components/brave_rewards/core/attestation/attestation_androidx.h" #include "brave/components/brave_rewards/core/rewards_engine_impl.h" namespace brave_rewards::internal { @@ -24,7 +26,7 @@ void AttestationAndroid::ParseClaimSolution(const std::string& response, std::string* nonce) { DCHECK(token && nonce); - absl::optional value = base::JSONReader::Read(response); + std::optional value = base::JSONReader::Read(response); if (!value || !value->is_dict()) { BLOG(0, "Parsing of solution failed"); return; diff --git a/components/brave_rewards/core/attestation/attestation_desktop.cc b/components/brave_rewards/core/attestation/attestation_desktop.cc index 75d4745b50e..c8f2c8fbc65 100644 --- a/components/brave_rewards/core/attestation/attestation_desktop.cc +++ b/components/brave_rewards/core/attestation/attestation_desktop.cc @@ -3,11 +3,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include "brave/components/brave_rewards/core/attestation/attestation_desktop.h" + +#include #include #include "base/json/json_reader.h" #include "base/json/json_writer.h" -#include "brave/components/brave_rewards/core/attestation/attestation_desktop.h" #include "brave/components/brave_rewards/core/rewards_engine_impl.h" namespace brave_rewards::internal { @@ -25,7 +27,7 @@ mojom::Result AttestationDesktop::ParseClaimSolution( std::string* captcha_id) { DCHECK(x && y && captcha_id); - absl::optional value = base::JSONReader::Read(response); + std::optional value = base::JSONReader::Read(response); if (!value || !value->is_dict()) { return mojom::Result::FAILED; } diff --git a/components/brave_rewards/core/attestation/attestation_iosx.cc b/components/brave_rewards/core/attestation/attestation_iosx.cc index a1680bf5358..736e6c3d73d 100644 --- a/components/brave_rewards/core/attestation/attestation_iosx.cc +++ b/components/brave_rewards/core/attestation/attestation_iosx.cc @@ -3,12 +3,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include "brave/components/brave_rewards/core/attestation/attestation_iosx.h" + +#include #include #include #include "base/json/json_reader.h" #include "base/json/json_writer.h" -#include "brave/components/brave_rewards/core/attestation/attestation_iosx.h" #include "brave/components/brave_rewards/core/rewards_engine_impl.h" namespace brave_rewards::internal { @@ -20,7 +22,7 @@ AttestationIOS::AttestationIOS(RewardsEngineImpl& engine) AttestationIOS::~AttestationIOS() = default; std::string AttestationIOS::ParseStartPayload(const std::string& response) { - absl::optional value = base::JSONReader::Read(response); + std::optional value = base::JSONReader::Read(response); if (!value || !value->is_dict()) { return ""; } @@ -39,7 +41,7 @@ mojom::Result AttestationIOS::ParseClaimSolution(const std::string& response, std::string* nonce, std::string* blob, std::string* signature) { - absl::optional value = base::JSONReader::Read(response); + std::optional value = base::JSONReader::Read(response); if (!value || !value->is_dict()) { return mojom::Result::FAILED; } diff --git a/components/brave_rewards/core/contribution/contribution.cc b/components/brave_rewards/core/contribution/contribution.cc index 8d428d88707..38c12e19807 100644 --- a/components/brave_rewards/core/contribution/contribution.cc +++ b/components/brave_rewards/core/contribution/contribution.cc @@ -3,11 +3,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include "brave/components/brave_rewards/core/contribution/contribution.h" + #include #include #include #include +#include #include #include @@ -17,7 +20,6 @@ #include "base/uuid.h" #include "brave/components/brave_rewards/core/bitflyer/bitflyer.h" #include "brave/components/brave_rewards/core/common/time_util.h" -#include "brave/components/brave_rewards/core/contribution/contribution.h" #include "brave/components/brave_rewards/core/contribution/contribution_util.h" #include "brave/components/brave_rewards/core/database/database.h" #include "brave/components/brave_rewards/core/gemini/gemini.h" @@ -207,14 +209,14 @@ void Contribution::StartMonthlyContributions( monthly_contribution_timer_.Stop(); monthly_contributions_processing_ = true; - absl::optional cutoff_time = base::Time::Now(); + std::optional cutoff_time = base::Time::Now(); // Existing tests expect the ability to trigger all monthly and AC // contributions, regardless of their "next contribution dates". If we are // triggering all contributions, pass a null cutoff time to the monthly // contribution processor so that it will send them all. if (options == MonthlyContributionOptions::kSendAllContributions) { - cutoff_time = absl::nullopt; + cutoff_time = std::nullopt; } BLOG(1, "Starting monthly contributions"); @@ -296,7 +298,7 @@ void Contribution::SetMonthlyContributionTimer() { } void Contribution::OnNextMonthlyContributionTimeRead( - absl::optional time) { + std::optional time) { monthly_contribution_timer_.Stop(); if (!time) { @@ -329,7 +331,7 @@ void Contribution::SendContribution(const std::string& publisher_id, void Contribution::OnContributionRequestQueued( ContributionRequest request, - absl::optional queue_id) { + std::optional queue_id) { if (!queue_id) { std::move(request.callback).Run(false); return; @@ -421,7 +423,7 @@ void Contribution::OneTimeTip(const std::string& publisher_key, double amount, LegacyResultCallback callback) { auto on_added = [](LegacyResultCallback callback, - absl::optional queue_id) { + std::optional queue_id) { callback(mojom::Result::OK); }; diff --git a/components/brave_rewards/core/contribution/contribution.h b/components/brave_rewards/core/contribution/contribution.h index 74db469a3b6..e9e1881019c 100644 --- a/components/brave_rewards/core/contribution/contribution.h +++ b/components/brave_rewards/core/contribution/contribution.h @@ -10,6 +10,7 @@ #include #include +#include #include #include @@ -90,7 +91,7 @@ class Contribution { void StartAutoContribute(); - void OnNextMonthlyContributionTimeRead(absl::optional time); + void OnNextMonthlyContributionTimeRead(std::optional time); void OnMonthlyContributionSet(bool success); @@ -112,7 +113,7 @@ class Contribution { }; void OnContributionRequestQueued(ContributionRequest request, - absl::optional queue_id); + std::optional queue_id); void OnContributionRequestCompleted(const std::string& queue_id, bool success); diff --git a/components/brave_rewards/core/contribution/contribution_monthly.cc b/components/brave_rewards/core/contribution/contribution_monthly.cc index 8ba3d819f4e..b30aeb21467 100644 --- a/components/brave_rewards/core/contribution/contribution_monthly.cc +++ b/components/brave_rewards/core/contribution/contribution_monthly.cc @@ -3,6 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include "brave/components/brave_rewards/core/contribution/contribution_monthly.h" + +#include #include #include #include @@ -12,7 +15,6 @@ #include "base/uuid.h" #include "brave/components/brave_rewards/core/common/time_util.h" #include "brave/components/brave_rewards/core/contribution/contribution.h" -#include "brave/components/brave_rewards/core/contribution/contribution_monthly.h" #include "brave/components/brave_rewards/core/database/database.h" #include "brave/components/brave_rewards/core/rewards_engine_impl.h" @@ -24,7 +26,7 @@ ContributionMonthly::ContributionMonthly(RewardsEngineImpl& engine) ContributionMonthly::~ContributionMonthly() = default; -void ContributionMonthly::Process(absl::optional cutoff_time, +void ContributionMonthly::Process(std::optional cutoff_time, LegacyResultCallback callback) { engine_->contribution()->GetRecurringTips( [this, cutoff_time, @@ -34,7 +36,7 @@ void ContributionMonthly::Process(absl::optional cutoff_time, } void ContributionMonthly::AdvanceContributionDates( - absl::optional cutoff_time, + std::optional cutoff_time, LegacyResultCallback callback, std::vector publishers) { // Remove any contributions whose next contribution date is in the future. diff --git a/components/brave_rewards/core/contribution/contribution_monthly.h b/components/brave_rewards/core/contribution/contribution_monthly.h index a59f66ba13a..6ed61b66992 100644 --- a/components/brave_rewards/core/contribution/contribution_monthly.h +++ b/components/brave_rewards/core/contribution/contribution_monthly.h @@ -6,12 +6,12 @@ #ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_CONTRIBUTION_CONTRIBUTION_MONTHLY_H_ #define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_CONTRIBUTION_CONTRIBUTION_MONTHLY_H_ +#include #include #include "base/memory/raw_ref.h" #include "base/time/time.h" #include "brave/components/brave_rewards/core/rewards_callbacks.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_rewards::internal { class RewardsEngineImpl; @@ -24,12 +24,12 @@ class ContributionMonthly { ~ContributionMonthly(); - void Process(absl::optional cutoff_time, + void Process(std::optional cutoff_time, LegacyResultCallback callback); private: void AdvanceContributionDates( - absl::optional cutoff_time, + std::optional cutoff_time, LegacyResultCallback callback, std::vector publishers); diff --git a/components/brave_rewards/core/contribution/contribution_tip.cc b/components/brave_rewards/core/contribution/contribution_tip.cc index 75ac6453a8a..86ba8917c47 100644 --- a/components/brave_rewards/core/contribution/contribution_tip.cc +++ b/components/brave_rewards/core/contribution/contribution_tip.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_rewards/core/contribution/contribution_tip.h" +#include #include #include @@ -28,7 +29,7 @@ void ContributionTip::Process(const std::string& publisher_id, ProcessCallback callback) { if (publisher_id.empty()) { BLOG(0, "Failed to do tip due to missing publisher key"); - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(std::nullopt); return; } @@ -45,7 +46,7 @@ void ContributionTip::OnPublisherDataRead( ProcessCallback callback, mojom::ServerPublisherInfoPtr server_info) { if (!server_info || server_info->address.empty()) { - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(std::nullopt); return; } @@ -79,7 +80,7 @@ void ContributionTip::OnQueueSaved(const std::string& queue_id, std::move(callback).Run(queue_id); } else { BLOG(0, "Queue was not saved"); - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(std::nullopt); } } diff --git a/components/brave_rewards/core/contribution/contribution_tip.h b/components/brave_rewards/core/contribution/contribution_tip.h index 94cb02ef1cd..552c56c1afe 100644 --- a/components/brave_rewards/core/contribution/contribution_tip.h +++ b/components/brave_rewards/core/contribution/contribution_tip.h @@ -6,12 +6,12 @@ #ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_CONTRIBUTION_CONTRIBUTION_TIP_H_ #define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_CONTRIBUTION_CONTRIBUTION_TIP_H_ +#include #include #include "base/functional/callback_forward.h" #include "base/memory/raw_ref.h" #include "brave/components/brave_rewards/core/rewards_callbacks.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_rewards::internal { @@ -25,7 +25,7 @@ class ContributionTip { ~ContributionTip(); - using ProcessCallback = base::OnceCallback)>; + using ProcessCallback = base::OnceCallback)>; void Process(const std::string& publisher_id, double amount, diff --git a/components/brave_rewards/core/credentials/credentials_util.cc b/components/brave_rewards/core/credentials/credentials_util.cc index 9686035ea54..603cc7f1df1 100644 --- a/components/brave_rewards/core/credentials/credentials_util.cc +++ b/components/brave_rewards/core/credentials/credentials_util.cc @@ -3,12 +3,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include "brave/components/brave_rewards/core/credentials/credentials_util.h" + +#include #include #include "base/base64.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" -#include "brave/components/brave_rewards/core/credentials/credentials_util.h" #include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/third_party/challenge_bypass_ristretto_ffi/src/wrapper.h" @@ -76,11 +78,11 @@ std::string GetBlindedCredsJSON( return json; } -absl::optional ParseStringToBaseList( +std::optional ParseStringToBaseList( const std::string& string_list) { - absl::optional value = base::JSONReader::Read(string_list); + std::optional value = base::JSONReader::Read(string_list); if (!value || !value->is_list()) { - return absl::nullopt; + return std::nullopt; } return value->GetList().Clone(); @@ -196,7 +198,7 @@ base::Value::List GenerateCredentials( const std::string& body) { base::Value::List credentials; for (auto& item : token_list) { - absl::optional token; + std::optional token; if (is_testing) { token = GenerateSuggestionMock(item.token_value, item.public_key, body); } else { @@ -212,30 +214,30 @@ base::Value::List GenerateCredentials( return credentials; } -absl::optional GenerateSuggestion( +std::optional GenerateSuggestion( const std::string& token_value, const std::string& public_key, const std::string& body) { if (token_value.empty() || public_key.empty() || body.empty()) { - return absl::nullopt; + return std::nullopt; } auto unblinded = UnblindedToken::decode_base64(token_value); if (!unblinded.has_value()) { - return absl::nullopt; + return std::nullopt; } VerificationKey verification_key = unblinded->derive_verification_key(); auto signature = verification_key.sign(body); if (!signature.has_value()) { - return absl::nullopt; + return std::nullopt; } auto pre_image = unblinded->preimage().encode_base64(); auto enconded_signature = signature->encode_base64(); if (!pre_image.has_value() || !enconded_signature.has_value()) { - return absl::nullopt; + return std::nullopt; } base::Value::Dict dict; diff --git a/components/brave_rewards/core/credentials/credentials_util.h b/components/brave_rewards/core/credentials/credentials_util.h index 132bd2225d9..2d2d14b50c6 100644 --- a/components/brave_rewards/core/credentials/credentials_util.h +++ b/components/brave_rewards/core/credentials/credentials_util.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_CREDENTIALS_CREDENTIALS_UTIL_H_ #include +#include #include #include @@ -14,8 +15,6 @@ #include "base/values.h" #include "brave/components/brave_rewards/common/mojom/rewards.mojom.h" #include "brave/components/brave_rewards/core/credentials/credentials_redeem.h" -#include "third_party/abseil-cpp/absl/types/optional.h" - #include "brave/third_party/challenge_bypass_ristretto_ffi/src/wrapper.h" using challenge_bypass_ristretto::BlindedToken; @@ -32,7 +31,7 @@ std::vector GenerateBlindCreds(const std::vector& tokens); std::string GetBlindedCredsJSON(const std::vector& blinded); -absl::optional ParseStringToBaseList( +std::optional ParseStringToBaseList( const std::string& string_list); base::expected, std::string> UnBlindCreds( @@ -46,7 +45,7 @@ base::Value::List GenerateCredentials( const std::vector& token_list, const std::string& body); -absl::optional GenerateSuggestion( +std::optional GenerateSuggestion( const std::string& token_value, const std::string& public_key, const std::string& suggestion_encoded); diff --git a/components/brave_rewards/core/database/database.cc b/components/brave_rewards/core/database/database.cc index 3776b4d3062..ef73cb94010 100644 --- a/components/brave_rewards/core/database/database.cc +++ b/components/brave_rewards/core/database/database.cc @@ -3,9 +3,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include "brave/components/brave_rewards/core/database/database.h" + +#include #include -#include "brave/components/brave_rewards/core/database/database.h" #include "brave/components/brave_rewards/core/database/database_util.h" #include "brave/components/brave_rewards/core/logging/event_log_keys.h" #include "brave/components/brave_rewards/core/rewards_engine_impl.h" @@ -403,7 +405,7 @@ void Database::AdvanceMonthlyContributionDates( } void Database::GetNextMonthlyContributionTime( - base::OnceCallback)> callback) { + base::OnceCallback)> callback) { recurring_tip_.GetNextMonthlyContributionTime(std::move(callback)); } diff --git a/components/brave_rewards/core/database/database.h b/components/brave_rewards/core/database/database.h index 82f384e3ac7..dd24a6e9200 100644 --- a/components/brave_rewards/core/database/database.h +++ b/components/brave_rewards/core/database/database.h @@ -9,8 +9,10 @@ #include #include +#include #include #include + #include "base/functional/callback_forward.h" #include "base/memory/raw_ref.h" #include "base/time/time.h" @@ -268,7 +270,7 @@ class Database { base::OnceCallback callback); void GetNextMonthlyContributionTime( - base::OnceCallback)> callback); + base::OnceCallback)> callback); void GetRecurringTips(GetRecurringTipsCallback callback); diff --git a/components/brave_rewards/core/database/database_publisher_prefix_list.cc b/components/brave_rewards/core/database/database_publisher_prefix_list.cc index 7309da45f5e..cf38f2c6846 100644 --- a/components/brave_rewards/core/database/database_publisher_prefix_list.cc +++ b/components/brave_rewards/core/database/database_publisher_prefix_list.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_rewards/core/database/database_publisher_prefix_list.h" +#include #include #include @@ -149,13 +150,13 @@ void DatabasePublisherPrefixList::OnInsertNext( mojom::DBCommandResponsePtr response) { if (!response || response->status != mojom::DBCommandResponse::Status::RESPONSE_OK) { - reader_ = absl::nullopt; + reader_ = std::nullopt; callback(mojom::Result::FAILED); return; } if (iter == reader_->end()) { - reader_ = absl::nullopt; + reader_ = std::nullopt; callback(mojom::Result::OK); return; } diff --git a/components/brave_rewards/core/database/database_publisher_prefix_list.h b/components/brave_rewards/core/database/database_publisher_prefix_list.h index 95d85741839..449e10d4690 100644 --- a/components/brave_rewards/core/database/database_publisher_prefix_list.h +++ b/components/brave_rewards/core/database/database_publisher_prefix_list.h @@ -6,11 +6,11 @@ #ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_DATABASE_DATABASE_PUBLISHER_PREFIX_LIST_H_ #define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_DATABASE_DATABASE_PUBLISHER_PREFIX_LIST_H_ +#include #include #include "brave/components/brave_rewards/core/database/database_table.h" #include "brave/components/brave_rewards/core/publisher/prefix_list_reader.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_rewards::internal { namespace database { @@ -38,7 +38,7 @@ class DatabasePublisherPrefixList : public DatabaseTable { publisher::PrefixIterator iter, mojom::DBCommandResponsePtr response); - absl::optional reader_; + std::optional reader_; }; } // namespace database diff --git a/components/brave_rewards/core/database/database_recurring_tip.cc b/components/brave_rewards/core/database/database_recurring_tip.cc index 347ff84bb9c..f9dd1ea8215 100644 --- a/components/brave_rewards/core/database/database_recurring_tip.cc +++ b/components/brave_rewards/core/database/database_recurring_tip.cc @@ -3,14 +3,16 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include "brave/components/brave_rewards/core/database/database_recurring_tip.h" + #include +#include #include #include #include "base/functional/bind.h" #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/constants.h" -#include "brave/components/brave_rewards/core/database/database_recurring_tip.h" #include "brave/components/brave_rewards/core/database/database_util.h" #include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/state/state.h" @@ -145,7 +147,7 @@ void DatabaseRecurringTip::AdvanceMonthlyContributionDates( } void DatabaseRecurringTip::GetNextMonthlyContributionTime( - base::OnceCallback)> callback) { + base::OnceCallback)> callback) { auto transaction = mojom::DBTransaction::New(); auto command = mojom::DBCommand::New(); @@ -165,7 +167,7 @@ void DatabaseRecurringTip::GetNextMonthlyContributionTime( transaction->commands.push_back(std::move(command)); auto on_completed = - [](base::OnceCallback)> callback, + [](base::OnceCallback)> callback, mojom::DBCommandResponsePtr response) { base::Time time; if (response && @@ -183,7 +185,7 @@ void DatabaseRecurringTip::GetNextMonthlyContributionTime( return; } } - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(std::nullopt); }; engine_->client()->RunDBTransaction( diff --git a/components/brave_rewards/core/database/database_recurring_tip.h b/components/brave_rewards/core/database/database_recurring_tip.h index 20b47828a5c..d6e864eb4ce 100644 --- a/components/brave_rewards/core/database/database_recurring_tip.h +++ b/components/brave_rewards/core/database/database_recurring_tip.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_DATABASE_DATABASE_RECURRING_TIP_H_ #define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_DATABASE_DATABASE_RECURRING_TIP_H_ +#include #include #include @@ -34,7 +35,7 @@ class DatabaseRecurringTip : public DatabaseTable { base::OnceCallback callback); void GetNextMonthlyContributionTime( - base::OnceCallback)> callback); + base::OnceCallback)> callback); void GetAllRecords(GetRecurringTipsCallback callback); diff --git a/components/brave_rewards/core/endpoint/bitflyer/get_balance/get_balance_bitflyer.cc b/components/brave_rewards/core/endpoint/bitflyer/get_balance/get_balance_bitflyer.cc index bb882938697..58d4850a41c 100644 --- a/components/brave_rewards/core/endpoint/bitflyer/get_balance/get_balance_bitflyer.cc +++ b/components/brave_rewards/core/endpoint/bitflyer/get_balance/get_balance_bitflyer.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_rewards/core/endpoint/bitflyer/get_balance/get_balance_bitflyer.h" +#include #include #include "base/json/json_reader.h" @@ -48,7 +49,7 @@ mojom::Result GetBalance::ParseBody(const std::string& body, double* available) { DCHECK(available); - absl::optional value = base::JSONReader::Read(body); + std::optional value = base::JSONReader::Read(body); if (!value || !value->is_dict()) { BLOG(0, "Invalid JSON"); return mojom::Result::FAILED; diff --git a/components/brave_rewards/core/endpoint/bitflyer/post_oauth/post_oauth_bitflyer.cc b/components/brave_rewards/core/endpoint/bitflyer/post_oauth/post_oauth_bitflyer.cc index be91e379658..a4a69b30f5b 100644 --- a/components/brave_rewards/core/endpoint/bitflyer/post_oauth/post_oauth_bitflyer.cc +++ b/components/brave_rewards/core/endpoint/bitflyer/post_oauth/post_oauth_bitflyer.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_rewards/core/endpoint/bitflyer/post_oauth/post_oauth_bitflyer.h" +#include #include #include "base/json/json_reader.h" @@ -67,7 +68,7 @@ mojom::Result PostOauth::ParseBody(const std::string& body, DCHECK(address); DCHECK(linking_info); - absl::optional value = base::JSONReader::Read(body); + std::optional value = base::JSONReader::Read(body); if (!value || !value->is_dict()) { BLOG(0, "Invalid JSON"); return mojom::Result::FAILED; diff --git a/components/brave_rewards/core/endpoint/gemini/post_account/post_account_gemini.cc b/components/brave_rewards/core/endpoint/gemini/post_account/post_account_gemini.cc index f5d6183339a..b50416c2d87 100644 --- a/components/brave_rewards/core/endpoint/gemini/post_account/post_account_gemini.cc +++ b/components/brave_rewards/core/endpoint/gemini/post_account/post_account_gemini.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_rewards/core/endpoint/gemini/post_account/post_account_gemini.h" +#include #include #include "base/json/json_reader.h" @@ -13,7 +14,6 @@ #include "brave/components/brave_rewards/core/gemini/gemini_util.h" #include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "net/http/http_status_code.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_rewards::internal::endpoint::gemini { @@ -33,7 +33,7 @@ mojom::Result PostAccount::ParseBody(const std::string& body, DCHECK(user_name); DCHECK(country_id); - absl::optional value = base::JSONReader::Read(body); + std::optional value = base::JSONReader::Read(body); if (!value || !value->is_dict()) { BLOG(0, "Invalid JSON"); return mojom::Result::FAILED; diff --git a/components/brave_rewards/core/endpoint/gemini/post_balance/post_balance_gemini.cc b/components/brave_rewards/core/endpoint/gemini/post_balance/post_balance_gemini.cc index d22dc6deefd..e28004d3baf 100644 --- a/components/brave_rewards/core/endpoint/gemini/post_balance/post_balance_gemini.cc +++ b/components/brave_rewards/core/endpoint/gemini/post_balance/post_balance_gemini.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_rewards/core/endpoint/gemini/post_balance/post_balance_gemini.h" +#include #include #include @@ -13,7 +14,6 @@ #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/gemini/gemini_util.h" #include "brave/components/brave_rewards/core/rewards_engine_impl.h" -#include "third_party/abseil-cpp/absl/types/optional.h" using std::placeholders::_1; @@ -33,7 +33,7 @@ mojom::Result PostBalance::ParseBody(const std::string& body, double* available) { DCHECK(available); - absl::optional value = base::JSONReader::Read(body); + std::optional value = base::JSONReader::Read(body); if (!value || !value->is_list()) { BLOG(0, "Invalid JSON"); return mojom::Result::FAILED; diff --git a/components/brave_rewards/core/endpoint/gemini/post_oauth/post_oauth_gemini.cc b/components/brave_rewards/core/endpoint/gemini/post_oauth/post_oauth_gemini.cc index e09aa670d5a..dbe4d36f653 100644 --- a/components/brave_rewards/core/endpoint/gemini/post_oauth/post_oauth_gemini.cc +++ b/components/brave_rewards/core/endpoint/gemini/post_oauth/post_oauth_gemini.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_rewards/core/endpoint/gemini/post_oauth/post_oauth_gemini.h" +#include #include #include "base/json/json_reader.h" @@ -13,7 +14,6 @@ #include "base/uuid.h" #include "brave/components/brave_rewards/core/gemini/gemini_util.h" #include "brave/components/brave_rewards/core/rewards_engine_impl.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_rewards::internal::endpoint::gemini { @@ -48,7 +48,7 @@ mojom::Result PostOauth::ParseBody(const std::string& body, std::string* token) { DCHECK(token); - absl::optional value = base::JSONReader::Read(body); + std::optional value = base::JSONReader::Read(body); if (!value || !value->is_dict()) { BLOG(0, "Invalid JSON"); return mojom::Result::FAILED; diff --git a/components/brave_rewards/core/endpoint/gemini/post_recipient_id/post_recipient_id_gemini.cc b/components/brave_rewards/core/endpoint/gemini/post_recipient_id/post_recipient_id_gemini.cc index 4b2f52ba4a3..ebc377152a2 100644 --- a/components/brave_rewards/core/endpoint/gemini/post_recipient_id/post_recipient_id_gemini.cc +++ b/components/brave_rewards/core/endpoint/gemini/post_recipient_id/post_recipient_id_gemini.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_rewards/core/endpoint/gemini/post_recipient_id/post_recipient_id_gemini.h" +#include #include #include "base/base64.h" @@ -13,7 +14,6 @@ #include "base/uuid.h" #include "brave/components/brave_rewards/core/gemini/gemini_util.h" #include "brave/components/brave_rewards/core/rewards_engine_impl.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_rewards::internal::endpoint::gemini { @@ -29,7 +29,7 @@ mojom::Result PostRecipientId::ParseBody(const std::string& body, std::string* recipient_id) { DCHECK(recipient_id); - absl::optional value = base::JSONReader::Read(body); + std::optional value = base::JSONReader::Read(body); if (!value || !value->is_dict()) { BLOG(0, "Invalid JSON"); return mojom::Result::FAILED; diff --git a/components/brave_rewards/core/endpoint/payment/get_credentials/get_credentials.cc b/components/brave_rewards/core/endpoint/payment/get_credentials/get_credentials.cc index c3a3082e2ff..a39847e9ba9 100644 --- a/components/brave_rewards/core/endpoint/payment/get_credentials/get_credentials.cc +++ b/components/brave_rewards/core/endpoint/payment/get_credentials/get_credentials.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_rewards/core/endpoint/payment/get_credentials/get_credentials.h" +#include #include #include "base/json/json_reader.h" @@ -61,7 +62,7 @@ mojom::Result GetCredentials::CheckStatusCode(const int status_code) { mojom::Result GetCredentials::ParseBody(const std::string& body, mojom::CredsBatch* batch) { DCHECK(batch); - absl::optional value = base::JSONReader::Read(body); + std::optional value = base::JSONReader::Read(body); if (!value || !value->is_dict()) { BLOG(0, "Invalid JSON"); return mojom::Result::RETRY; diff --git a/components/brave_rewards/core/endpoint/payment/post_order/post_order.cc b/components/brave_rewards/core/endpoint/payment/post_order/post_order.cc index 629b0d09cd4..129d1313e4d 100644 --- a/components/brave_rewards/core/endpoint/payment/post_order/post_order.cc +++ b/components/brave_rewards/core/endpoint/payment/post_order/post_order.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_rewards/core/endpoint/payment/post_order/post_order.h" +#include #include #include "base/json/json_reader.h" @@ -73,7 +74,7 @@ mojom::Result PostOrder::ParseBody( mojom::SKUOrder* order) { DCHECK(order); - absl::optional dictionary = base::JSONReader::Read(body); + std::optional dictionary = base::JSONReader::Read(body); if (!dictionary || !dictionary->is_dict()) { BLOG(0, "Invalid JSON"); return mojom::Result::FAILED; diff --git a/components/brave_rewards/core/endpoint/promotion/get_available/get_available.cc b/components/brave_rewards/core/endpoint/promotion/get_available/get_available.cc index 1afe2304ff8..acdbfdceda4 100644 --- a/components/brave_rewards/core/endpoint/promotion/get_available/get_available.cc +++ b/components/brave_rewards/core/endpoint/promotion/get_available/get_available.cc @@ -4,6 +4,7 @@ * You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "brave/components/brave_rewards/core/endpoint/promotion/get_available/get_available.h" +#include #include #include "base/json/json_reader.h" @@ -73,7 +74,7 @@ mojom::Result GetAvailable::ParseBody( std::vector* corrupted_promotions) { DCHECK(list && corrupted_promotions); - absl::optional value = base::JSONReader::Read(body); + std::optional value = base::JSONReader::Read(body); if (!value || !value->is_dict()) { BLOG(0, "Invalid JSON"); return mojom::Result::FAILED; diff --git a/components/brave_rewards/core/endpoint/promotion/get_signed_creds/get_signed_creds.cc b/components/brave_rewards/core/endpoint/promotion/get_signed_creds/get_signed_creds.cc index f48e7cc1d4b..2a03c6bb9df 100644 --- a/components/brave_rewards/core/endpoint/promotion/get_signed_creds/get_signed_creds.cc +++ b/components/brave_rewards/core/endpoint/promotion/get_signed_creds/get_signed_creds.cc @@ -4,6 +4,7 @@ * You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "brave/components/brave_rewards/core/endpoint/promotion/get_signed_creds/get_signed_creds.h" +#include #include #include "base/json/json_reader.h" @@ -61,7 +62,7 @@ mojom::Result GetSignedCreds::ParseBody(const std::string& body, mojom::CredsBatch* batch) { DCHECK(batch); - absl::optional value = base::JSONReader::Read(body); + std::optional value = base::JSONReader::Read(body); if (!value || !value->is_dict()) { BLOG(0, "Invalid JSON"); return mojom::Result::FAILED; diff --git a/components/brave_rewards/core/endpoint/promotion/post_captcha/post_captcha.cc b/components/brave_rewards/core/endpoint/promotion/post_captcha/post_captcha.cc index de6690cf64a..155f02d44fa 100644 --- a/components/brave_rewards/core/endpoint/promotion/post_captcha/post_captcha.cc +++ b/components/brave_rewards/core/endpoint/promotion/post_captcha/post_captcha.cc @@ -4,6 +4,7 @@ * You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "brave/components/brave_rewards/core/endpoint/promotion/post_captcha/post_captcha.h" +#include #include #include "base/json/json_reader.h" @@ -61,7 +62,7 @@ mojom::Result PostCaptcha::ParseBody(const std::string& body, std::string* captcha_id) { DCHECK(hint && captcha_id); - absl::optional value = base::JSONReader::Read(body); + std::optional value = base::JSONReader::Read(body); if (!value || !value->is_dict()) { BLOG(0, "Invalid JSON"); return mojom::Result::FAILED; diff --git a/components/brave_rewards/core/endpoint/promotion/post_creds/post_creds.cc b/components/brave_rewards/core/endpoint/promotion/post_creds/post_creds.cc index 1603edc9d44..db4551ac95c 100644 --- a/components/brave_rewards/core/endpoint/promotion/post_creds/post_creds.cc +++ b/components/brave_rewards/core/endpoint/promotion/post_creds/post_creds.cc @@ -3,13 +3,15 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include "brave/components/brave_rewards/core/endpoint/promotion/post_creds/post_creds.h" + +#include #include #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/common/request_util.h" -#include "brave/components/brave_rewards/core/endpoint/promotion/post_creds/post_creds.h" #include "brave/components/brave_rewards/core/endpoint/promotion/promotions_util.h" #include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/wallet/wallet.h" @@ -85,7 +87,7 @@ mojom::Result PostCreds::ParseBody(const std::string& body, std::string* claim_id) { DCHECK(claim_id); - absl::optional value = base::JSONReader::Read(body); + std::optional value = base::JSONReader::Read(body); if (!value || !value->is_dict()) { BLOG(0, "Invalid JSON"); return mojom::Result::FAILED; diff --git a/components/brave_rewards/core/endpoint/promotion/post_devicecheck/post_devicecheck.cc b/components/brave_rewards/core/endpoint/promotion/post_devicecheck/post_devicecheck.cc index 820dd47b10a..488ecb822bc 100644 --- a/components/brave_rewards/core/endpoint/promotion/post_devicecheck/post_devicecheck.cc +++ b/components/brave_rewards/core/endpoint/promotion/post_devicecheck/post_devicecheck.cc @@ -4,6 +4,7 @@ * You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "brave/components/brave_rewards/core/endpoint/promotion/post_devicecheck/post_devicecheck.h" +#include #include #include "base/json/json_reader.h" @@ -67,7 +68,7 @@ mojom::Result PostDevicecheck::ParseBody(const std::string& body, std::string* nonce) { DCHECK(nonce); - absl::optional value = base::JSONReader::Read(body); + std::optional value = base::JSONReader::Read(body); if (!value || !value->is_dict()) { BLOG(0, "Invalid JSON"); return mojom::Result::FAILED; diff --git a/components/brave_rewards/core/endpoint/promotion/post_safetynet/post_safetynet.cc b/components/brave_rewards/core/endpoint/promotion/post_safetynet/post_safetynet.cc index 55b8ceed710..d81483e328b 100644 --- a/components/brave_rewards/core/endpoint/promotion/post_safetynet/post_safetynet.cc +++ b/components/brave_rewards/core/endpoint/promotion/post_safetynet/post_safetynet.cc @@ -4,6 +4,7 @@ * You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "brave/components/brave_rewards/core/endpoint/promotion/post_safetynet/post_safetynet.h" +#include #include #include "base/json/json_reader.h" @@ -68,7 +69,7 @@ mojom::Result PostSafetynet::ParseBody(const std::string& body, std::string* nonce) { DCHECK(nonce); - absl::optional value = base::JSONReader::Read(body); + std::optional value = base::JSONReader::Read(body); if (!value || !value->is_dict()) { BLOG(0, "Invalid JSON"); return mojom::Result::FAILED; diff --git a/components/brave_rewards/core/endpoint/promotion/post_suggestions_claim/post_suggestions_claim.cc b/components/brave_rewards/core/endpoint/promotion/post_suggestions_claim/post_suggestions_claim.cc index 3afc195bd98..effe367fd95 100644 --- a/components/brave_rewards/core/endpoint/promotion/post_suggestions_claim/post_suggestions_claim.cc +++ b/components/brave_rewards/core/endpoint/promotion/post_suggestions_claim/post_suggestions_claim.cc @@ -4,6 +4,7 @@ * You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "brave/components/brave_rewards/core/endpoint/promotion/post_suggestions_claim/post_suggestions_claim.h" +#include #include #include "base/json/json_reader.h" @@ -107,7 +108,7 @@ void PostSuggestionsClaim::OnRequest(PostSuggestionsClaimCallback callback, return; } - absl::optional value = base::JSONReader::Read(response->body); + std::optional value = base::JSONReader::Read(response->body); if (!value || !value->is_dict()) { BLOG(0, "Invalid JSON"); std::move(callback).Run(mojom::Result::FAILED, ""); diff --git a/components/brave_rewards/core/endpoint/uphold/get_capabilities/get_capabilities_unittest.cc b/components/brave_rewards/core/endpoint/uphold/get_capabilities/get_capabilities_unittest.cc index 2746fabece1..1a48dc1764b 100644 --- a/components/brave_rewards/core/endpoint/uphold/get_capabilities/get_capabilities_unittest.cc +++ b/components/brave_rewards/core/endpoint/uphold/get_capabilities/get_capabilities_unittest.cc @@ -3,13 +3,15 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include "brave/components/brave_rewards/core/endpoint/uphold/get_capabilities/get_capabilities.h" + #include +#include #include #include #include "base/test/mock_callback.h" #include "base/test/task_environment.h" -#include "brave/components/brave_rewards/core/endpoint/uphold/get_capabilities/get_capabilities.h" #include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" #include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "brave/components/brave_rewards/core/uphold/uphold_capabilities.h" @@ -356,8 +358,8 @@ TEST_F(GetCapabilitiesTest, ServerReturns401Unauthorized) { .Times(1) .WillOnce([](mojom::Result result, Capabilities capabilities) { EXPECT_EQ(result, mojom::Result::EXPIRED_TOKEN); - EXPECT_EQ(capabilities.can_receive, absl::nullopt); - EXPECT_EQ(capabilities.can_send, absl::nullopt); + EXPECT_EQ(capabilities.can_receive, std::nullopt); + EXPECT_EQ(capabilities.can_send, std::nullopt); }); get_capabilities_.Request("193a77cf-02e8-4e10-8127-8a1b5a8bfece", callback.Get()); @@ -379,8 +381,8 @@ TEST_F(GetCapabilitiesTest, ServerReturnsUnexpectedHTTPStatus) { .Times(1) .WillOnce([](mojom::Result result, Capabilities capabilities) { EXPECT_EQ(result, mojom::Result::FAILED); - EXPECT_EQ(capabilities.can_receive, absl::nullopt); - EXPECT_EQ(capabilities.can_send, absl::nullopt); + EXPECT_EQ(capabilities.can_receive, std::nullopt); + EXPECT_EQ(capabilities.can_send, std::nullopt); }); get_capabilities_.Request("193a77cf-02e8-4e10-8127-8a1b5a8bfece", callback.Get()); diff --git a/components/brave_rewards/core/endpoint/uphold/get_card/get_card.cc b/components/brave_rewards/core/endpoint/uphold/get_card/get_card.cc index 8fdca74f91b..94c2da57113 100644 --- a/components/brave_rewards/core/endpoint/uphold/get_card/get_card.cc +++ b/components/brave_rewards/core/endpoint/uphold/get_card/get_card.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_rewards/core/endpoint/uphold/get_card/get_card.h" +#include #include #include "base/json/json_reader.h" @@ -48,7 +49,7 @@ mojom::Result GetCard::CheckStatusCode(const int status_code) { mojom::Result GetCard::ParseBody(const std::string& body, double* available) { DCHECK(available); - absl::optional value = base::JSONReader::Read(body); + std::optional value = base::JSONReader::Read(body); if (!value || !value->is_dict()) { BLOG(0, "Invalid JSON"); return mojom::Result::FAILED; diff --git a/components/brave_rewards/core/endpoint/uphold/get_cards/get_cards.cc b/components/brave_rewards/core/endpoint/uphold/get_cards/get_cards.cc index 5043db125e4..744bfdfed17 100644 --- a/components/brave_rewards/core/endpoint/uphold/get_cards/get_cards.cc +++ b/components/brave_rewards/core/endpoint/uphold/get_cards/get_cards.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_rewards/core/endpoint/uphold/get_cards/get_cards.h" +#include #include #include "base/json/json_reader.h" @@ -42,7 +43,7 @@ mojom::Result GetCards::ParseBody(const std::string& body, std::string* id) const { DCHECK(id); - absl::optional value = base::JSONReader::Read(body); + std::optional value = base::JSONReader::Read(body); if (!value || !value->is_list()) { BLOG(0, "Invalid JSON"); return mojom::Result::FAILED; diff --git a/components/brave_rewards/core/endpoint/uphold/get_me/get_me.cc b/components/brave_rewards/core/endpoint/uphold/get_me/get_me.cc index 42b2136ef0a..9728c7ab31b 100644 --- a/components/brave_rewards/core/endpoint/uphold/get_me/get_me.cc +++ b/components/brave_rewards/core/endpoint/uphold/get_me/get_me.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_rewards/core/endpoint/uphold/get_me/get_me.h" +#include #include #include "base/containers/contains.h" @@ -44,7 +45,7 @@ mojom::Result GetMe::ParseBody(const std::string& body, internal::uphold::User* user) { DCHECK(user); - absl::optional value = base::JSONReader::Read(body); + std::optional value = base::JSONReader::Read(body); if (!value || !value->is_dict()) { BLOG(0, "Invalid JSON"); return mojom::Result::FAILED; diff --git a/components/brave_rewards/core/endpoint/uphold/post_cards/post_cards.cc b/components/brave_rewards/core/endpoint/uphold/post_cards/post_cards.cc index 083824ab608..58037fd94e3 100644 --- a/components/brave_rewards/core/endpoint/uphold/post_cards/post_cards.cc +++ b/components/brave_rewards/core/endpoint/uphold/post_cards/post_cards.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_rewards/core/endpoint/uphold/post_cards/post_cards.h" +#include #include #include "base/json/json_reader.h" @@ -52,7 +53,7 @@ mojom::Result PostCards::ParseBody(const std::string& body, std::string* id) const { DCHECK(id); - absl::optional value = base::JSONReader::Read(body); + std::optional value = base::JSONReader::Read(body); if (!value || !value->is_dict()) { BLOG(0, "Invalid JSON"); return mojom::Result::FAILED; diff --git a/components/brave_rewards/core/endpoints/bitflyer/post_commit_transaction_bitflyer.cc b/components/brave_rewards/core/endpoints/bitflyer/post_commit_transaction_bitflyer.cc index d79f58346cf..35e0ebbf834 100644 --- a/components/brave_rewards/core/endpoints/bitflyer/post_commit_transaction_bitflyer.cc +++ b/components/brave_rewards/core/endpoints/bitflyer/post_commit_transaction_bitflyer.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_rewards/core/endpoints/bitflyer/post_commit_transaction_bitflyer.h" +#include #include #include "base/json/json_reader.h" @@ -56,17 +57,17 @@ Result PostCommitTransactionBitFlyer::ProcessResponse( } } -absl::optional PostCommitTransactionBitFlyer::Url() const { +std::optional PostCommitTransactionBitFlyer::Url() const { return endpoint::bitflyer::GetServerUrl( "/api/link/v1/coin/withdraw-to-deposit-id/request"); } -absl::optional> PostCommitTransactionBitFlyer::Headers( +std::optional> PostCommitTransactionBitFlyer::Headers( const std::string&) const { return endpoint::bitflyer::RequestAuthorization(token_); } -absl::optional PostCommitTransactionBitFlyer::Content() const { +std::optional PostCommitTransactionBitFlyer::Content() const { base::Value::Dict payload; payload.Set("currency_code", "BAT"); payload.Set("amount", transaction_->amount); @@ -76,7 +77,7 @@ absl::optional PostCommitTransactionBitFlyer::Content() const { std::string json; if (!base::JSONWriter::Write(payload, &json)) { - return absl::nullopt; + return std::nullopt; } return json; diff --git a/components/brave_rewards/core/endpoints/bitflyer/post_commit_transaction_bitflyer.h b/components/brave_rewards/core/endpoints/bitflyer/post_commit_transaction_bitflyer.h index 687da7ed7d2..78f4dc27681 100644 --- a/components/brave_rewards/core/endpoints/bitflyer/post_commit_transaction_bitflyer.h +++ b/components/brave_rewards/core/endpoints/bitflyer/post_commit_transaction_bitflyer.h @@ -6,13 +6,13 @@ #ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_ENDPOINTS_BITFLYER_POST_COMMIT_TRANSACTION_BITFLYER_H_ #define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_ENDPOINTS_BITFLYER_POST_COMMIT_TRANSACTION_BITFLYER_H_ +#include #include #include #include "brave/components/brave_rewards/common/mojom/rewards_core.mojom.h" #include "brave/components/brave_rewards/core/endpoints/common/post_commit_transaction.h" #include "brave/components/brave_rewards/core/endpoints/response_handler.h" -#include "third_party/abseil-cpp/absl/types/optional.h" // POST /api/link/v1/coin/withdraw-to-deposit-id/request // @@ -54,10 +54,10 @@ class PostCommitTransactionBitFlyer final static Result ProcessResponse(const mojom::UrlResponse&); private: - absl::optional Url() const override; - absl::optional> Headers( + std::optional Url() const override; + std::optional> Headers( const std::string& content) const override; - absl::optional Content() const override; + std::optional Content() const override; std::string ContentType() const override; }; diff --git a/components/brave_rewards/core/endpoints/brave/get_parameters.cc b/components/brave_rewards/core/endpoints/brave/get_parameters.cc index 296e0019b5f..4338bdcee84 100644 --- a/components/brave_rewards/core/endpoints/brave/get_parameters.cc +++ b/components/brave_rewards/core/endpoints/brave/get_parameters.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_rewards/core/endpoints/brave/get_parameters.h" +#include #include #include "base/json/json_reader.h" @@ -145,7 +146,7 @@ GetParameters::GetParameters(RewardsEngineImpl& engine) GetParameters::~GetParameters() = default; -absl::optional GetParameters::Url() const { +std::optional GetParameters::Url() const { return endpoint::api::GetServerUrl("/v1/parameters"); } diff --git a/components/brave_rewards/core/endpoints/brave/get_parameters.h b/components/brave_rewards/core/endpoints/brave/get_parameters.h index beb7d0eda78..d62bf12a077 100644 --- a/components/brave_rewards/core/endpoints/brave/get_parameters.h +++ b/components/brave_rewards/core/endpoints/brave/get_parameters.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_ENDPOINTS_BRAVE_GET_PARAMETERS_H_ #define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_ENDPOINTS_BRAVE_GET_PARAMETERS_H_ +#include #include #include "brave/components/brave_rewards/common/mojom/rewards.mojom.h" @@ -13,7 +14,6 @@ #include "brave/components/brave_rewards/core/endpoints/request_builder.h" #include "brave/components/brave_rewards/core/endpoints/response_handler.h" #include "brave/components/brave_rewards/core/endpoints/result_for.h" -#include "third_party/abseil-cpp/absl/types/optional.h" // GET /v1/parameters // @@ -78,7 +78,7 @@ class GetParameters final : public RequestBuilder, ~GetParameters() override; private: - absl::optional Url() const override; + std::optional Url() const override; mojom::UrlMethod Method() const override; }; diff --git a/components/brave_rewards/core/endpoints/brave/get_parameters_utils.cc b/components/brave_rewards/core/endpoints/brave/get_parameters_utils.cc index fd90d59e481..f841f874fc9 100644 --- a/components/brave_rewards/core/endpoints/brave/get_parameters_utils.cc +++ b/components/brave_rewards/core/endpoints/brave/get_parameters_utils.cc @@ -3,10 +3,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include "brave/components/brave_rewards/core/endpoints/brave/get_parameters_utils.h" + +#include #include #include -#include "brave/components/brave_rewards/core/endpoints/brave/get_parameters_utils.h" #include "brave/components/brave_rewards/core/rewards_engine_impl.h" namespace { @@ -30,14 +32,14 @@ std::vector GetList(const std::string& list_name, namespace brave_rewards::internal::endpoints { -absl::optional> +std::optional> GetWalletProviderRegions(const base::Value::Dict& dict) { base::flat_map wallet_provider_regions; for (const auto [wallet_provider, regions] : dict) { const auto* regions_dict = regions.GetIfDict(); if (!regions_dict) { - return absl::nullopt; + return std::nullopt; } wallet_provider_regions.emplace( diff --git a/components/brave_rewards/core/endpoints/brave/get_parameters_utils.h b/components/brave_rewards/core/endpoints/brave/get_parameters_utils.h index ec8705ffaba..58a13e48985 100644 --- a/components/brave_rewards/core/endpoints/brave/get_parameters_utils.h +++ b/components/brave_rewards/core/endpoints/brave/get_parameters_utils.h @@ -6,16 +6,16 @@ #ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_ENDPOINTS_BRAVE_GET_PARAMETERS_UTILS_H_ #define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_ENDPOINTS_BRAVE_GET_PARAMETERS_UTILS_H_ +#include #include #include "base/containers/flat_map.h" #include "base/values.h" #include "brave/components/brave_rewards/common/mojom/rewards.mojom.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_rewards::internal::endpoints { -absl::optional> +std::optional> GetWalletProviderRegions(const base::Value::Dict&); } // namespace brave_rewards::internal::endpoints diff --git a/components/brave_rewards/core/endpoints/brave/get_wallet.cc b/components/brave_rewards/core/endpoints/brave/get_wallet.cc index ec98449f53d..02ab45380e7 100644 --- a/components/brave_rewards/core/endpoints/brave/get_wallet.cc +++ b/components/brave_rewards/core/endpoints/brave/get_wallet.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_rewards/core/endpoints/brave/get_wallet.h" +#include #include #include "base/json/json_reader.h" @@ -78,11 +79,11 @@ std::string GetWallet::Path() const { return "/v4/wallets/"; } -absl::optional GetWallet::Url() const { +std::optional GetWallet::Url() const { const auto wallet = engine_->wallet()->GetWallet(); if (!wallet) { BLOG(0, "Rewards wallet is null!"); - return absl::nullopt; + return std::nullopt; } return endpoint::promotion::GetServerUrl(Path() + wallet->payment_id); @@ -92,12 +93,12 @@ mojom::UrlMethod GetWallet::Method() const { return mojom::UrlMethod::GET; } -absl::optional> GetWallet::Headers( +std::optional> GetWallet::Headers( const std::string& content) const { const auto wallet = engine_->wallet()->GetWallet(); if (!wallet) { BLOG(0, "Rewards wallet is null!"); - return absl::nullopt; + return std::nullopt; } DCHECK(!wallet->payment_id.empty()); diff --git a/components/brave_rewards/core/endpoints/brave/get_wallet.h b/components/brave_rewards/core/endpoints/brave/get_wallet.h index 1747dc602c6..4668daa3b68 100644 --- a/components/brave_rewards/core/endpoints/brave/get_wallet.h +++ b/components/brave_rewards/core/endpoints/brave/get_wallet.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_ENDPOINTS_BRAVE_GET_WALLET_H_ #define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_ENDPOINTS_BRAVE_GET_WALLET_H_ +#include #include #include #include @@ -15,7 +16,6 @@ #include "brave/components/brave_rewards/core/endpoints/request_builder.h" #include "brave/components/brave_rewards/core/endpoints/response_handler.h" #include "brave/components/brave_rewards/core/endpoints/result_for.h" -#include "third_party/abseil-cpp/absl/types/optional.h" // GET /v4/wallets/{payment_id} // @@ -61,9 +61,9 @@ class GetWallet final : public RequestBuilder, private: std::string Path() const; - absl::optional Url() const override; + std::optional Url() const override; mojom::UrlMethod Method() const override; - absl::optional> Headers( + std::optional> Headers( const std::string& content) const override; }; diff --git a/components/brave_rewards/core/endpoints/brave/patch_wallets.cc b/components/brave_rewards/core/endpoints/brave/patch_wallets.cc index 459c6602600..fc1150a513c 100644 --- a/components/brave_rewards/core/endpoints/brave/patch_wallets.cc +++ b/components/brave_rewards/core/endpoints/brave/patch_wallets.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_rewards/core/endpoints/brave/patch_wallets.h" +#include #include #include "base/json/json_reader.h" @@ -89,11 +90,11 @@ const char* PatchWallets::Path() const { return "/v4/wallets/%s"; } -absl::optional PatchWallets::Url() const { +std::optional PatchWallets::Url() const { const auto wallet = engine_->wallet()->GetWallet(); if (!wallet) { BLOG(0, "Rewards wallet is null!"); - return absl::nullopt; + return std::nullopt; } DCHECK(!wallet->payment_id.empty()); @@ -106,12 +107,12 @@ mojom::UrlMethod PatchWallets::Method() const { return mojom::UrlMethod::PATCH; } -absl::optional> PatchWallets::Headers( +std::optional> PatchWallets::Headers( const std::string& content) const { const auto wallet = engine_->wallet()->GetWallet(); if (!wallet) { BLOG(0, "Rewards wallet is null!"); - return absl::nullopt; + return std::nullopt; } DCHECK(!wallet->payment_id.empty()); @@ -122,10 +123,10 @@ absl::optional> PatchWallets::Headers( content, wallet->payment_id, wallet->recovery_seed); } -absl::optional PatchWallets::Content() const { +std::optional PatchWallets::Content() const { if (geo_country_.empty()) { BLOG(0, "geo_country_ is empty!"); - return absl::nullopt; + return std::nullopt; } base::Value::Dict content; @@ -134,7 +135,7 @@ absl::optional PatchWallets::Content() const { std::string json; if (!base::JSONWriter::Write(content, &json)) { BLOG(0, "Failed to write content to JSON!"); - return absl::nullopt; + return std::nullopt; } return json; diff --git a/components/brave_rewards/core/endpoints/brave/patch_wallets.h b/components/brave_rewards/core/endpoints/brave/patch_wallets.h index 18aa770bde4..4bc7dd79998 100644 --- a/components/brave_rewards/core/endpoints/brave/patch_wallets.h +++ b/components/brave_rewards/core/endpoints/brave/patch_wallets.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_ENDPOINTS_BRAVE_PATCH_WALLETS_H_ #define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_ENDPOINTS_BRAVE_PATCH_WALLETS_H_ +#include #include #include @@ -14,7 +15,6 @@ #include "brave/components/brave_rewards/core/endpoints/request_builder.h" #include "brave/components/brave_rewards/core/endpoints/response_handler.h" #include "brave/components/brave_rewards/core/endpoints/result_for.h" -#include "third_party/abseil-cpp/absl/types/optional.h" // PATCH /v4/wallets/ // @@ -49,11 +49,11 @@ class PatchWallets final : public RequestBuilder, private: const char* Path() const; - absl::optional Url() const override; + std::optional Url() const override; mojom::UrlMethod Method() const override; - absl::optional> Headers( + std::optional> Headers( const std::string& content) const override; - absl::optional Content() const override; + std::optional Content() const override; std::string ContentType() const override; std::string geo_country_; diff --git a/components/brave_rewards/core/endpoints/brave/post_connect_bitflyer.cc b/components/brave_rewards/core/endpoints/brave/post_connect_bitflyer.cc index a94173149a9..04ceac8a7e2 100644 --- a/components/brave_rewards/core/endpoints/brave/post_connect_bitflyer.cc +++ b/components/brave_rewards/core/endpoints/brave/post_connect_bitflyer.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_rewards/core/endpoints/brave/post_connect_bitflyer.h" +#include #include #include "base/json/json_writer.h" @@ -18,10 +19,10 @@ PostConnectBitflyer::PostConnectBitflyer(RewardsEngineImpl& engine, PostConnectBitflyer::~PostConnectBitflyer() = default; -absl::optional PostConnectBitflyer::Content() const { +std::optional PostConnectBitflyer::Content() const { if (linking_info_.empty()) { BLOG(0, "linking_info_ is empty!"); - return absl::nullopt; + return std::nullopt; } base::Value::Dict content; @@ -30,7 +31,7 @@ absl::optional PostConnectBitflyer::Content() const { std::string json; if (!base::JSONWriter::Write(content, &json)) { BLOG(0, "Failed to write content to JSON!"); - return absl::nullopt; + return std::nullopt; } return json; diff --git a/components/brave_rewards/core/endpoints/brave/post_connect_bitflyer.h b/components/brave_rewards/core/endpoints/brave/post_connect_bitflyer.h index 0d16751e8c4..0ada48062b4 100644 --- a/components/brave_rewards/core/endpoints/brave/post_connect_bitflyer.h +++ b/components/brave_rewards/core/endpoints/brave/post_connect_bitflyer.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_ENDPOINTS_BRAVE_POST_CONNECT_BITFLYER_H_ #define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_ENDPOINTS_BRAVE_POST_CONNECT_BITFLYER_H_ +#include #include #include "brave/components/brave_rewards/core/endpoints/common/post_connect.h" @@ -35,7 +36,7 @@ class PostConnectBitflyer final : public PostConnect { ~PostConnectBitflyer() override; private: - absl::optional Content() const override; + std::optional Content() const override; const char* Path() const override; diff --git a/components/brave_rewards/core/endpoints/brave/post_connect_gemini.cc b/components/brave_rewards/core/endpoints/brave/post_connect_gemini.cc index 3eb57902459..49978b060eb 100644 --- a/components/brave_rewards/core/endpoints/brave/post_connect_gemini.cc +++ b/components/brave_rewards/core/endpoints/brave/post_connect_gemini.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_rewards/core/endpoints/brave/post_connect_gemini.h" +#include #include #include "base/json/json_writer.h" @@ -21,15 +22,15 @@ PostConnectGemini::PostConnectGemini(RewardsEngineImpl& engine, PostConnectGemini::~PostConnectGemini() = default; -absl::optional PostConnectGemini::Content() const { +std::optional PostConnectGemini::Content() const { if (linking_info_.empty()) { BLOG(0, "linking_info_ is empty!"); - return absl::nullopt; + return std::nullopt; } if (recipient_id_.empty()) { BLOG(0, "recipient_id_ is empty!"); - return absl::nullopt; + return std::nullopt; } base::Value::Dict content; @@ -39,7 +40,7 @@ absl::optional PostConnectGemini::Content() const { std::string json; if (!base::JSONWriter::Write(content, &json)) { BLOG(0, "Failed to write content to JSON!"); - return absl::nullopt; + return std::nullopt; } return json; diff --git a/components/brave_rewards/core/endpoints/brave/post_connect_gemini.h b/components/brave_rewards/core/endpoints/brave/post_connect_gemini.h index 95415ab0503..d2926eb3ed0 100644 --- a/components/brave_rewards/core/endpoints/brave/post_connect_gemini.h +++ b/components/brave_rewards/core/endpoints/brave/post_connect_gemini.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_ENDPOINTS_BRAVE_POST_CONNECT_GEMINI_H_ #define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_ENDPOINTS_BRAVE_POST_CONNECT_GEMINI_H_ +#include #include #include "brave/components/brave_rewards/core/endpoints/common/post_connect.h" @@ -38,7 +39,7 @@ class PostConnectGemini final : public PostConnect { ~PostConnectGemini() override; private: - absl::optional Content() const override; + std::optional Content() const override; const char* Path() const override; diff --git a/components/brave_rewards/core/endpoints/brave/post_connect_uphold.cc b/components/brave_rewards/core/endpoints/brave/post_connect_uphold.cc index 4f154a035a5..044a479fed4 100644 --- a/components/brave_rewards/core/endpoints/brave/post_connect_uphold.cc +++ b/components/brave_rewards/core/endpoints/brave/post_connect_uphold.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_rewards/core/endpoints/brave/post_connect_uphold.h" +#include #include #include "base/base64.h" @@ -21,16 +22,16 @@ PostConnectUphold::PostConnectUphold(RewardsEngineImpl& engine, PostConnectUphold::~PostConnectUphold() = default; -absl::optional PostConnectUphold::Content() const { +std::optional PostConnectUphold::Content() const { if (address_.empty()) { BLOG(0, "address_ is empty!"); - return absl::nullopt; + return std::nullopt; } const auto wallet = engine_->wallet()->GetWallet(); if (!wallet) { BLOG(0, "Rewards wallet is null!"); - return absl::nullopt; + return std::nullopt; } DCHECK(!wallet->recovery_seed.empty()); @@ -46,7 +47,7 @@ absl::optional PostConnectUphold::Content() const { std::string octets; if (!base::JSONWriter::Write(body, &octets)) { BLOG(0, "Failed to write octets to JSON!"); - return absl::nullopt; + return std::nullopt; } std::string digest = util::Security::DigestValue(octets); @@ -54,7 +55,7 @@ absl::optional PostConnectUphold::Content() const { {{{"digest", digest}}}, "primary", wallet->recovery_seed); if (signature.empty()) { BLOG(0, "Failed to create signature!"); - return absl::nullopt; + return std::nullopt; } base::Value::Dict headers; @@ -69,7 +70,7 @@ absl::optional PostConnectUphold::Content() const { std::string json_request; if (!base::JSONWriter::Write(std::move(request), &json_request)) { BLOG(0, "Failed to write request to JSON!"); - return absl::nullopt; + return std::nullopt; } std::string signedLinkingRequest; @@ -81,13 +82,13 @@ absl::optional PostConnectUphold::Content() const { std::string json; if (!base::JSONWriter::Write(std::move(content), &json)) { BLOG(0, "Failed to write content to JSON!"); - return absl::nullopt; + return std::nullopt; } return json; } -absl::optional> PostConnectUphold::Headers( +std::optional> PostConnectUphold::Headers( const std::string&) const { return std::vector{}; } diff --git a/components/brave_rewards/core/endpoints/brave/post_connect_uphold.h b/components/brave_rewards/core/endpoints/brave/post_connect_uphold.h index 05063cf71ee..a108a7b15b9 100644 --- a/components/brave_rewards/core/endpoints/brave/post_connect_uphold.h +++ b/components/brave_rewards/core/endpoints/brave/post_connect_uphold.h @@ -6,11 +6,11 @@ #ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_ENDPOINTS_BRAVE_POST_CONNECT_UPHOLD_H_ #define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_ENDPOINTS_BRAVE_POST_CONNECT_UPHOLD_H_ +#include #include #include #include "brave/components/brave_rewards/core/endpoints/common/post_connect.h" -#include "third_party/abseil-cpp/absl/types/optional.h" // POST /v3/wallet/uphold/{rewards_payment_id}/claim // @@ -54,8 +54,8 @@ class PostConnectUphold final : public PostConnect { ~PostConnectUphold() override; private: - absl::optional Content() const override; - absl::optional> Headers( + std::optional Content() const override; + std::optional> Headers( const std::string& content) const override; const char* Path() const override; diff --git a/components/brave_rewards/core/endpoints/brave/post_connect_zebpay.cc b/components/brave_rewards/core/endpoints/brave/post_connect_zebpay.cc index c51722c35d8..92aebcee4fe 100644 --- a/components/brave_rewards/core/endpoints/brave/post_connect_zebpay.cc +++ b/components/brave_rewards/core/endpoints/brave/post_connect_zebpay.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_rewards/core/endpoints/brave/post_connect_zebpay.h" +#include #include #include "base/json/json_writer.h" @@ -18,10 +19,10 @@ PostConnectZebPay::PostConnectZebPay(RewardsEngineImpl& engine, PostConnectZebPay::~PostConnectZebPay() = default; -absl::optional PostConnectZebPay::Content() const { +std::optional PostConnectZebPay::Content() const { if (linking_info_.empty()) { BLOG(0, "linking_info_ is empty!"); - return absl::nullopt; + return std::nullopt; } base::Value::Dict content; @@ -30,7 +31,7 @@ absl::optional PostConnectZebPay::Content() const { std::string json; if (!base::JSONWriter::Write(content, &json)) { BLOG(0, "Failed to write content to JSON!"); - return absl::nullopt; + return std::nullopt; } return json; diff --git a/components/brave_rewards/core/endpoints/brave/post_connect_zebpay.h b/components/brave_rewards/core/endpoints/brave/post_connect_zebpay.h index 033f622f352..39d45167f98 100644 --- a/components/brave_rewards/core/endpoints/brave/post_connect_zebpay.h +++ b/components/brave_rewards/core/endpoints/brave/post_connect_zebpay.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_ENDPOINTS_BRAVE_POST_CONNECT_ZEBPAY_H_ #define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_ENDPOINTS_BRAVE_POST_CONNECT_ZEBPAY_H_ +#include #include #include "brave/components/brave_rewards/core/endpoints/common/post_connect.h" @@ -35,7 +36,7 @@ class PostConnectZebPay final : public PostConnect { ~PostConnectZebPay() override; private: - absl::optional Content() const override; + std::optional Content() const override; const char* Path() const override; diff --git a/components/brave_rewards/core/endpoints/brave/post_wallets.cc b/components/brave_rewards/core/endpoints/brave/post_wallets.cc index 21352e1103b..a8193b1c990 100644 --- a/components/brave_rewards/core/endpoints/brave/post_wallets.cc +++ b/components/brave_rewards/core/endpoints/brave/post_wallets.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_rewards/core/endpoints/brave/post_wallets.h" +#include #include #include "base/json/json_reader.h" @@ -67,7 +68,7 @@ Result PostWallets::ProcessResponse(const mojom::UrlResponse& response) { } PostWallets::PostWallets(RewardsEngineImpl& engine, - absl::optional&& geo_country) + std::optional&& geo_country) : RequestBuilder(engine), geo_country_(std::move(geo_country)) {} PostWallets::~PostWallets() = default; @@ -76,16 +77,16 @@ const char* PostWallets::Path() const { return geo_country_ ? "/v4/wallets" : "/v3/wallet/brave"; } -absl::optional PostWallets::Url() const { +std::optional PostWallets::Url() const { return endpoint::promotion::GetServerUrl(Path()); } -absl::optional> PostWallets::Headers( +std::optional> PostWallets::Headers( const std::string& content) const { const auto wallet = engine_->wallet()->GetWallet(); if (!wallet) { BLOG(0, "Rewards wallet is null!"); - return absl::nullopt; + return std::nullopt; } DCHECK(!wallet->recovery_seed.empty()); @@ -96,7 +97,7 @@ absl::optional> PostWallets::Headers( wallet->recovery_seed); } -absl::optional PostWallets::Content() const { +std::optional PostWallets::Content() const { if (!geo_country_) { BLOG(1, "geo_country_ is null - creating old wallet."); return ""; @@ -104,7 +105,7 @@ absl::optional PostWallets::Content() const { if (geo_country_->empty()) { BLOG(0, "geo_country_ is empty!"); - return absl::nullopt; + return std::nullopt; } base::Value::Dict content; @@ -113,7 +114,7 @@ absl::optional PostWallets::Content() const { std::string json; if (!base::JSONWriter::Write(content, &json)) { BLOG(0, "Failed to write content to JSON!"); - return absl::nullopt; + return std::nullopt; } return json; diff --git a/components/brave_rewards/core/endpoints/brave/post_wallets.h b/components/brave_rewards/core/endpoints/brave/post_wallets.h index 4259c93eb01..5104a627b84 100644 --- a/components/brave_rewards/core/endpoints/brave/post_wallets.h +++ b/components/brave_rewards/core/endpoints/brave/post_wallets.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_ENDPOINTS_BRAVE_POST_WALLETS_H_ #define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_ENDPOINTS_BRAVE_POST_WALLETS_H_ +#include #include #include @@ -14,7 +15,6 @@ #include "brave/components/brave_rewards/core/endpoints/request_builder.h" #include "brave/components/brave_rewards/core/endpoints/response_handler.h" #include "brave/components/brave_rewards/core/endpoints/result_for.h" -#include "third_party/abseil-cpp/absl/types/optional.h" // POST /v4/wallets // @@ -49,19 +49,19 @@ class PostWallets final : public RequestBuilder, static Result ProcessResponse(const mojom::UrlResponse&); PostWallets(RewardsEngineImpl& engine, - absl::optional&& geo_country); + std::optional&& geo_country); ~PostWallets() override; private: const char* Path() const; - absl::optional Url() const override; - absl::optional> Headers( + std::optional Url() const override; + std::optional> Headers( const std::string& content) const override; - absl::optional Content() const override; + std::optional Content() const override; std::string ContentType() const override; - absl::optional geo_country_; + std::optional geo_country_; }; } // namespace endpoints diff --git a/components/brave_rewards/core/endpoints/common/post_connect.cc b/components/brave_rewards/core/endpoints/common/post_connect.cc index 573e514c0dd..bc09a874629 100644 --- a/components/brave_rewards/core/endpoints/common/post_connect.cc +++ b/components/brave_rewards/core/endpoints/common/post_connect.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_rewards/core/endpoints/common/post_connect.h" +#include #include #include "base/json/json_reader.h" @@ -168,11 +169,11 @@ PostConnect::PostConnect(RewardsEngineImpl& engine) : RequestBuilder(engine) {} PostConnect::~PostConnect() = default; -absl::optional PostConnect::Url() const { +std::optional PostConnect::Url() const { const auto wallet = engine_->wallet()->GetWallet(); if (!wallet) { BLOG(0, "Rewards wallet is null!"); - return absl::nullopt; + return std::nullopt; } DCHECK(!wallet->payment_id.empty()); @@ -181,12 +182,12 @@ absl::optional PostConnect::Url() const { base::StringPrintf(Path(), wallet->payment_id.c_str())); } -absl::optional> PostConnect::Headers( +std::optional> PostConnect::Headers( const std::string& content) const { const auto wallet = engine_->wallet()->GetWallet(); if (!wallet) { BLOG(0, "Rewards wallet is null!"); - return absl::nullopt; + return std::nullopt; } DCHECK(!wallet->payment_id.empty()); diff --git a/components/brave_rewards/core/endpoints/common/post_connect.h b/components/brave_rewards/core/endpoints/common/post_connect.h index 36b934c2a92..877f5bee041 100644 --- a/components/brave_rewards/core/endpoints/common/post_connect.h +++ b/components/brave_rewards/core/endpoints/common/post_connect.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_ENDPOINTS_COMMON_POST_CONNECT_H_ #define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_ENDPOINTS_COMMON_POST_CONNECT_H_ +#include #include #include @@ -14,7 +15,6 @@ #include "brave/components/brave_rewards/core/endpoints/request_builder.h" #include "brave/components/brave_rewards/core/endpoints/response_handler.h" #include "brave/components/brave_rewards/core/endpoints/result_for.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_rewards::internal { class RewardsEngineImpl; @@ -42,8 +42,8 @@ class PostConnect : public RequestBuilder, public ResponseHandler { virtual const char* Path() const = 0; private: - absl::optional Url() const override; - absl::optional> Headers( + std::optional Url() const override; + std::optional> Headers( const std::string& content) const override; std::string ContentType() const override; }; diff --git a/components/brave_rewards/core/endpoints/gemini/get_recipient_id_gemini.cc b/components/brave_rewards/core/endpoints/gemini/get_recipient_id_gemini.cc index c5bb1b3def1..99f665219b2 100644 --- a/components/brave_rewards/core/endpoints/gemini/get_recipient_id_gemini.cc +++ b/components/brave_rewards/core/endpoints/gemini/get_recipient_id_gemini.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_rewards/core/endpoints/gemini/get_recipient_id_gemini.h" +#include #include #include "base/json/json_reader.h" @@ -68,7 +69,7 @@ GetRecipientIDGemini::GetRecipientIDGemini(RewardsEngineImpl& engine, GetRecipientIDGemini::~GetRecipientIDGemini() = default; -absl::optional GetRecipientIDGemini::Url() const { +std::optional GetRecipientIDGemini::Url() const { return endpoint::gemini::GetApiServerUrl("/v1/payments/recipientIds"); } @@ -76,7 +77,7 @@ mojom::UrlMethod GetRecipientIDGemini::Method() const { return mojom::UrlMethod::GET; } -absl::optional> GetRecipientIDGemini::Headers( +std::optional> GetRecipientIDGemini::Headers( const std::string&) const { return endpoint::gemini::RequestAuthorization(token_); } diff --git a/components/brave_rewards/core/endpoints/gemini/get_recipient_id_gemini.h b/components/brave_rewards/core/endpoints/gemini/get_recipient_id_gemini.h index 91da93db84f..a1455f493c6 100644 --- a/components/brave_rewards/core/endpoints/gemini/get_recipient_id_gemini.h +++ b/components/brave_rewards/core/endpoints/gemini/get_recipient_id_gemini.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_ENDPOINTS_GEMINI_GET_RECIPIENT_ID_GEMINI_H_ #define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_ENDPOINTS_GEMINI_GET_RECIPIENT_ID_GEMINI_H_ +#include #include #include @@ -13,7 +14,6 @@ #include "brave/components/brave_rewards/core/endpoints/request_builder.h" #include "brave/components/brave_rewards/core/endpoints/response_handler.h" #include "brave/components/brave_rewards/core/endpoints/result_for.h" -#include "third_party/abseil-cpp/absl/types/optional.h" // GET /v1/payments/recipientIds // @@ -57,9 +57,9 @@ class GetRecipientIDGemini final ~GetRecipientIDGemini() override; private: - absl::optional Url() const override; + std::optional Url() const override; mojom::UrlMethod Method() const override; - absl::optional> Headers( + std::optional> Headers( const std::string& content) const override; std::string token_; diff --git a/components/brave_rewards/core/endpoints/gemini/post_commit_transaction_gemini.cc b/components/brave_rewards/core/endpoints/gemini/post_commit_transaction_gemini.cc index 773a7868429..ac0c9f125ce 100644 --- a/components/brave_rewards/core/endpoints/gemini/post_commit_transaction_gemini.cc +++ b/components/brave_rewards/core/endpoints/gemini/post_commit_transaction_gemini.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_rewards/core/endpoints/gemini/post_commit_transaction_gemini.h" +#include #include #include "base/base64.h" @@ -61,11 +62,11 @@ Result PostCommitTransactionGemini::ProcessResponse( } } -absl::optional PostCommitTransactionGemini::Url() const { +std::optional PostCommitTransactionGemini::Url() const { return endpoint::gemini::GetApiServerUrl("/v1/payments/pay"); } -absl::optional> PostCommitTransactionGemini::Headers( +std::optional> PostCommitTransactionGemini::Headers( const std::string&) const { base::Value::Dict payload; payload.Set("tx_ref", transaction_->transaction_id); @@ -75,7 +76,7 @@ absl::optional> PostCommitTransactionGemini::Headers( std::string json; if (!base::JSONWriter::Write(payload, &json)) { - return absl::nullopt; + return std::nullopt; } std::string base64; diff --git a/components/brave_rewards/core/endpoints/gemini/post_commit_transaction_gemini.h b/components/brave_rewards/core/endpoints/gemini/post_commit_transaction_gemini.h index 0bed7018408..0844a3bd1e3 100644 --- a/components/brave_rewards/core/endpoints/gemini/post_commit_transaction_gemini.h +++ b/components/brave_rewards/core/endpoints/gemini/post_commit_transaction_gemini.h @@ -6,13 +6,13 @@ #ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_ENDPOINTS_GEMINI_POST_COMMIT_TRANSACTION_GEMINI_H_ #define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_ENDPOINTS_GEMINI_POST_COMMIT_TRANSACTION_GEMINI_H_ +#include #include #include #include "brave/components/brave_rewards/common/mojom/rewards_core.mojom.h" #include "brave/components/brave_rewards/core/endpoints/common/post_commit_transaction.h" #include "brave/components/brave_rewards/core/endpoints/response_handler.h" -#include "third_party/abseil-cpp/absl/types/optional.h" // POST /v1/payments/pay // @@ -48,8 +48,8 @@ class PostCommitTransactionGemini final static Result ProcessResponse(const mojom::UrlResponse&); private: - absl::optional Url() const override; - absl::optional> Headers( + std::optional Url() const override; + std::optional> Headers( const std::string& content) const override; std::string ContentType() const override; }; diff --git a/components/brave_rewards/core/endpoints/request_builder.cc b/components/brave_rewards/core/endpoints/request_builder.cc index e2f8122d9dd..e07f56ac480 100644 --- a/components/brave_rewards/core/endpoints/request_builder.cc +++ b/components/brave_rewards/core/endpoints/request_builder.cc @@ -5,26 +5,27 @@ #include "brave/components/brave_rewards/core/endpoints/request_builder.h" +#include #include namespace brave_rewards::internal::endpoints { RequestBuilder::~RequestBuilder() = default; -absl::optional RequestBuilder::Request() const { +std::optional RequestBuilder::Request() const { const auto url = Url(); if (!url) { - return absl::nullopt; + return std::nullopt; } const auto content = Content(); if (!content) { - return absl::nullopt; + return std::nullopt; } auto headers = Headers(*content); if (!headers) { - return absl::nullopt; + return std::nullopt; } return mojom::UrlRequest::New(*url, Method(), std::move(*headers), *content, @@ -37,12 +38,12 @@ mojom::UrlMethod RequestBuilder::Method() const { return mojom::UrlMethod::POST; } -absl::optional> RequestBuilder::Headers( +std::optional> RequestBuilder::Headers( const std::string&) const { return std::vector{}; } -absl::optional RequestBuilder::Content() const { +std::optional RequestBuilder::Content() const { return ""; } diff --git a/components/brave_rewards/core/endpoints/request_builder.h b/components/brave_rewards/core/endpoints/request_builder.h index 968abe5e3c5..7faa95ce594 100644 --- a/components/brave_rewards/core/endpoints/request_builder.h +++ b/components/brave_rewards/core/endpoints/request_builder.h @@ -6,12 +6,12 @@ #ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_ENDPOINTS_REQUEST_BUILDER_H_ #define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_ENDPOINTS_REQUEST_BUILDER_H_ +#include #include #include #include "base/memory/raw_ref.h" #include "brave/components/brave_rewards/common/mojom/rewards.mojom.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_rewards::internal { class RewardsEngineImpl; @@ -24,19 +24,19 @@ class RequestBuilder { virtual ~RequestBuilder(); - absl::optional Request() const; + std::optional Request() const; protected: explicit RequestBuilder(RewardsEngineImpl& engine); - virtual absl::optional Url() const = 0; + virtual std::optional Url() const = 0; virtual mojom::UrlMethod Method() const; - virtual absl::optional> Headers( + virtual std::optional> Headers( const std::string& content) const; - virtual absl::optional Content() const; + virtual std::optional Content() const; virtual std::string ContentType() const; diff --git a/components/brave_rewards/core/endpoints/request_for.h b/components/brave_rewards/core/endpoints/request_for.h index bca1badca2c..2de346d156d 100644 --- a/components/brave_rewards/core/endpoints/request_for.h +++ b/components/brave_rewards/core/endpoints/request_for.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_ENDPOINTS_REQUEST_FOR_H_ #define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_ENDPOINTS_REQUEST_FOR_H_ +#include #include #include @@ -15,7 +16,6 @@ #include "brave/components/brave_rewards/core/endpoints/request_builder.h" #include "brave/components/brave_rewards/core/logging/logging.h" #include "brave/components/brave_rewards/core/rewards_engine_impl.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_rewards::internal::endpoints { @@ -66,7 +66,7 @@ class RequestFor { private: const raw_ref engine_; - absl::optional request_; + std::optional request_; }; } // namespace brave_rewards::internal::endpoints diff --git a/components/brave_rewards/core/endpoints/uphold/get_transaction_status_uphold.cc b/components/brave_rewards/core/endpoints/uphold/get_transaction_status_uphold.cc index ba2819dbd44..6e5c4a84775 100644 --- a/components/brave_rewards/core/endpoints/uphold/get_transaction_status_uphold.cc +++ b/components/brave_rewards/core/endpoints/uphold/get_transaction_status_uphold.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_rewards/core/endpoints/uphold/get_transaction_status_uphold.h" +#include #include #include "base/json/json_reader.h" @@ -60,12 +61,12 @@ Result GetTransactionStatusUphold::ProcessResponse( } } -absl::optional GetTransactionStatusUphold::Url() const { +std::optional GetTransactionStatusUphold::Url() const { return endpoint::uphold::GetServerUrl( base::StringPrintf("/v0/me/transactions/%s", transaction_id_.c_str())); } -absl::optional> GetTransactionStatusUphold::Headers( +std::optional> GetTransactionStatusUphold::Headers( const std::string&) const { return endpoint::uphold::RequestAuthorization(token_); } diff --git a/components/brave_rewards/core/endpoints/uphold/get_transaction_status_uphold.h b/components/brave_rewards/core/endpoints/uphold/get_transaction_status_uphold.h index a46ba24f96a..74bfc35f3ab 100644 --- a/components/brave_rewards/core/endpoints/uphold/get_transaction_status_uphold.h +++ b/components/brave_rewards/core/endpoints/uphold/get_transaction_status_uphold.h @@ -6,13 +6,13 @@ #ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_ENDPOINTS_UPHOLD_GET_TRANSACTION_STATUS_UPHOLD_H_ #define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_ENDPOINTS_UPHOLD_GET_TRANSACTION_STATUS_UPHOLD_H_ +#include #include #include #include "brave/components/brave_rewards/common/mojom/rewards_core.mojom.h" #include "brave/components/brave_rewards/core/endpoints/common/get_transaction_status.h" #include "brave/components/brave_rewards/core/endpoints/response_handler.h" -#include "third_party/abseil-cpp/absl/types/optional.h" // GET /v0/me/transactions/:transaction-id // @@ -119,8 +119,8 @@ class GetTransactionStatusUphold final static Result ProcessResponse(const mojom::UrlResponse&); private: - absl::optional Url() const override; - absl::optional> Headers( + std::optional Url() const override; + std::optional> Headers( const std::string& content) const override; }; diff --git a/components/brave_rewards/core/endpoints/uphold/post_commit_transaction_uphold.cc b/components/brave_rewards/core/endpoints/uphold/post_commit_transaction_uphold.cc index 5ba26cde1ec..1fe5b8aa57b 100644 --- a/components/brave_rewards/core/endpoints/uphold/post_commit_transaction_uphold.cc +++ b/components/brave_rewards/core/endpoints/uphold/post_commit_transaction_uphold.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_rewards/core/endpoints/uphold/post_commit_transaction_uphold.h" +#include #include #include "base/json/json_reader.h" @@ -63,13 +64,13 @@ Result PostCommitTransactionUphold::ProcessResponse( } } -absl::optional PostCommitTransactionUphold::Url() const { +std::optional PostCommitTransactionUphold::Url() const { return endpoint::uphold::GetServerUrl(base::StringPrintf( "/v0/me/cards/%s/transactions/%s/commit", address_.c_str(), transaction_->transaction_id.c_str())); } -absl::optional> PostCommitTransactionUphold::Headers( +std::optional> PostCommitTransactionUphold::Headers( const std::string&) const { return endpoint::uphold::RequestAuthorization(token_); } diff --git a/components/brave_rewards/core/endpoints/uphold/post_commit_transaction_uphold.h b/components/brave_rewards/core/endpoints/uphold/post_commit_transaction_uphold.h index 3df10b5ad3c..4e5ffdb5000 100644 --- a/components/brave_rewards/core/endpoints/uphold/post_commit_transaction_uphold.h +++ b/components/brave_rewards/core/endpoints/uphold/post_commit_transaction_uphold.h @@ -6,13 +6,13 @@ #ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_ENDPOINTS_UPHOLD_POST_COMMIT_TRANSACTION_UPHOLD_H_ #define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_ENDPOINTS_UPHOLD_POST_COMMIT_TRANSACTION_UPHOLD_H_ +#include #include #include #include "brave/components/brave_rewards/common/mojom/rewards_core.mojom.h" #include "brave/components/brave_rewards/core/endpoints/common/post_commit_transaction.h" #include "brave/components/brave_rewards/core/endpoints/response_handler.h" -#include "third_party/abseil-cpp/absl/types/optional.h" // POST /v0/me/cards/:card-id/transactions/:transaction-id/commit // @@ -119,8 +119,8 @@ class PostCommitTransactionUphold final static Result ProcessResponse(const mojom::UrlResponse&); private: - absl::optional Url() const override; - absl::optional> Headers( + std::optional Url() const override; + std::optional> Headers( const std::string& content) const override; }; diff --git a/components/brave_rewards/core/endpoints/uphold/post_create_transaction_uphold.cc b/components/brave_rewards/core/endpoints/uphold/post_create_transaction_uphold.cc index 83eecbd0611..5510da57aac 100644 --- a/components/brave_rewards/core/endpoints/uphold/post_create_transaction_uphold.cc +++ b/components/brave_rewards/core/endpoints/uphold/post_create_transaction_uphold.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_rewards/core/endpoints/uphold/post_create_transaction_uphold.h" +#include #include #include "base/json/json_reader.h" @@ -53,17 +54,17 @@ Result PostCreateTransactionUphold::ProcessResponse( } } -absl::optional PostCreateTransactionUphold::Url() const { +std::optional PostCreateTransactionUphold::Url() const { return endpoint::uphold::GetServerUrl( base::StringPrintf("/v0/me/cards/%s/transactions", address_.c_str())); } -absl::optional> PostCreateTransactionUphold::Headers( +std::optional> PostCreateTransactionUphold::Headers( const std::string&) const { return endpoint::uphold::RequestAuthorization(token_); } -absl::optional PostCreateTransactionUphold::Content() const { +std::optional PostCreateTransactionUphold::Content() const { base::Value::Dict denomination; denomination.Set("amount", transaction_->amount); denomination.Set("currency", "BAT"); @@ -77,7 +78,7 @@ absl::optional PostCreateTransactionUphold::Content() const { std::string json; if (!base::JSONWriter::Write(payload, &json)) { - return absl::nullopt; + return std::nullopt; } return json; diff --git a/components/brave_rewards/core/endpoints/uphold/post_create_transaction_uphold.h b/components/brave_rewards/core/endpoints/uphold/post_create_transaction_uphold.h index a9eb1232dff..f33697eb263 100644 --- a/components/brave_rewards/core/endpoints/uphold/post_create_transaction_uphold.h +++ b/components/brave_rewards/core/endpoints/uphold/post_create_transaction_uphold.h @@ -6,13 +6,13 @@ #ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_ENDPOINTS_UPHOLD_POST_CREATE_TRANSACTION_UPHOLD_H_ #define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_ENDPOINTS_UPHOLD_POST_CREATE_TRANSACTION_UPHOLD_H_ +#include #include #include #include "brave/components/brave_rewards/common/mojom/rewards_core.mojom.h" #include "brave/components/brave_rewards/core/endpoints/common/post_create_transaction.h" #include "brave/components/brave_rewards/core/endpoints/response_handler.h" -#include "third_party/abseil-cpp/absl/types/optional.h" // POST /v0/me/cards/:card-id/transactions // @@ -119,10 +119,10 @@ class PostCreateTransactionUphold final static Result ProcessResponse(const mojom::UrlResponse&); private: - absl::optional Url() const override; - absl::optional> Headers( + std::optional Url() const override; + std::optional> Headers( const std::string& content) const override; - absl::optional Content() const override; + std::optional Content() const override; }; } // namespace brave_rewards::internal::endpoints diff --git a/components/brave_rewards/core/endpoints/uphold/post_oauth_uphold.cc b/components/brave_rewards/core/endpoints/uphold/post_oauth_uphold.cc index dfc51cb24bf..195a0b54dd3 100644 --- a/components/brave_rewards/core/endpoints/uphold/post_oauth_uphold.cc +++ b/components/brave_rewards/core/endpoints/uphold/post_oauth_uphold.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_rewards/core/endpoints/uphold/post_oauth_uphold.h" +#include #include #include "base/json/json_reader.h" @@ -53,19 +54,19 @@ PostOAuthUphold::PostOAuthUphold(RewardsEngineImpl& engine, PostOAuthUphold::~PostOAuthUphold() = default; -absl::optional PostOAuthUphold::Url() const { +std::optional PostOAuthUphold::Url() const { return endpoint::uphold::GetServerUrl("/oauth2/token"); } -absl::optional> PostOAuthUphold::Headers( +std::optional> PostOAuthUphold::Headers( const std::string&) const { return endpoint::uphold::RequestAuthorization(); } -absl::optional PostOAuthUphold::Content() const { +std::optional PostOAuthUphold::Content() const { if (code_.empty()) { BLOG(0, "code_ is empty!"); - return absl::nullopt; + return std::nullopt; } return "code=" + code_ + "&grant_type=authorization_code"; diff --git a/components/brave_rewards/core/endpoints/uphold/post_oauth_uphold.h b/components/brave_rewards/core/endpoints/uphold/post_oauth_uphold.h index b9c9066c292..2e80a94defc 100644 --- a/components/brave_rewards/core/endpoints/uphold/post_oauth_uphold.h +++ b/components/brave_rewards/core/endpoints/uphold/post_oauth_uphold.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_ENDPOINTS_UPHOLD_POST_OAUTH_UPHOLD_H_ #define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_ENDPOINTS_UPHOLD_POST_OAUTH_UPHOLD_H_ +#include #include #include @@ -13,7 +14,6 @@ #include "brave/components/brave_rewards/core/endpoints/request_builder.h" #include "brave/components/brave_rewards/core/endpoints/response_handler.h" #include "brave/components/brave_rewards/core/endpoints/result_for.h" -#include "third_party/abseil-cpp/absl/types/optional.h" // POST /oauth2/token // @@ -52,10 +52,10 @@ class PostOAuthUphold final : public RequestBuilder, ~PostOAuthUphold() override; private: - absl::optional Url() const override; - absl::optional> Headers( + std::optional Url() const override; + std::optional> Headers( const std::string& content) const override; - absl::optional Content() const override; + std::optional Content() const override; std::string ContentType() const override; bool SkipLog() const override; diff --git a/components/brave_rewards/core/endpoints/zebpay/get_balance_zebpay.cc b/components/brave_rewards/core/endpoints/zebpay/get_balance_zebpay.cc index 4532141d056..486d030b3f5 100644 --- a/components/brave_rewards/core/endpoints/zebpay/get_balance_zebpay.cc +++ b/components/brave_rewards/core/endpoints/zebpay/get_balance_zebpay.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_rewards/core/endpoints/zebpay/get_balance_zebpay.h" +#include #include #include "base/json/json_reader.h" @@ -56,7 +57,7 @@ GetBalanceZebPay::GetBalanceZebPay(RewardsEngineImpl& engine, GetBalanceZebPay::~GetBalanceZebPay() = default; -absl::optional GetBalanceZebPay::Url() const { +std::optional GetBalanceZebPay::Url() const { return endpoint::zebpay::GetApiServerUrl("/api/balance"); } @@ -64,7 +65,7 @@ mojom::UrlMethod GetBalanceZebPay::Method() const { return mojom::UrlMethod::GET; } -absl::optional> GetBalanceZebPay::Headers( +std::optional> GetBalanceZebPay::Headers( const std::string&) const { return endpoint::zebpay::RequestAuthorization(token_); } diff --git a/components/brave_rewards/core/endpoints/zebpay/get_balance_zebpay.h b/components/brave_rewards/core/endpoints/zebpay/get_balance_zebpay.h index 8fae4a579eb..72f9b02d6ac 100644 --- a/components/brave_rewards/core/endpoints/zebpay/get_balance_zebpay.h +++ b/components/brave_rewards/core/endpoints/zebpay/get_balance_zebpay.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_ENDPOINTS_ZEBPAY_GET_BALANCE_ZEBPAY_H_ #define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_ENDPOINTS_ZEBPAY_GET_BALANCE_ZEBPAY_H_ +#include #include #include @@ -13,7 +14,6 @@ #include "brave/components/brave_rewards/core/endpoints/request_builder.h" #include "brave/components/brave_rewards/core/endpoints/response_handler.h" #include "brave/components/brave_rewards/core/endpoints/result_for.h" -#include "third_party/abseil-cpp/absl/types/optional.h" // GET /api/balance // @@ -47,9 +47,9 @@ class GetBalanceZebPay final : public RequestBuilder, ~GetBalanceZebPay() override; private: - absl::optional Url() const override; + std::optional Url() const override; mojom::UrlMethod Method() const override; - absl::optional> Headers( + std::optional> Headers( const std::string& content) const override; std::string token_; diff --git a/components/brave_rewards/core/endpoints/zebpay/post_oauth_zebpay.cc b/components/brave_rewards/core/endpoints/zebpay/post_oauth_zebpay.cc index e24895e4e7b..bda04f414e9 100644 --- a/components/brave_rewards/core/endpoints/zebpay/post_oauth_zebpay.cc +++ b/components/brave_rewards/core/endpoints/zebpay/post_oauth_zebpay.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_rewards/core/endpoints/zebpay/post_oauth_zebpay.h" +#include #include #include "base/base64.h" @@ -106,19 +107,19 @@ PostOAuthZebPay::PostOAuthZebPay(RewardsEngineImpl& engine, PostOAuthZebPay::~PostOAuthZebPay() = default; -absl::optional PostOAuthZebPay::Url() const { +std::optional PostOAuthZebPay::Url() const { return endpoint::zebpay::GetOauthServerUrl("/connect/token"); } -absl::optional> PostOAuthZebPay::Headers( +std::optional> PostOAuthZebPay::Headers( const std::string&) const { return endpoint::zebpay::RequestAuthorization(); } -absl::optional PostOAuthZebPay::Content() const { +std::optional PostOAuthZebPay::Content() const { if (code_.empty()) { BLOG(0, "code_ is empty!"); - return absl::nullopt; + return std::nullopt; } return "grant_type=authorization_code" diff --git a/components/brave_rewards/core/endpoints/zebpay/post_oauth_zebpay.h b/components/brave_rewards/core/endpoints/zebpay/post_oauth_zebpay.h index 41d9f447743..d6933a9f993 100644 --- a/components/brave_rewards/core/endpoints/zebpay/post_oauth_zebpay.h +++ b/components/brave_rewards/core/endpoints/zebpay/post_oauth_zebpay.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_ENDPOINTS_ZEBPAY_POST_OAUTH_ZEBPAY_H_ #define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_ENDPOINTS_ZEBPAY_POST_OAUTH_ZEBPAY_H_ +#include #include #include #include @@ -14,7 +15,6 @@ #include "brave/components/brave_rewards/core/endpoints/request_builder.h" #include "brave/components/brave_rewards/core/endpoints/response_handler.h" #include "brave/components/brave_rewards/core/endpoints/result_for.h" -#include "third_party/abseil-cpp/absl/types/optional.h" // POST /connect/token // @@ -59,10 +59,10 @@ class PostOAuthZebPay final : public RequestBuilder, ~PostOAuthZebPay() override; private: - absl::optional Url() const override; - absl::optional> Headers( + std::optional Url() const override; + std::optional> Headers( const std::string& content) const override; - absl::optional Content() const override; + std::optional Content() const override; std::string ContentType() const override; bool SkipLog() const override; diff --git a/components/brave_rewards/core/legacy/media/github.cc b/components/brave_rewards/core/legacy/media/github.cc index 6c504bbe9b0..8a1c60cad72 100644 --- a/components/brave_rewards/core/legacy/media/github.cc +++ b/components/brave_rewards/core/legacy/media/github.cc @@ -3,7 +3,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include "brave/components/brave_rewards/core/legacy/media/github.h" + #include +#include #include #include @@ -14,7 +17,6 @@ #include "base/strings/utf_string_conversions.h" #include "brave/components/brave_rewards/core/constants.h" #include "brave/components/brave_rewards/core/database/database.h" -#include "brave/components/brave_rewards/core/legacy/media/github.h" #include "brave/components/brave_rewards/core/legacy/static_values.h" #include "brave/components/brave_rewards/core/publisher/publisher.h" #include "brave/components/brave_rewards/core/rewards_engine_impl.h" @@ -44,7 +46,7 @@ std::string GitHub::GetLinkType(const std::string& url) { bool GitHub::GetJSONIntValue(const std::string& key, const std::string& json_string, int64_t* result) { - absl::optional value = base::JSONReader::Read(json_string); + std::optional value = base::JSONReader::Read(json_string); if (!value || !value->is_dict()) { return false; } @@ -62,7 +64,7 @@ bool GitHub::GetJSONIntValue(const std::string& key, bool GitHub::GetJSONStringValue(const std::string& key, const std::string& json_string, std::string* result) { - absl::optional value = base::JSONReader::Read(json_string); + std::optional value = base::JSONReader::Read(json_string); if (!value || !value->is_dict()) { return false; } diff --git a/components/brave_rewards/core/rewards_engine_impl.cc b/components/brave_rewards/core/rewards_engine_impl.cc index 2b2ea04f670..35a15717de6 100644 --- a/components/brave_rewards/core/rewards_engine_impl.cc +++ b/components/brave_rewards/core/rewards_engine_impl.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include +#include #include #include "base/task/thread_pool/thread_pool_instance.h" @@ -67,8 +68,8 @@ void RewardsEngineImpl::CreateRewardsWallet( CreateRewardsWalletCallback callback) { WhenReady([this, country, callback = std::move(callback)]() mutable { wallet()->CreateWalletIfNecessary( - country.empty() ? absl::nullopt - : absl::optional(std::move(country)), + country.empty() ? std::nullopt + : std::optional(std::move(country)), std::move(callback)); }); } @@ -753,16 +754,16 @@ mojom::ClientInfoPtr RewardsEngineImpl::GetClientInfo() { return info; } -absl::optional RewardsEngineImpl::EncryptString( +std::optional RewardsEngineImpl::EncryptString( const std::string& value) { - absl::optional result; + std::optional result; client_->EncryptString(value, &result); return result; } -absl::optional RewardsEngineImpl::DecryptString( +std::optional RewardsEngineImpl::DecryptString( const std::string& value) { - absl::optional result; + std::optional result; client_->DecryptString(value, &result); return result; } diff --git a/components/brave_rewards/core/rewards_engine_impl.h b/components/brave_rewards/core/rewards_engine_impl.h index b52b36e55a1..c11bb1b137a 100644 --- a/components/brave_rewards/core/rewards_engine_impl.h +++ b/components/brave_rewards/core/rewards_engine_impl.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_REWARDS_ENGINE_IMPL_H_ #include +#include #include #include @@ -332,9 +333,9 @@ class RewardsEngineImpl : public mojom::RewardsEngine { mojom::ClientInfoPtr GetClientInfo(); - absl::optional EncryptString(const std::string& value); + std::optional EncryptString(const std::string& value); - absl::optional DecryptString(const std::string& value); + std::optional DecryptString(const std::string& value); // mojom::RewardsEngineClient helpers end mojom::RewardsEngineClient* client(); diff --git a/components/brave_rewards/core/state/state.cc b/components/brave_rewards/core/state/state.cc index 5e199fe3164..ec4ad1c3b31 100644 --- a/components/brave_rewards/core/state/state.cc +++ b/components/brave_rewards/core/state/state.cc @@ -3,7 +3,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include "brave/components/brave_rewards/core/state/state.h" + #include +#include #include #include "base/base64.h" @@ -17,7 +20,6 @@ #include "brave/components/brave_rewards/core/endpoints/brave/get_parameters_utils.h" #include "brave/components/brave_rewards/core/publisher/publisher.h" #include "brave/components/brave_rewards/core/rewards_engine_impl.h" -#include "brave/components/brave_rewards/core/state/state.h" #include "brave/components/brave_rewards/core/state/state_keys.h" #include "brave/components/brave_rewards/core/state/state_migration.h" @@ -38,7 +40,7 @@ std::string VectorDoubleToString(const std::vector& items) { } std::vector StringToVectorDouble(const std::string& items_string) { - absl::optional list = base::JSONReader::Read(items_string); + std::optional list = base::JSONReader::Read(items_string); if (!list || !list->is_list()) { return {}; } @@ -381,7 +383,7 @@ uint64_t State::GetPromotionLastFetchStamp() { return engine_->GetState(kPromotionLastFetchStamp); } -absl::optional State::GetEncryptedString(const std::string& key) { +std::optional State::GetEncryptedString(const std::string& key) { std::string value = engine_->GetState(key); // If the state value is empty, then we consider this a successful read of a diff --git a/components/brave_rewards/core/state/state.h b/components/brave_rewards/core/state/state.h index ff7b4e798c9..ac8e1064c3f 100644 --- a/components/brave_rewards/core/state/state.h +++ b/components/brave_rewards/core/state/state.h @@ -6,13 +6,13 @@ #ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_STATE_STATE_H_ #define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_STATE_STATE_H_ +#include #include #include #include "base/containers/flat_map.h" #include "base/memory/raw_ref.h" #include "brave/components/brave_rewards/core/state/state_migration.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_rewards::internal { class RewardsEngineImpl; @@ -98,7 +98,7 @@ class State { uint64_t GetPromotionLastFetchStamp(); - absl::optional GetEncryptedString(const std::string& key); + std::optional GetEncryptedString(const std::string& key); bool SetEncryptedString(const std::string& key, const std::string& value); diff --git a/components/brave_rewards/core/test/test_rewards_engine_client.cc b/components/brave_rewards/core/test/test_rewards_engine_client.cc index ce34ccab687..a9becff3025 100644 --- a/components/brave_rewards/core/test/test_rewards_engine_client.cc +++ b/components/brave_rewards/core/test/test_rewards_engine_client.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_rewards/core/test/test_rewards_engine_client.h" +#include #include #include "base/base64.h" @@ -30,7 +31,7 @@ std::string FakeEncryption::EncryptString(const std::string& value) { return "ENCRYPTED:" + value; } -absl::optional FakeEncryption::DecryptString( +std::optional FakeEncryption::DecryptString( const std::string& value) { size_t pos = value.find("ENCRYPTED:"); if (pos == 0) { @@ -47,7 +48,7 @@ std::string FakeEncryption::Base64EncryptString(const std::string& value) { return encoded; } -absl::optional FakeEncryption::Base64DecryptString( +std::optional FakeEncryption::Base64DecryptString( const std::string& value) { std::string decoded; if (!base::Base64Decode(value, &decoded)) { diff --git a/components/brave_rewards/core/test/test_rewards_engine_client.h b/components/brave_rewards/core/test/test_rewards_engine_client.h index 5429329e33c..e7d5ea91973 100644 --- a/components/brave_rewards/core/test/test_rewards_engine_client.h +++ b/components/brave_rewards/core/test/test_rewards_engine_client.h @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -23,10 +24,10 @@ namespace brave_rewards::internal { struct FakeEncryption { static std::string EncryptString(const std::string& value); - static absl::optional DecryptString(const std::string& value); + static std::optional DecryptString(const std::string& value); static std::string Base64EncryptString(const std::string& value); - static absl::optional Base64DecryptString( + static std::optional Base64DecryptString( const std::string& value); }; diff --git a/components/brave_rewards/core/uphold/uphold_capabilities.h b/components/brave_rewards/core/uphold/uphold_capabilities.h index 175959293b5..adfe9d736ab 100644 --- a/components/brave_rewards/core/uphold/uphold_capabilities.h +++ b/components/brave_rewards/core/uphold/uphold_capabilities.h @@ -6,14 +6,14 @@ #ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_UPHOLD_UPHOLD_CAPABILITIES_H_ #define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_UPHOLD_UPHOLD_CAPABILITIES_H_ -#include "third_party/abseil-cpp/absl/types/optional.h" +#include namespace brave_rewards::internal { namespace uphold { struct Capabilities { - absl::optional can_receive; - absl::optional can_send; + std::optional can_receive; + std::optional can_send; }; } // namespace uphold diff --git a/components/brave_rewards/core/wallet/wallet.cc b/components/brave_rewards/core/wallet/wallet.cc index 9a05b48c778..7a5e441d8a2 100644 --- a/components/brave_rewards/core/wallet/wallet.cc +++ b/components/brave_rewards/core/wallet/wallet.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_rewards/core/wallet/wallet.h" +#include #include #include @@ -18,7 +19,6 @@ #include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/state/state_keys.h" #include "brave/components/brave_rewards/core/wallet/wallet_util.h" - #include "wally_bip39.h" // NOLINT namespace brave_rewards::internal { @@ -32,7 +32,7 @@ Wallet::Wallet(RewardsEngineImpl& engine) Wallet::~Wallet() = default; -void Wallet::CreateWalletIfNecessary(absl::optional&& geo_country, +void Wallet::CreateWalletIfNecessary(std::optional&& geo_country, CreateRewardsWalletCallback callback) { create_.CreateWallet(std::move(geo_country), std::move(callback)); } @@ -51,7 +51,7 @@ mojom::RewardsWalletPtr Wallet::GetWallet(bool* corrupted) { return nullptr; } - absl::optional value = base::JSONReader::Read(json); + std::optional value = base::JSONReader::Read(json); if (!value || !value->is_dict()) { BLOG(0, "Parsing of brave wallet failed"); *corrupted = true; diff --git a/components/brave_rewards/core/wallet/wallet.h b/components/brave_rewards/core/wallet/wallet.h index 9cfed05b4fe..6a03216eddf 100644 --- a/components/brave_rewards/core/wallet/wallet.h +++ b/components/brave_rewards/core/wallet/wallet.h @@ -8,6 +8,7 @@ #include +#include #include #include "base/containers/flat_map.h" @@ -16,7 +17,6 @@ #include "brave/components/brave_rewards/core/rewards_callbacks.h" #include "brave/components/brave_rewards/core/wallet/wallet_balance.h" #include "brave/components/brave_rewards/core/wallet/wallet_create.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_rewards::internal { class RewardsEngineImpl; @@ -28,7 +28,7 @@ class Wallet { explicit Wallet(RewardsEngineImpl& engine); ~Wallet(); - void CreateWalletIfNecessary(absl::optional&& geo_country, + void CreateWalletIfNecessary(std::optional&& geo_country, CreateRewardsWalletCallback callback); void FetchBalance(FetchBalanceCallback callback); diff --git a/components/brave_rewards/core/wallet/wallet_create.cc b/components/brave_rewards/core/wallet/wallet_create.cc index 7a32c439000..729d6edd86a 100644 --- a/components/brave_rewards/core/wallet/wallet_create.cc +++ b/components/brave_rewards/core/wallet/wallet_create.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_rewards/core/wallet/wallet_create.h" +#include #include #include "brave/components/brave_rewards/core/common/security_util.h" @@ -50,7 +51,7 @@ mojom::CreateRewardsWalletResult MapEndpointError(PatchWallets::Error error) { WalletCreate::WalletCreate(RewardsEngineImpl& engine) : engine_(engine) {} -void WalletCreate::CreateWallet(absl::optional&& geo_country, +void WalletCreate::CreateWallet(std::optional&& geo_country, CreateRewardsWalletCallback callback) { bool corrupted = false; auto wallet = engine_->wallet()->GetWallet(&corrupted); @@ -99,7 +100,7 @@ inline constexpr bool dependent_false_v = false; template void WalletCreate::OnResult(CreateRewardsWalletCallback callback, - absl::optional&& geo_country, + std::optional&& geo_country, Result&& result) { if (!result.has_value()) { if constexpr (std::is_same_v) { diff --git a/components/brave_rewards/core/wallet/wallet_create.h b/components/brave_rewards/core/wallet/wallet_create.h index 1c01fd5a4a3..0f8f54358c1 100644 --- a/components/brave_rewards/core/wallet/wallet_create.h +++ b/components/brave_rewards/core/wallet/wallet_create.h @@ -6,11 +6,11 @@ #ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_WALLET_WALLET_CREATE_H_ #define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_WALLET_WALLET_CREATE_H_ +#include #include #include "base/memory/raw_ref.h" #include "brave/components/brave_rewards/core/rewards_callbacks.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_rewards::internal { class RewardsEngineImpl; @@ -21,13 +21,13 @@ class WalletCreate { public: explicit WalletCreate(RewardsEngineImpl& engine); - void CreateWallet(absl::optional&& geo_country, + void CreateWallet(std::optional&& geo_country, CreateRewardsWalletCallback callback); private: template void OnResult(CreateRewardsWalletCallback, - absl::optional&& geo_country, + std::optional&& geo_country, Result&&); const raw_ref engine_; diff --git a/components/brave_rewards/core/wallet/wallet_unittest.cc b/components/brave_rewards/core/wallet/wallet_unittest.cc index 6fa5b337978..9b9c2d5f994 100644 --- a/components/brave_rewards/core/wallet/wallet_unittest.cc +++ b/components/brave_rewards/core/wallet/wallet_unittest.cc @@ -3,6 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include "brave/components/brave_rewards/core/wallet/wallet.h" + +#include #include #include @@ -12,7 +15,6 @@ #include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/state/state_keys.h" #include "brave/components/brave_rewards/core/test/rewards_engine_test.h" -#include "brave/components/brave_rewards/core/wallet/wallet.h" #include "net/http/http_status_code.h" // npm run test -- brave_unit_tests --filter=*WalletTest* @@ -36,7 +38,7 @@ class WalletTest : public RewardsEngineTest { base::RunLoop run_loop; mojom::CreateRewardsWalletResult result; engine->wallet()->CreateWalletIfNecessary( - absl::nullopt, + std::nullopt, base::BindLambdaForTesting( [&result, &run_loop](mojom::CreateRewardsWalletResult r) { result = r; diff --git a/components/brave_rewards/core/wallet/wallet_util.cc b/components/brave_rewards/core/wallet/wallet_util.cc index 423557eb8ea..618bdce80e6 100644 --- a/components/brave_rewards/core/wallet/wallet_util.cc +++ b/components/brave_rewards/core/wallet/wallet_util.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_rewards/core/wallet/wallet_util.h" #include +#include #include #include "base/functional/overloaded.h" @@ -52,7 +53,7 @@ std::string WalletTypeToState(const std::string& wallet_type) { void OnWalletStatusChange(RewardsEngineImpl& engine, const std::string& wallet_type, - absl::optional from, + std::optional from, mojom::WalletStatus to) { std::ostringstream oss{}; if (from) { @@ -68,7 +69,7 @@ void OnWalletStatusChange(RewardsEngineImpl& engine, mojom::ExternalWalletPtr ExternalWalletPtrFromJSON(std::string wallet_string, std::string wallet_type) { - absl::optional value = base::JSONReader::Read(wallet_string); + std::optional value = base::JSONReader::Read(wallet_string); if (!value || !value->is_dict()) { BLOG(0, "Parsing of " + wallet_type + " wallet failed"); return nullptr; @@ -294,7 +295,7 @@ mojom::ExternalWalletPtr TransitionWallet( RewardsEngineImpl& engine, absl::variant wallet_info, mojom::WalletStatus to) { - absl::optional from; + std::optional from; auto wallet = absl::visit( base::Overloaded{ diff --git a/components/brave_search/renderer/brave_search_render_frame_observer.cc b/components/brave_search/renderer/brave_search_render_frame_observer.cc index b45b6f742a6..26e235324a0 100644 --- a/components/brave_search/renderer/brave_search_render_frame_observer.cc +++ b/components/brave_search/renderer/brave_search_render_frame_observer.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_search/renderer/brave_search_render_frame_observer.h" #include +#include #include "brave/components/brave_search/common/brave_search_utils.h" #include "brave/components/brave_search/renderer/brave_search_default_js_handler.h" @@ -55,7 +56,7 @@ void BraveSearchRenderFrameObserver::DidCreateScriptContext( void BraveSearchRenderFrameObserver::DidStartNavigation( const GURL& url, - absl::optional navigation_type) { + std::optional navigation_type) { url_ = url; } diff --git a/components/brave_search/renderer/brave_search_render_frame_observer.h b/components/brave_search/renderer/brave_search_render_frame_observer.h index 789fff802a8..a4f8a07b73d 100644 --- a/components/brave_search/renderer/brave_search_render_frame_observer.h +++ b/components/brave_search/renderer/brave_search_render_frame_observer.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_SEARCH_RENDERER_BRAVE_SEARCH_RENDER_FRAME_OBSERVER_H_ #include +#include #include "brave/components/brave_search/renderer/brave_search_default_js_handler.h" #include "content/public/renderer/render_frame.h" @@ -31,7 +32,7 @@ class BraveSearchRenderFrameObserver : public content::RenderFrameObserver { int32_t world_id) override; void DidStartNavigation( const GURL& url, - absl::optional navigation_type) override; + std::optional navigation_type) override; private: // RenderFrameObserver implementation. diff --git a/components/brave_shields/browser/ad_block_engine.cc b/components/brave_shields/browser/ad_block_engine.cc index a9b6c10690f..3be6d3cbe08 100644 --- a/components/brave_shields/browser/ad_block_engine.cc +++ b/components/brave_shields/browser/ad_block_engine.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_shields/browser/ad_block_engine.h" +#include #include #include #include @@ -127,7 +128,7 @@ adblock::BlockerResult AdBlockEngine::ShouldStartRequest( !previously_matched_exception); } -absl::optional AdBlockEngine::GetCspDirectives( +std::optional AdBlockEngine::GetCspDirectives( const GURL& url, blink::mojom::ResourceType resource_type, const std::string& tab_host) { @@ -144,9 +145,9 @@ absl::optional AdBlockEngine::GetCspDirectives( is_third_party); if (result.empty()) { - return absl::nullopt; + return std::nullopt; } else { - return absl::optional(std::string(result)); + return std::optional(std::string(result)); } } @@ -212,7 +213,7 @@ base::Value::Dict AdBlockEngine::UrlCosmeticResources(const std::string& url) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); auto result = ad_block_client_->url_cosmetic_resources(url); - absl::optional parsed_result = + std::optional parsed_result = base::JSONReader::Read(result.c_str()); if (!parsed_result) { diff --git a/components/brave_shields/browser/ad_block_engine.h b/components/brave_shields/browser/ad_block_engine.h index 0e615dbc0a1..5b848a22130 100644 --- a/components/brave_shields/browser/ad_block_engine.h +++ b/components/brave_shields/browser/ad_block_engine.h @@ -9,6 +9,7 @@ #include #include +#include #include #include #include @@ -20,7 +21,6 @@ #include "base/values.h" #include "brave/components/brave_component_updater/browser/dat_file_util.h" #include "brave/components/brave_shields/adblock/rs/src/lib.rs.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/blink/public/mojom/loader/resource_load_info.mojom-shared.h" #include "url/gurl.h" @@ -50,7 +50,7 @@ class AdBlockEngine : public base::SupportsWeakPtr { bool previously_matched_rule, bool previously_matched_exception, bool previously_matched_important); - absl::optional GetCspDirectives( + std::optional GetCspDirectives( const GURL& url, blink::mojom::ResourceType resource_type, const std::string& tab_host); @@ -100,7 +100,7 @@ class AdBlockEngine : public base::SupportsWeakPtr { friend class ::PerfPredictorTabHelperTest; std::set tags_ GUARDED_BY_CONTEXT(sequence_checker_); - absl::optional regex_discard_policy_ + std::optional regex_discard_policy_ GUARDED_BY_CONTEXT(sequence_checker_); raw_ptr test_observer_ = nullptr; diff --git a/components/brave_shields/browser/ad_block_filter_list_catalog_provider.h b/components/brave_shields/browser/ad_block_filter_list_catalog_provider.h index f5e1fec42ee..7e6b53cbe7c 100644 --- a/components/brave_shields/browser/ad_block_filter_list_catalog_provider.h +++ b/components/brave_shields/browser/ad_block_filter_list_catalog_provider.h @@ -12,7 +12,6 @@ #include "base/observer_list.h" #include "base/observer_list_types.h" #include "brave/components/brave_component_updater/browser/dat_file_util.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace component_updater { class ComponentUpdateService; diff --git a/components/brave_shields/browser/ad_block_service.cc b/components/brave_shields/browser/ad_block_service.cc index 55244d11046..ff3c896dd11 100644 --- a/components/brave_shields/browser/ad_block_service.cc +++ b/components/brave_shields/browser/ad_block_service.cc @@ -7,6 +7,7 @@ #include #include +#include #include #include "base/feature_list.h" @@ -33,7 +34,6 @@ #include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_service.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/origin.h" using brave_component_updater::BraveOnDemandUpdater; @@ -196,7 +196,7 @@ adblock::BlockerResult AdBlockService::ShouldStartRequest( return result; } -absl::optional AdBlockService::GetCspDirectives( +std::optional AdBlockService::GetCspDirectives( const GURL& url, blink::mojom::ResourceType resource_type, const std::string& tab_host) { diff --git a/components/brave_shields/browser/ad_block_service.h b/components/brave_shields/browser/ad_block_service.h index b7845eba4c2..1e3f435d789 100644 --- a/components/brave_shields/browser/ad_block_service.h +++ b/components/brave_shields/browser/ad_block_service.h @@ -9,6 +9,7 @@ #include #include +#include #include #include @@ -23,7 +24,6 @@ #include "brave/components/brave_shields/browser/ad_block_resource_provider.h" #include "brave/components/brave_shields/browser/ad_block_subscription_download_manager.h" #include "components/prefs/pref_registry_simple.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/blink/public/mojom/loader/resource_load_info.mojom-shared.h" #include "url/gurl.h" @@ -105,7 +105,7 @@ class AdBlockService { bool previously_matched_rule, bool previously_matched_exception, bool previously_matched_important); - absl::optional GetCspDirectives( + std::optional GetCspDirectives( const GURL& url, blink::mojom::ResourceType resource_type, const std::string& tab_host); diff --git a/components/brave_shields/browser/ad_block_service_helper.cc b/components/brave_shields/browser/ad_block_service_helper.cc index 76401e80ecb..eeaaa965f1d 100644 --- a/components/brave_shields/browser/ad_block_service_helper.cc +++ b/components/brave_shields/browser/ad_block_service_helper.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_shields/browser/ad_block_service_helper.h" +#include #include #include "base/strings/strcat.h" @@ -16,8 +17,8 @@ namespace brave_shields { // // Distinct policies are merged with comma separators, according to // https://www.w3.org/TR/CSP2/#implementation-considerations -void MergeCspDirectiveInto(absl::optional from, - absl::optional* into) { +void MergeCspDirectiveInto(std::optional from, + std::optional* into) { DCHECK(into); if (!from) { @@ -32,7 +33,7 @@ void MergeCspDirectiveInto(absl::optional from, const std::string from_str = *from; const std::string into_str = **into; - *into = absl::optional(from_str + ", " + into_str); + *into = std::optional(from_str + ", " + into_str); } // Merges the contents of the first UrlCosmeticResources Value into the second diff --git a/components/brave_shields/browser/ad_block_service_helper.h b/components/brave_shields/browser/ad_block_service_helper.h index fc2c640c6a0..4e8d5a01193 100644 --- a/components/brave_shields/browser/ad_block_service_helper.h +++ b/components/brave_shields/browser/ad_block_service_helper.h @@ -7,16 +7,17 @@ #define BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_SERVICE_HELPER_H_ #include + +#include #include #include #include "base/values.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_shields { -void MergeCspDirectiveInto(absl::optional from, - absl::optional* into); +void MergeCspDirectiveInto(std::optional from, + std::optional* into); void MergeResourcesInto(base::Value::Dict from, base::Value::Dict& into, diff --git a/components/brave_shields/browser/ad_block_subscription_service_manager.cc b/components/brave_shields/browser/ad_block_subscription_service_manager.cc index dccb5d18324..33e3f64402a 100644 --- a/components/brave_shields/browser/ad_block_subscription_service_manager.cc +++ b/components/brave_shields/browser/ad_block_subscription_service_manager.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_shields/browser/ad_block_subscription_service_manager.h" #include +#include #include #include #include @@ -54,9 +55,9 @@ bool ParseTimeValue(const base::Value* value, base::Time* field) { } bool ParseOptionalStringField(const base::Value* value, - absl::optional* field) { + std::optional* field) { if (value == nullptr) { - *field = absl::nullopt; + *field = std::nullopt; return true; } else if (!value->is_string()) { return false; @@ -118,9 +119,9 @@ void SubscriptionInfo::RegisterJSONConverter( "last_successful_update_attempt", &SubscriptionInfo::last_successful_update_attempt, &ParseTimeValue); converter->RegisterBoolField("enabled", &SubscriptionInfo::enabled); - converter->RegisterCustomValueField>( + converter->RegisterCustomValueField>( "homepage", &SubscriptionInfo::homepage, &ParseOptionalStringField); - converter->RegisterCustomValueField>( + converter->RegisterCustomValueField>( "title", &SubscriptionInfo::title, &ParseOptionalStringField); converter->RegisterCustomValueField( "expires", &SubscriptionInfo::expires, &ParseExpiresWithFallback); @@ -271,7 +272,7 @@ void AdBlockSubscriptionServiceManager::EnableSubscription(const GURL& sub_url, bool enabled) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - absl::optional info = GetInfo(sub_url); + std::optional info = GetInfo(sub_url); DCHECK(info); @@ -355,7 +356,7 @@ void AdBlockSubscriptionServiceManager::OnListMetadata( DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - absl::optional info = GetInfo(sub_url); + std::optional info = GetInfo(sub_url); if (!info) return; @@ -363,13 +364,13 @@ void AdBlockSubscriptionServiceManager::OnListMetadata( // Title can only be set once - only set it if an existing title does not // exist if (!info->title && metadata.title.has_value) { - info->title = absl::make_optional(std::string(metadata.title.value)); + info->title = std::make_optional(std::string(metadata.title.value)); } if (metadata.homepage.has_value) { - info->homepage = absl::make_optional(std::string(metadata.homepage.value)); + info->homepage = std::make_optional(std::string(metadata.homepage.value)); } else { - info->homepage = absl::nullopt; + info->homepage = std::nullopt; } if (metadata.expires_hours.has_value) { @@ -396,14 +397,14 @@ void AdBlockSubscriptionServiceManager::SetUpdateIntervalsForTesting( } // static -absl::optional AdBlockSubscriptionServiceManager::GetInfo( +std::optional AdBlockSubscriptionServiceManager::GetInfo( const GURL& sub_url) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); auto* list_subscription_dict = subscriptions_.FindDict(sub_url.spec()); if (!list_subscription_dict) - return absl::nullopt; + return std::nullopt; - return absl::make_optional( + return std::make_optional( BuildInfoFromDict(sub_url, *list_subscription_dict)); } @@ -492,7 +493,7 @@ void AdBlockSubscriptionServiceManager::OnSubscriptionDownloaded( const GURL& sub_url) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - absl::optional info = GetInfo(sub_url); + std::optional info = GetInfo(sub_url); if (!info) return; @@ -512,7 +513,7 @@ void AdBlockSubscriptionServiceManager::OnSubscriptionDownloaded( void AdBlockSubscriptionServiceManager::OnSubscriptionDownloadFailure( const GURL& sub_url) { - absl::optional info = GetInfo(sub_url); + std::optional info = GetInfo(sub_url); if (!info) return; diff --git a/components/brave_shields/browser/ad_block_subscription_service_manager.h b/components/brave_shields/browser/ad_block_subscription_service_manager.h index e0c25db2c95..572be488259 100644 --- a/components/brave_shields/browser/ad_block_subscription_service_manager.h +++ b/components/brave_shields/browser/ad_block_subscription_service_manager.h @@ -8,6 +8,7 @@ #include #include +#include #include #include @@ -22,7 +23,6 @@ #include "brave/components/brave_shields/browser/ad_block_subscription_download_manager.h" #include "components/component_updater/timer_update_scheduler.h" #include "components/prefs/pref_service.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h" class PrefService; @@ -64,8 +64,8 @@ struct SubscriptionInfo { // updated. bool enabled; - absl::optional homepage; - absl::optional title; + std::optional homepage; + std::optional title; uint16_t expires = kSubscriptionDefaultExpiresHours; static void RegisterJSONConverter( @@ -131,7 +131,7 @@ class AdBlockSubscriptionServiceManager { const adblock::FilterListMetadata& metadata); // static to enforce locking on `subscriptions_` - absl::optional GetInfo(const GURL& sub_url); + std::optional GetInfo(const GURL& sub_url); void NotifyObserversOfServiceEvent(); void SetUpdateIntervalsForTesting(base::TimeDelta* initial_delay, diff --git a/components/brave_shields/browser/adblock_stub_response.cc b/components/brave_shields/browser/adblock_stub_response.cc index 5e805edb87a..bfecbda33a4 100644 --- a/components/brave_shields/browser/adblock_stub_response.cc +++ b/components/brave_shields/browser/adblock_stub_response.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_shields/browser/adblock_stub_response.h" +#include #include #include @@ -119,7 +120,7 @@ std::string GetContentForMimeType(const std::string& mime_type) { } // namespace -void MakeStubResponse(const absl::optional& data_url, +void MakeStubResponse(const std::optional& data_url, const network::ResourceRequest& request, network::mojom::URLResponseHeadPtr* response, std::string* data) { diff --git a/components/brave_shields/browser/adblock_stub_response.h b/components/brave_shields/browser/adblock_stub_response.h index d2f0c804d9e..3ad0ca20088 100644 --- a/components/brave_shields/browser/adblock_stub_response.h +++ b/components/brave_shields/browser/adblock_stub_response.h @@ -6,9 +6,10 @@ #ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_ADBLOCK_STUB_RESPONSE_H_ #define BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_ADBLOCK_STUB_RESPONSE_H_ +#include #include + #include "services/network/public/mojom/url_response_head.mojom-forward.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace network { struct ResourceRequest; @@ -18,7 +19,7 @@ namespace brave_shields { // Intercepts certain requests and blocks them by silently returning 200 OK // and not allowing them to hit the network. -void MakeStubResponse(const absl::optional& data_url, +void MakeStubResponse(const std::optional& data_url, const network::ResourceRequest& request, network::mojom::URLResponseHeadPtr* response, std::string* data); diff --git a/components/brave_shields/browser/blocked_domain_1pes_lifetime.h b/components/brave_shields/browser/blocked_domain_1pes_lifetime.h index c78b42e751f..6dea5c5cf84 100644 --- a/components/brave_shields/browser/blocked_domain_1pes_lifetime.h +++ b/components/brave_shields/browser/blocked_domain_1pes_lifetime.h @@ -6,13 +6,13 @@ #ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_BLOCKED_DOMAIN_1PES_LIFETIME_H_ #define BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_BLOCKED_DOMAIN_1PES_LIFETIME_H_ +#include #include #include #include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h" namespace ephemeral_storage { @@ -49,7 +49,7 @@ class BlockedDomain1PESLifetime const Key key_; std::vector> on_ready_; - absl::optional is_1pes_enabled_; + std::optional is_1pes_enabled_; }; } // namespace brave_shields diff --git a/components/brave_shields/browser/cosmetic_merge_unittest.cc b/components/brave_shields/browser/cosmetic_merge_unittest.cc index ba18bda71b8..f04dc696bd3 100644 --- a/components/brave_shields/browser/cosmetic_merge_unittest.cc +++ b/components/brave_shields/browser/cosmetic_merge_unittest.cc @@ -3,6 +3,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include + #include "base/json/json_reader.h" #include "brave/components/brave_shields/browser/ad_block_service_helper.h" #include "testing/gmock/include/gmock/gmock.h" @@ -22,13 +24,13 @@ class CosmeticResourceMergeTest : public testing::Test { const std::string& b, bool force_hide, const std::string& expected) { - absl::optional a_val = base::JSONReader::Read(a); + std::optional a_val = base::JSONReader::Read(a); ASSERT_TRUE(a_val); - absl::optional b_val = base::JSONReader::Read(b); + std::optional b_val = base::JSONReader::Read(b); ASSERT_TRUE(b_val); - const absl::optional expected_val = + const std::optional expected_val = base::JSONReader::Read(expected); ASSERT_TRUE(expected_val); diff --git a/components/brave_shields/browser/csp_merge_unittest.cc b/components/brave_shields/browser/csp_merge_unittest.cc index 7d7ec46c9c2..fd74b0a3e20 100644 --- a/components/brave_shields/browser/csp_merge_unittest.cc +++ b/components/brave_shields/browser/csp_merge_unittest.cc @@ -3,18 +3,20 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include + #include "brave/components/brave_shields/browser/ad_block_service_helper.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" namespace brave_shields { -const absl::optional NO_POLICY = absl::nullopt; +const std::optional NO_POLICY = std::nullopt; const auto POLICY1 = - absl::optional("script-src 'self' 'unsafe-inline'"); + std::optional("script-src 'self' 'unsafe-inline'"); const auto POLICY2 = - absl::optional("media-src 'self' https://example.com"); + std::optional("media-src 'self' https://example.com"); TEST(CspMergeTest, MergeTwoEmptyPolicies) { const auto a = NO_POLICY; diff --git a/components/brave_shields/browser/filter_list_catalog_entry.cc b/components/brave_shields/browser/filter_list_catalog_entry.cc index 4e2dd9c14ed..aaecf8decb2 100644 --- a/components/brave_shields/browser/filter_list_catalog_entry.cc +++ b/components/brave_shields/browser/filter_list_catalog_entry.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_shields/browser/filter_list_catalog_entry.h" #include +#include #include #include @@ -16,7 +17,6 @@ #include "base/ranges/algorithm.h" #include "base/strings/string_util.h" #include "base/values.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace { @@ -156,8 +156,7 @@ std::vector FilterListCatalogFromJSON( std::vector catalog = std::vector(); - absl::optional parsed_json = - base::JSONReader::Read(catalog_json); + std::optional parsed_json = base::JSONReader::Read(catalog_json); if (!parsed_json || !parsed_json->is_list()) { LOG(ERROR) << "Could not load regional adblock catalog"; return catalog; diff --git a/components/brave_shields/common/brave_shield_utils.cc b/components/brave_shields/common/brave_shield_utils.cc index f556d75feed..6f51a65d257 100644 --- a/components/brave_shields/common/brave_shield_utils.cc +++ b/components/brave_shields/common/brave_shield_utils.cc @@ -11,7 +11,6 @@ #include "base/no_destructor.h" #include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_pattern.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h" namespace brave_shields { diff --git a/components/brave_sync/qr_code_data.cc b/components/brave_sync/qr_code_data.cc index f7bea02ec3f..a10ff394357 100644 --- a/components/brave_sync/qr_code_data.cc +++ b/components/brave_sync/qr_code_data.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_sync/qr_code_data.h" #include +#include #include #include "base/json/json_reader.h" @@ -69,7 +70,7 @@ std::unique_ptr QrCodeData::FromJson( const std::string& json_string) { auto qr_data = std::unique_ptr(new QrCodeData()); - absl::optional value = base::JSONReader::Read(json_string); + std::optional value = base::JSONReader::Read(json_string); if (!value) { VLOG(1) << "Could not parse string " << json_string; return nullptr; diff --git a/components/brave_sync/time_limited_words.h b/components/brave_sync/time_limited_words.h index 339c2e836b6..bc899b199ae 100644 --- a/components/brave_sync/time_limited_words.h +++ b/components/brave_sync/time_limited_words.h @@ -12,7 +12,6 @@ #include "base/gtest_prod_util.h" #include "base/time/time.h" #include "base/types/expected.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_sync { diff --git a/components/brave_vpn/browser/api/brave_vpn_api_helper.cc b/components/brave_vpn/browser/api/brave_vpn_api_helper.cc index 78b8da769fc..0da868f22f5 100644 --- a/components/brave_vpn/browser/api/brave_vpn_api_helper.cc +++ b/components/brave_vpn/browser/api/brave_vpn_api_helper.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_vpn/browser/api/brave_vpn_api_helper.h" #include +#include #include #include "base/base64.h" @@ -20,7 +21,6 @@ #include "brave/components/brave_vpn/common/pref_names.h" #include "brave/components/skus/browser/skus_utils.h" #include "components/prefs/pref_service.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/icu/source/i18n/unicode/timezone.h" namespace brave_vpn { @@ -58,8 +58,8 @@ std::vector ParseHostnames(const base::Value::List& hostnames_value) { constexpr char kCapacityScoreKey[] = "capacity-score"; const std::string* hostname_str = dict.FindString(kHostnameKey); const std::string* display_name_str = dict.FindString(kDisplayNameKey); - absl::optional offline = dict.FindBool(kOfflineKey); - absl::optional capacity_score = dict.FindInt(kCapacityScoreKey); + std::optional offline = dict.FindBool(kOfflineKey); + std::optional capacity_score = dict.FindInt(kCapacityScoreKey); if (!hostname_str || !display_name_str || !offline || !capacity_score) continue; diff --git a/components/brave_vpn/browser/api/vpn_response_parser.cc b/components/brave_vpn/browser/api/vpn_response_parser.cc index 3806ef6b37a..f117356599d 100644 --- a/components/brave_vpn/browser/api/vpn_response_parser.cc +++ b/components/brave_vpn/browser/api/vpn_response_parser.cc @@ -5,16 +5,17 @@ #include "brave/components/brave_vpn/browser/api/vpn_response_parser.h" +#include + #include "base/json/json_reader.h" #include "base/logging.h" #include "base/values.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_vpn { std::string ParseSubscriberCredentialFromJson(const std::string& json, std::string* error) { - absl::optional records_v = + std::optional records_v = base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS | base::JSONParserOptions::JSON_PARSE_RFC); if (!records_v || !records_v->is_dict()) { diff --git a/components/brave_vpn/browser/brave_vpn_service.cc b/components/brave_vpn/browser/brave_vpn_service.cc index 697d1c67698..d4286832f40 100644 --- a/components/brave_vpn/browser/brave_vpn_service.cc +++ b/components/brave_vpn/browser/brave_vpn_service.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_vpn/browser/brave_vpn_service.h" #include +#include #include #include "base/base64.h" @@ -33,7 +34,6 @@ #include "net/cookies/cookie_inclusion_status.h" #include "net/cookies/cookie_util.h" #include "net/cookies/parsed_cookie.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/base/l10n/l10n_util.h" #include "url/url_util.h" @@ -409,8 +409,8 @@ void BraveVpnService::AddObserver( } mojom::PurchasedInfo BraveVpnService::GetPurchasedInfoSync() const { - return purchased_state_.value_or(mojom::PurchasedInfo( - mojom::PurchasedState::NOT_PURCHASED, absl::nullopt)); + return purchased_state_.value_or( + mojom::PurchasedInfo(mojom::PurchasedState::NOT_PURCHASED, std::nullopt)); } void BraveVpnService::GetPurchasedState(GetPurchasedStateCallback callback) { @@ -497,7 +497,7 @@ void BraveVpnService::OnCredentialSummary(const std::string& domain, return; } - absl::optional records_v = base::JSONReader::Read( + std::optional records_v = base::JSONReader::Read( summary_string, base::JSONParserOptions::JSON_PARSE_RFC); // Early return when summary is invalid or it's empty dict. @@ -761,7 +761,7 @@ void BraveVpnService::OnP3AInterval() { void BraveVpnService::SetPurchasedState( const std::string& env, PurchasedState state, - const absl::optional& description) { + const std::optional& description) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); if (GetPurchasedInfoSync().state == state || env != GetCurrentEnvironment()) { return; diff --git a/components/brave_vpn/browser/brave_vpn_service.h b/components/brave_vpn/browser/brave_vpn_service.h index 2b63cdd9e91..768f08ce952 100644 --- a/components/brave_vpn/browser/brave_vpn_service.h +++ b/components/brave_vpn/browser/brave_vpn_service.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_VPN_BROWSER_BRAVE_VPN_SERVICE_H_ #include +#include #include #include @@ -30,7 +31,6 @@ #include "mojo/public/cpp/bindings/receiver_set.h" #include "mojo/public/cpp/bindings/remote_set.h" #include "services/network/public/cpp/shared_url_loader_factory.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h" namespace network { @@ -190,7 +190,7 @@ class BraveVpnService : void SetPurchasedState( const std::string& env, mojom::PurchasedState state, - const absl::optional& description = absl::nullopt); + const std::optional& description = std::nullopt); void SetCurrentEnvironment(const std::string& env); void EnsureMojoConnected(); void OnMojoConnectionError(); @@ -227,7 +227,7 @@ class BraveVpnService : base::RepeatingCallback()> skus_service_getter_; mojo::Remote skus_service_; - absl::optional purchased_state_; + std::optional purchased_state_; mojo::RemoteSet observers_; std::unique_ptr api_request_; base::RepeatingTimer p3a_timer_; diff --git a/components/brave_vpn/browser/brave_vpn_service_helper.cc b/components/brave_vpn/browser/brave_vpn_service_helper.cc index ede770ae1da..7ef5f18c28c 100644 --- a/components/brave_vpn/browser/brave_vpn_service_helper.cc +++ b/components/brave_vpn/browser/brave_vpn_service_helper.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_vpn/browser/brave_vpn_service_helper.h" #include +#include #include #include "base/base64.h" @@ -55,9 +56,9 @@ bool HasSubscriberCredential(PrefService* local_prefs) { return !sub_cred_dict.empty(); } -absl::optional GetExpirationTime(PrefService* local_prefs) { +std::optional GetExpirationTime(PrefService* local_prefs) { if (!HasValidSubscriberCredential(local_prefs)) - return absl::nullopt; + return std::nullopt; const base::Value::Dict& sub_cred_dict = local_prefs->GetDict(prefs::kBraveVPNSubscriberCredential); @@ -66,7 +67,7 @@ absl::optional GetExpirationTime(PrefService* local_prefs) { sub_cred_dict.Find(kSubscriberCredentialExpirationKey); if (!expiration_time_value) - return absl::nullopt; + return std::nullopt; return base::ValueToTime(expiration_time_value); } diff --git a/components/brave_vpn/browser/brave_vpn_service_helper.h b/components/brave_vpn/browser/brave_vpn_service_helper.h index ac2a3f88174..c31cea266d9 100644 --- a/components/brave_vpn/browser/brave_vpn_service_helper.h +++ b/components/brave_vpn/browser/brave_vpn_service_helper.h @@ -7,12 +7,12 @@ #define BRAVE_COMPONENTS_BRAVE_VPN_BROWSER_BRAVE_VPN_SERVICE_HELPER_H_ #include +#include #include #include #include "base/values.h" #include "brave/components/brave_vpn/common/mojom/brave_vpn.mojom.h" -#include "third_party/abseil-cpp/absl/types/optional.h" class PrefService; @@ -31,7 +31,7 @@ bool IsValidCredentialSummary(const base::Value& summary); bool IsValidCredentialSummaryButNeedActivation(const base::Value& summary); bool HasSubscriberCredential(PrefService* local_prefs); std::string GetSubscriberCredential(PrefService* local_prefs); -absl::optional GetExpirationTime(PrefService* local_prefs); +std::optional GetExpirationTime(PrefService* local_prefs); void SetSubscriberCredential(PrefService* local_prefs, const std::string& subscriber_credential, const base::Time& expiration_time); diff --git a/components/brave_vpn/browser/brave_vpn_service_observer.h b/components/brave_vpn/browser/brave_vpn_service_observer.h index 1af0e1d8a1e..d5f6ccd552b 100644 --- a/components/brave_vpn/browser/brave_vpn_service_observer.h +++ b/components/brave_vpn/browser/brave_vpn_service_observer.h @@ -6,12 +6,12 @@ #ifndef BRAVE_COMPONENTS_BRAVE_VPN_BROWSER_BRAVE_VPN_SERVICE_OBSERVER_H_ #define BRAVE_COMPONENTS_BRAVE_VPN_BROWSER_BRAVE_VPN_SERVICE_OBSERVER_H_ +#include #include #include "brave/components/brave_vpn/common/mojom/brave_vpn.mojom.h" #include "build/build_config.h" #include "mojo/public/cpp/bindings/receiver.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_vpn { @@ -29,7 +29,7 @@ class BraveVPNServiceObserver : public mojom::ServiceObserver { // mojom::ServiceObserver overrides: void OnPurchasedStateChanged( mojom::PurchasedState state, - const absl::optional& description) override {} + const std::optional& description) override {} #if !BUILDFLAG(IS_ANDROID) void OnConnectionStateChanged(mojom::ConnectionState state) override {} void OnSelectedRegionChanged(mojom::RegionPtr region) override {} diff --git a/components/brave_vpn/browser/brave_vpn_service_unittest.cc b/components/brave_vpn/browser/brave_vpn_service_unittest.cc index dceafb1d32b..3b4214d4204 100644 --- a/components/brave_vpn/browser/brave_vpn_service_unittest.cc +++ b/components/brave_vpn/browser/brave_vpn_service_unittest.cc @@ -3,7 +3,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include "brave/components/brave_vpn/browser/brave_vpn_service.h" + #include +#include #include #include "base/base64.h" @@ -17,7 +20,6 @@ #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "brave/components/brave_vpn/browser/api/brave_vpn_api_request.h" -#include "brave/components/brave_vpn/browser/brave_vpn_service.h" #include "brave/components/brave_vpn/browser/brave_vpn_service_helper.h" #include "brave/components/brave_vpn/browser/connection/brave_vpn_connection_info.h" #include "brave/components/brave_vpn/browser/connection/brave_vpn_os_connection_api.h" @@ -42,7 +44,6 @@ #include "services/network/test/test_url_loader_factory.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #if !BUILDFLAG(IS_ANDROID) #include "brave/components/brave_vpn/browser/connection/ikev2/brave_vpn_ras_connection_api_sim.h" @@ -142,7 +143,7 @@ class TestBraveVPNServiceObserver : public mojom::ServiceObserver { void OnPurchasedStateChanged( PurchasedState state, - const absl::optional& description) override { + const std::optional& description) override { purchased_state_ = state; if (purchased_callback_) std::move(purchased_callback_).Run(); @@ -176,16 +177,16 @@ class TestBraveVPNServiceObserver : public mojom::ServiceObserver { purchased_state_.reset(); connection_state_.reset(); } - absl::optional GetPurchasedState() const { + std::optional GetPurchasedState() const { return purchased_state_; } - absl::optional GetConnectionState() const { + std::optional GetConnectionState() const { return connection_state_; } private: - absl::optional purchased_state_; - absl::optional connection_state_; + std::optional purchased_state_; + std::optional connection_state_; base::OnceClosure purchased_callback_; base::OnceClosure connection_state_callback_; base::OnceClosure selected_region_callback_; diff --git a/components/brave_vpn/browser/connection/brave_vpn_os_connection_api.cc b/components/brave_vpn/browser/connection/brave_vpn_os_connection_api.cc index 5f8c084853f..2dc1555f0b1 100644 --- a/components/brave_vpn/browser/connection/brave_vpn_os_connection_api.cc +++ b/components/brave_vpn/browser/connection/brave_vpn_os_connection_api.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_vpn/browser/connection/brave_vpn_os_connection_api.h" +#include #include #include "base/check_is_test.h" @@ -208,7 +209,7 @@ void BraveVPNOSConnectionAPI::OnFetchHostnames(const std::string& region, ResetAPIRequestInstance(); - absl::optional value = base::JSONReader::Read(hostnames); + std::optional value = base::JSONReader::Read(hostnames); if (value && value->is_list()) { ParseAndCacheHostnames(region, value->GetList()); return; diff --git a/components/brave_vpn/browser/connection/brave_vpn_region_data_manager.cc b/components/brave_vpn/browser/connection/brave_vpn_region_data_manager.cc index 1f7281b2e28..b407a05dcbb 100644 --- a/components/brave_vpn/browser/connection/brave_vpn_region_data_manager.cc +++ b/components/brave_vpn/browser/connection/brave_vpn_region_data_manager.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_vpn/browser/connection/brave_vpn_region_data_manager.h" #include +#include #include #include "base/check_is_test.h" @@ -16,7 +17,6 @@ #include "brave/components/brave_vpn/common/brave_vpn_constants.h" #include "brave/components/brave_vpn/common/pref_names.h" #include "components/prefs/pref_service.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_vpn { @@ -275,7 +275,7 @@ void BraveVPNRegionDataManager::OnFetchRegionList( } api_request_.reset(); - absl::optional value = base::JSONReader::Read(region_list); + std::optional value = base::JSONReader::Read(region_list); if (value && value->is_list() && ParseAndCacheRegionList(value->GetList(), true)) { VLOG(2) << "Got valid region list"; @@ -318,7 +318,7 @@ void BraveVPNRegionDataManager::OnFetchTimezones( bool success) { api_request_.reset(); - absl::optional value = base::JSONReader::Read(timezones_list); + std::optional value = base::JSONReader::Read(timezones_list); if (success && value && value->is_list()) { VLOG(2) << "Got valid timezones list"; SetDeviceRegionWithTimezone(value->GetList()); diff --git a/components/brave_vpn/browser/connection/ikev2/brave_vpn_ras_connection_api_base.cc b/components/brave_vpn/browser/connection/ikev2/brave_vpn_ras_connection_api_base.cc index 42fee74b005..2757f44964a 100644 --- a/components/brave_vpn/browser/connection/ikev2/brave_vpn_ras_connection_api_base.cc +++ b/components/brave_vpn/browser/connection/ikev2/brave_vpn_ras_connection_api_base.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_vpn/browser/connection/ikev2/brave_vpn_ras_connection_api_base.h" +#include #include #include @@ -307,8 +308,7 @@ void BraveVPNOSConnectionAPIBase::OnGetProfileCredentials( VLOG(2) << __func__ << " : received profile credential"; - absl::optional value = - base::JSONReader::Read(profile_credential); + std::optional value = base::JSONReader::Read(profile_credential); if (value && value->is_dict()) { constexpr char kUsernameKey[] = "eap-username"; constexpr char kPasswordKey[] = "eap-password"; diff --git a/components/brave_vpn/browser/connection/ikev2/brave_vpn_ras_connection_api_base.h b/components/brave_vpn/browser/connection/ikev2/brave_vpn_ras_connection_api_base.h index 51a696cf88e..c141164f68f 100644 --- a/components/brave_vpn/browser/connection/ikev2/brave_vpn_ras_connection_api_base.h +++ b/components/brave_vpn/browser/connection/ikev2/brave_vpn_ras_connection_api_base.h @@ -22,7 +22,6 @@ #include "brave/components/brave_vpn/common/mojom/brave_vpn.mojom.h" #include "net/base/network_change_notifier.h" #include "services/network/public/cpp/shared_url_loader_factory.h" -#include "third_party/abseil-cpp/absl/types/optional.h" class PrefService; diff --git a/components/brave_vpn/browser/connection/ikev2/brave_vpn_ras_connection_api_sim.h b/components/brave_vpn/browser/connection/ikev2/brave_vpn_ras_connection_api_sim.h index 1a3fe0768f1..b347b6793a5 100644 --- a/components/brave_vpn/browser/connection/ikev2/brave_vpn_ras_connection_api_sim.h +++ b/components/brave_vpn/browser/connection/ikev2/brave_vpn_ras_connection_api_sim.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_VPN_BROWSER_CONNECTION_IKEV2_BRAVE_VPN_RAS_CONNECTION_API_SIM_H_ #define BRAVE_COMPONENTS_BRAVE_VPN_BROWSER_CONNECTION_IKEV2_BRAVE_VPN_RAS_CONNECTION_API_SIM_H_ +#include #include #include "base/gtest_prod_util.h" @@ -69,7 +70,7 @@ class BraveVPNOSConnectionAPISim : public BraveVPNOSConnectionAPIBase { bool connection_created_ = false; bool check_connection_called_ = false; - absl::optional network_available_; + std::optional network_available_; base::WeakPtrFactory weak_factory_{this}; }; diff --git a/components/brave_vpn/browser/connection/ikev2/win/brave_vpn_helper/vpn_dns_handler.h b/components/brave_vpn/browser/connection/ikev2/win/brave_vpn_helper/vpn_dns_handler.h index 71c7631cd8a..ca2e9b5f644 100644 --- a/components/brave_vpn/browser/connection/ikev2/win/brave_vpn_helper/vpn_dns_handler.h +++ b/components/brave_vpn/browser/connection/ikev2/win/brave_vpn_helper/vpn_dns_handler.h @@ -7,6 +7,8 @@ #define BRAVE_COMPONENTS_BRAVE_VPN_BROWSER_CONNECTION_IKEV2_WIN_BRAVE_VPN_HELPER_VPN_DNS_HANDLER_H_ #include + +#include #include #include "base/gtest_prod_util.h" @@ -15,7 +17,6 @@ #include "base/task/sequenced_task_runner.h" #include "base/timer/timer.h" #include "base/win/object_watcher.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_vpn { @@ -63,10 +64,10 @@ class VpnDnsHandler : public base::win::ObjectWatcher::Delegate { void Exit(); virtual void SubscribeForRasNotifications(HANDLE event_handle); - absl::optional connection_result_for_testing_; - absl::optional platform_filters_result_for_testing_; - absl::optional close_engine_result_for_testing_; - absl::optional waiting_interval_before_exit_for_testing_; + std::optional connection_result_for_testing_; + std::optional platform_filters_result_for_testing_; + std::optional close_engine_result_for_testing_; + std::optional waiting_interval_before_exit_for_testing_; raw_ptr delegate_; HANDLE engine_ = nullptr; HANDLE event_handle_for_vpn_ = nullptr; diff --git a/components/brave_vpn/browser/connection/ikev2/win/brave_vpn_helper/vpn_utils.cc b/components/brave_vpn/browser/connection/ikev2/win/brave_vpn_helper/vpn_utils.cc index cf149e43f9e..0504f3ffbd2 100644 --- a/components/brave_vpn/browser/connection/ikev2/win/brave_vpn_helper/vpn_utils.cc +++ b/components/brave_vpn/browser/connection/ikev2/win/brave_vpn_helper/vpn_utils.cc @@ -8,6 +8,8 @@ #include #include #include + +#include #include #include "base/logging.h" @@ -18,7 +20,6 @@ #include "brave/components/brave_vpn/browser/connection/ikev2/win/brave_vpn_helper/brave_vpn_helper_constants.h" #include "brave/components/brave_vpn/common/win/scoped_sc_handle.h" #include "brave/components/brave_vpn/common/win/utils.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_vpn { @@ -107,18 +108,18 @@ DWORD RegisterSublayer(HANDLE engine_handle, GUID uuid) { return ERROR_SUCCESS; } -absl::optional GetAdapterIndexByName(const std::string& name) { +std::optional GetAdapterIndexByName(const std::string& name) { ULONG adapter_info_size = 0; // Get the right buffer size in case of overflow if (::GetAdaptersInfo(nullptr, &adapter_info_size) != ERROR_BUFFER_OVERFLOW || adapter_info_size == 0) { - return absl::nullopt; + return std::nullopt; } std::vector adapters(adapter_info_size); if (::GetAdaptersInfo(reinterpret_cast(adapters.data()), &adapter_info_size) != ERROR_SUCCESS) { - return absl::nullopt; + return std::nullopt; } // The returned value is not an array of IP_ADAPTER_INFO elements but a linked @@ -132,7 +133,7 @@ absl::optional GetAdapterIndexByName(const std::string& name) { adapter = adapter->Next; } - return absl::nullopt; + return std::nullopt; } DWORD BlockIPv4Queries(HANDLE engine_handle) { diff --git a/components/brave_vpn/browser/connection/ikev2/win/ras_utils.cc b/components/brave_vpn/browser/connection/ikev2/win/ras_utils.cc index b051c0282f6..d563566e5cd 100644 --- a/components/brave_vpn/browser/connection/ikev2/win/ras_utils.cc +++ b/components/brave_vpn/browser/connection/ikev2/win/ras_utils.cc @@ -6,11 +6,12 @@ #include "brave/components/brave_vpn/browser/connection/ikev2/win/ras_utils.h" #include - #include #include #include +#include + #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" @@ -66,10 +67,10 @@ std::string GetSystemError(DWORD error) { } // https://docs.microsoft.com/en-us/windows/win32/api/ras/nf-ras-rassetcredentialsa -absl::optional SetCredentials(LPCTSTR phone_book_path, - LPCTSTR entry_name, - LPCTSTR username, - LPCTSTR password) { +std::optional SetCredentials(LPCTSTR phone_book_path, + LPCTSTR entry_name, + LPCTSTR username, + LPCTSTR password) { RASCREDENTIALS credentials; ZeroMemory(&credentials, sizeof(RASCREDENTIALS)); @@ -86,13 +87,13 @@ absl::optional SetCredentials(LPCTSTR phone_book_path, {"RasSetCredential() - ", ras::GetRasErrorMessage(dw_ret)}); } - return absl::nullopt; + return std::nullopt; } -absl::optional TryToCreateEmptyPhoneBookFile() { +std::optional TryToCreateEmptyPhoneBookFile() { base::FilePath dir; if (!base::PathService::Get(base::DIR_ROAMING_APP_DATA, &dir)) { - return absl::nullopt; + return std::nullopt; } dir = dir.Append(L"Microsoft") @@ -100,7 +101,7 @@ absl::optional TryToCreateEmptyPhoneBookFile() { .Append(L"Connections") .Append(L"Pbk"); if (!base::CreateDirectoryAndGetError(dir, nullptr)) { - return absl::nullopt; + return std::nullopt; } base::FilePath phone_book_path = dir.Append(L"rasphone.pbk"); @@ -108,7 +109,7 @@ absl::optional TryToCreateEmptyPhoneBookFile() { if (file_stream) { return phone_book_path.value(); } - return absl::nullopt; + return std::nullopt; } std::wstring TryGetPhonebookPath(int key, const std::wstring& entry_name) { diff --git a/components/brave_vpn/browser/connection/wireguard/credentials/brave_vpn_wireguard_profile_credentials.cc b/components/brave_vpn/browser/connection/wireguard/credentials/brave_vpn_wireguard_profile_credentials.cc index 26406fe7848..9d89c520435 100644 --- a/components/brave_vpn/browser/connection/wireguard/credentials/brave_vpn_wireguard_profile_credentials.cc +++ b/components/brave_vpn/browser/connection/wireguard/credentials/brave_vpn_wireguard_profile_credentials.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_vpn/browser/connection/wireguard/credentials/brave_vpn_wireguard_profile_credentials.h" +#include #include #include "base/json/json_reader.h" @@ -38,73 +39,73 @@ WireguardProfileCredentials::WireguardProfileCredentials( WireguardProfileCredentials::~WireguardProfileCredentials() = default; -absl::optional +std::optional WireguardProfileCredentials::FromServerResponse( const std::string& server_response, const std::string& client_private_key) { if (server_response.empty() || client_private_key.empty()) { - return absl::nullopt; + return std::nullopt; } - absl::optional value = base::JSONReader::Read(server_response); + std::optional value = base::JSONReader::Read(server_response); if (!value.has_value()) { - return absl::nullopt; + return std::nullopt; } auto* server_public_key = value->GetDict().FindStringByDottedPath("server-public-key"); if (!server_public_key) { - return absl::nullopt; + return std::nullopt; } auto* mapped_ip4_address = value->GetDict().FindStringByDottedPath("mapped-ipv4-address"); if (!mapped_ip4_address) { - return absl::nullopt; + return std::nullopt; } auto* client_id = value->GetDict().FindStringByDottedPath("client-id"); if (!client_id) { - return absl::nullopt; + return std::nullopt; } auto* api_auth_token = value->GetDict().FindStringByDottedPath("api-auth-token"); if (!api_auth_token) { - return absl::nullopt; + return std::nullopt; } return WireguardProfileCredentials(*server_public_key, client_private_key, *mapped_ip4_address, *client_id, *api_auth_token); } -absl::optional +std::optional WireguardProfileCredentials::FromString(const std::string& credentials) { if (credentials.empty()) { - return absl::nullopt; + return std::nullopt; } - absl::optional value = base::JSONReader::Read(credentials); + std::optional value = base::JSONReader::Read(credentials); if (!value.has_value()) { - return absl::nullopt; + return std::nullopt; } auto* server_public_key = value->GetDict().FindStringByDottedPath("server-public-key"); if (!server_public_key) { - return absl::nullopt; + return std::nullopt; } auto* client_private_key = value->GetDict().FindStringByDottedPath("client-private-key"); if (!client_private_key) { - return absl::nullopt; + return std::nullopt; } auto* mapped_ip4_address = value->GetDict().FindStringByDottedPath("mapped-ipv4-address"); if (!mapped_ip4_address) { - return absl::nullopt; + return std::nullopt; } auto* client_id = value->GetDict().FindStringByDottedPath("client-id"); if (!client_id) { - return absl::nullopt; + return std::nullopt; } auto* api_auth_token = value->GetDict().FindStringByDottedPath("api-auth-token"); if (!api_auth_token) { - return absl::nullopt; + return std::nullopt; } return WireguardProfileCredentials(*server_public_key, *client_private_key, *mapped_ip4_address, *client_id, @@ -117,9 +118,9 @@ bool WireguardProfileCredentials::IsValid() const { !api_auth_token.empty(); } -absl::optional WireguardProfileCredentials::ToString() const { +std::optional WireguardProfileCredentials::ToString() const { if (!IsValid()) { - return absl::nullopt; + return std::nullopt; } base::Value::Dict data; diff --git a/components/brave_vpn/browser/connection/wireguard/credentials/brave_vpn_wireguard_profile_credentials.h b/components/brave_vpn/browser/connection/wireguard/credentials/brave_vpn_wireguard_profile_credentials.h index b6e893f81a5..47008e6cbf2 100644 --- a/components/brave_vpn/browser/connection/wireguard/credentials/brave_vpn_wireguard_profile_credentials.h +++ b/components/brave_vpn/browser/connection/wireguard/credentials/brave_vpn_wireguard_profile_credentials.h @@ -6,10 +6,10 @@ #ifndef BRAVE_COMPONENTS_BRAVE_VPN_BROWSER_CONNECTION_WIREGUARD_CREDENTIALS_BRAVE_VPN_WIREGUARD_PROFILE_CREDENTIALS_H_ #define BRAVE_COMPONENTS_BRAVE_VPN_BROWSER_CONNECTION_WIREGUARD_CREDENTIALS_BRAVE_VPN_WIREGUARD_PROFILE_CREDENTIALS_H_ +#include #include #include "base/functional/callback.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_vpn { @@ -32,13 +32,13 @@ struct WireguardProfileCredentials { api_auth_token == other.api_auth_token; } - static absl::optional FromServerResponse( + static std::optional FromServerResponse( const std::string& credentials, const std::string& client_private_key); - static absl::optional FromString( + static std::optional FromString( const std::string& credentials); - absl::optional ToString() const; + std::optional ToString() const; bool IsValid() const; std::string server_public_key; diff --git a/components/brave_vpn/browser/connection/wireguard/credentials/brave_vpn_wireguard_profile_credentials_unittest.cc b/components/brave_vpn/browser/connection/wireguard/credentials/brave_vpn_wireguard_profile_credentials_unittest.cc index 95dbe5bef51..2e3c9e8a4e9 100644 --- a/components/brave_vpn/browser/connection/wireguard/credentials/brave_vpn_wireguard_profile_credentials_unittest.cc +++ b/components/brave_vpn/browser/connection/wireguard/credentials/brave_vpn_wireguard_profile_credentials_unittest.cc @@ -6,7 +6,6 @@ #include "brave/components/brave_vpn/browser/connection/wireguard/credentials/brave_vpn_wireguard_profile_credentials.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_vpn { diff --git a/components/brave_vpn/browser/connection/wireguard/mac/brave_vpn_wireguard_connection_api_mac.mm b/components/brave_vpn/browser/connection/wireguard/mac/brave_vpn_wireguard_connection_api_mac.mm index 1f289e407b0..63c2dfb4a25 100644 --- a/components/brave_vpn/browser/connection/wireguard/mac/brave_vpn_wireguard_connection_api_mac.mm +++ b/components/brave_vpn/browser/connection/wireguard/mac/brave_vpn_wireguard_connection_api_mac.mm @@ -9,7 +9,6 @@ #include "base/base64.h" #include "base/notreached.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_vpn { diff --git a/components/brave_vpn/common/win/utils.cc b/components/brave_vpn/common/win/utils.cc index df1b28607fa..ef9e990ccab 100644 --- a/components/brave_vpn/common/win/utils.cc +++ b/components/brave_vpn/common/win/utils.cc @@ -6,6 +6,8 @@ #include "brave/components/brave_vpn/common/win/utils.h" #include + +#include #include #include "base/logging.h" @@ -27,13 +29,12 @@ bool IsWindowsServiceRunning(const std::wstring& service_name) { return status.value() == SERVICE_RUNNING; } -absl::optional GetWindowsServiceStatus( - const std::wstring& service_name) { +std::optional GetWindowsServiceStatus(const std::wstring& service_name) { ScopedScHandle scm(::OpenSCManager(nullptr, nullptr, SC_MANAGER_CONNECT)); if (!scm.IsValid()) { VLOG(1) << "::OpenSCManager failed. service_name: " << service_name << ", error: " << std::hex << HRESULTFromLastError(); - return absl::nullopt; + return std::nullopt; } ScopedScHandle service( ::OpenService(scm.Get(), service_name.c_str(), SERVICE_QUERY_STATUS)); @@ -41,11 +42,11 @@ absl::optional GetWindowsServiceStatus( // Service registered and has not exceeded the number of auto-configured // restarts. if (!service.IsValid()) { - return absl::nullopt; + return std::nullopt; } SERVICE_STATUS service_status = {0}; if (!::QueryServiceStatus(service.Get(), &service_status)) { - return absl::nullopt; + return std::nullopt; } return service_status.dwCurrentState; } diff --git a/components/brave_vpn/common/win/utils.h b/components/brave_vpn/common/win/utils.h index e5a577d99a9..d2c56e42874 100644 --- a/components/brave_vpn/common/win/utils.h +++ b/components/brave_vpn/common/win/utils.h @@ -7,14 +7,15 @@ #define BRAVE_COMPONENTS_BRAVE_VPN_COMMON_WIN_UTILS_H_ #include + +#include #include #include "base/win/windows_types.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_vpn { HRESULT HRESULTFromLastError(); -absl::optional GetWindowsServiceStatus(const std::wstring& service_name); +std::optional GetWindowsServiceStatus(const std::wstring& service_name); bool IsWindowsServiceRunning(const std::wstring& service_name); bool SetServiceFailureActions(SC_HANDLE service); } // namespace brave_vpn diff --git a/components/brave_vpn/common/wireguard/win/storage_utils.cc b/components/brave_vpn/common/wireguard/win/storage_utils.cc index 6a44ac7c425..4ab056d1a9a 100644 --- a/components/brave_vpn/common/wireguard/win/storage_utils.cc +++ b/components/brave_vpn/common/wireguard/win/storage_utils.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_vpn/common/wireguard/win/storage_utils.h" +#include + #include "base/logging.h" #include "base/win/registry.h" #include "brave/components/brave_vpn/common/wireguard/win/service_constants.h" @@ -23,14 +25,14 @@ constexpr wchar_t kBraveWireguardActiveKeyName[] = L"WireGuardActive"; constexpr wchar_t kBraveWireguardConnectionStateName[] = L"ConnectionState"; constexpr uint16_t kBraveVpnWireguardMaxFailedAttempts = 3; -absl::optional GetStorageKey(HKEY root_key, REGSAM access) { +std::optional GetStorageKey(HKEY root_key, REGSAM access) { base::win::RegKey storage; if (storage.Create( root_key, brave_vpn::wireguard::GetBraveVpnWireguardServiceRegistryStoragePath() .c_str(), access) != ERROR_SUCCESS) { - return absl::nullopt; + return std::nullopt; } return storage; @@ -47,17 +49,17 @@ std::wstring GetBraveVpnWireguardServiceRegistryStoragePath() { // Returns last used config path. // We keep config file between launches to be able to reuse it outside of Brave. -absl::optional GetLastUsedConfigPath() { +std::optional GetLastUsedConfigPath() { auto storage = GetStorageKey(HKEY_LOCAL_MACHINE, KEY_QUERY_VALUE); if (!storage.has_value()) { - return absl::nullopt; + return std::nullopt; } std::wstring value; if (storage->ReadValue(kBraveWireguardConfigKeyName, &value) != ERROR_SUCCESS || value.empty()) { - return absl::nullopt; + return std::nullopt; } return base::FilePath(value); } @@ -194,17 +196,17 @@ void WriteConnectionState(int value) { } } -absl::optional GetConnectionState() { +std::optional GetConnectionState() { auto storage = GetStorageKey(HKEY_CURRENT_USER, KEY_QUERY_VALUE); if (!storage.has_value()) { - return absl::nullopt; + return std::nullopt; } DWORD value; if (storage->ReadValueDW(kBraveWireguardConnectionStateName, &value) == ERROR_SUCCESS) { return value; } - return absl::nullopt; + return std::nullopt; } } // namespace brave_vpn diff --git a/components/brave_vpn/common/wireguard/win/storage_utils.h b/components/brave_vpn/common/wireguard/win/storage_utils.h index 374145cf36f..b0750cd20ba 100644 --- a/components/brave_vpn/common/wireguard/win/storage_utils.h +++ b/components/brave_vpn/common/wireguard/win/storage_utils.h @@ -6,14 +6,15 @@ #ifndef BRAVE_COMPONENTS_BRAVE_VPN_COMMON_WIREGUARD_WIN_STORAGE_UTILS_H_ #define BRAVE_COMPONENTS_BRAVE_VPN_COMMON_WIREGUARD_WIN_STORAGE_UTILS_H_ +#include + #include "base/files/file_path.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_vpn { namespace wireguard { std::wstring GetBraveVpnWireguardServiceRegistryStoragePath(); -absl::optional GetLastUsedConfigPath(); +std::optional GetLastUsedConfigPath(); bool UpdateLastUsedConfigPath(const base::FilePath& config_path); void RemoveStorageKey(); } // namespace wireguard @@ -29,7 +30,7 @@ void IncrementWireguardTunnelUsageFlag(); void ResetWireguardTunnelUsageFlag(); void WriteConnectionState(int state); -absl::optional GetConnectionState(); +std::optional GetConnectionState(); } // namespace brave_vpn diff --git a/components/brave_vpn/common/wireguard/win/wireguard_utils_win.cc b/components/brave_vpn/common/wireguard/win/wireguard_utils_win.cc index 7fb5cb77570..c023f1bb929 100644 --- a/components/brave_vpn/common/wireguard/win/wireguard_utils_win.cc +++ b/components/brave_vpn/common/wireguard/win/wireguard_utils_win.cc @@ -8,6 +8,8 @@ #include #include #include + +#include #include #include "base/base64.h" @@ -24,12 +26,11 @@ #include "brave/components/brave_vpn/common/wireguard/win/brave_wireguard_manager_idl.h" #include "brave/components/brave_vpn/common/wireguard/win/service_constants.h" #include "brave/components/brave_vpn/common/wireguard/win/service_details.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_vpn { namespace { -absl::optional g_wireguard_service_registered_for_testing; +std::optional g_wireguard_service_registered_for_testing; } // namespace namespace wireguard { @@ -145,7 +146,7 @@ wireguard::WireguardKeyPair WireguardGenerateKeypairImpl() { brave_vpn::GetBraveVpnWireguardServiceIid(), IID_PPV_ARGS_Helper(&service)))) { VLOG(1) << "Unable to create IBraveVpnWireguardManager instance"; - return absl::nullopt; + return std::nullopt; } if (FAILED(CoSetProxyBlanket( @@ -153,7 +154,7 @@ wireguard::WireguardKeyPair WireguardGenerateKeypairImpl() { COLE_DEFAULT_PRINCIPAL, RPC_C_AUTHN_LEVEL_PKT_PRIVACY, RPC_C_IMP_LEVEL_IMPERSONATE, nullptr, EOAC_DYNAMIC_CLOAKING))) { VLOG(1) << "Unable to call CoSetProxyBlanket"; - return absl::nullopt; + return std::nullopt; } DWORD error_code = 0; @@ -163,7 +164,7 @@ wireguard::WireguardKeyPair WireguardGenerateKeypairImpl() { public_key_raw.Receive(), private_key_raw.Receive(), &error_code)) || error_code) { VLOG(1) << "Unable to generate keypair"; - return absl::nullopt; + return std::nullopt; } std::wstring public_key_wide; diff --git a/components/brave_vpn/common/wireguard/win/wireguard_utils_win.h b/components/brave_vpn/common/wireguard/win/wireguard_utils_win.h index e5d451d637c..fba7ee16dd4 100644 --- a/components/brave_vpn/common/wireguard/win/wireguard_utils_win.h +++ b/components/brave_vpn/common/wireguard/win/wireguard_utils_win.h @@ -6,12 +6,12 @@ #ifndef BRAVE_COMPONENTS_BRAVE_VPN_COMMON_WIREGUARD_WIN_WIREGUARD_UTILS_WIN_H_ #define BRAVE_COMPONENTS_BRAVE_VPN_COMMON_WIREGUARD_WIN_WIREGUARD_UTILS_WIN_H_ +#include #include #include #include "base/functional/callback.h" #include "brave/components/brave_vpn/common/wireguard/wireguard_utils.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_vpn { @@ -20,7 +20,7 @@ namespace wireguard { bool IsBraveVPNWireguardTunnelServiceRunning(); bool IsWireguardServiceRegistered(); void WireguardGenerateKeypair(WireguardGenerateKeypairCallback callback); -absl::optional CreateWireguardConfig( +std::optional CreateWireguardConfig( const std::string& client_private_key, const std::string& server_public_key, const std::string& vpn_server_hostname, diff --git a/components/brave_vpn/common/wireguard/wireguard_utils.cc b/components/brave_vpn/common/wireguard/wireguard_utils.cc index ed3384e24f9..d53558ba3a5 100644 --- a/components/brave_vpn/common/wireguard/wireguard_utils.cc +++ b/components/brave_vpn/common/wireguard/wireguard_utils.cc @@ -6,6 +6,8 @@ #include "brave/components/brave_vpn/common/wireguard/wireguard_utils.h" #include + +#include #include #include "base/base64.h" @@ -48,14 +50,14 @@ constexpr char kWireguardConfigTemplate[] = R"( } // namespace -absl::optional CreateWireguardConfig( +std::optional CreateWireguardConfig( const std::string& client_private_key, const std::string& server_public_key, const std::string& vpn_server_hostname, const std::string& mapped_ipv4_address) { if (client_private_key.empty() || server_public_key.empty() || vpn_server_hostname.empty() || mapped_ipv4_address.empty()) { - return absl::nullopt; + return std::nullopt; } std::string config = kWireguardConfigTemplate; base::ReplaceSubstringsAfterOffset(&config, 0, "{client_private_key}", diff --git a/components/brave_vpn/common/wireguard/wireguard_utils.h b/components/brave_vpn/common/wireguard/wireguard_utils.h index d992ef3e894..4ec1b93eb02 100644 --- a/components/brave_vpn/common/wireguard/wireguard_utils.h +++ b/components/brave_vpn/common/wireguard/wireguard_utils.h @@ -6,22 +6,22 @@ #ifndef BRAVE_COMPONENTS_BRAVE_VPN_COMMON_WIREGUARD_WIREGUARD_UTILS_H_ #define BRAVE_COMPONENTS_BRAVE_VPN_COMMON_WIREGUARD_WIREGUARD_UTILS_H_ +#include #include #include #include "base/functional/callback.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_vpn { namespace wireguard { using BooleanCallback = base::OnceCallback; -using WireguardKeyPair = absl::optional>; +using WireguardKeyPair = std::optional>; using WireguardGenerateKeypairCallback = base::OnceCallback; -absl::optional CreateWireguardConfig( +std::optional CreateWireguardConfig( const std::string& client_private_key, const std::string& server_public_key, const std::string& vpn_server_hostname, diff --git a/components/brave_wallet/browser/android_page_appearing_browsertest.cc b/components/brave_wallet/browser/android_page_appearing_browsertest.cc index bd0eeb65584..178def1b6c4 100644 --- a/components/brave_wallet/browser/android_page_appearing_browsertest.cc +++ b/components/brave_wallet/browser/android_page_appearing_browsertest.cc @@ -3,6 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include #include #include "base/files/scoped_temp_dir.h" @@ -69,7 +70,7 @@ class ConsoleObserver : public WebContentsObserver { const std::u16string& message_contents, int32_t line_no, const std::u16string& source_id, - const absl::optional& untrusted_stack_trace) override { + const std::optional& untrusted_stack_trace) override { WebContentsConsoleObserver::Message message( {source_frame, log_level, message_contents, line_no, source_id}); @@ -200,7 +201,7 @@ class AndroidPageAppearingBrowserTest : public PlatformBrowserTest { base::FilePath get_temp_path() const { return temp_dir_.GetPath(); } int64_t file_size() const { return file_size_; } - absl::optional file_digest() const { return file_digest_; } + std::optional file_digest() const { return file_digest_; } const std::string GetConsoleMessages( const content::ConsoleObserver& console_observer) const { @@ -342,7 +343,7 @@ class AndroidPageAppearingBrowserTest : public PlatformBrowserTest { base::ScopedTempDir temp_dir_; int64_t file_size_; - absl::optional file_digest_; + std::optional file_digest_; std::unique_ptr factory_; raw_ptr asset_ratio_service_; diff --git a/components/brave_wallet/browser/asset_discovery_task.cc b/components/brave_wallet/browser/asset_discovery_task.cc index 07fa6c734cd..e6901e9bbbb 100644 --- a/components/brave_wallet/browser/asset_discovery_task.cc +++ b/components/brave_wallet/browser/asset_discovery_task.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_wallet/browser/asset_discovery_task.h" #include +#include #include #include @@ -347,7 +348,7 @@ void AssetDiscoveryTask::DiscoverSPLTokensFromRegistry( // Convert each account address to SolanaAddress and check validity std::vector solana_addresses; for (const auto& address : account_addresses) { - absl::optional solana_address = + std::optional solana_address = SolanaAddress::FromBase58(address); if (!solana_address.has_value()) { continue; @@ -391,11 +392,11 @@ void AssetDiscoveryTask::OnGetSolanaTokenAccountsByOwner( std::vector discovered_mint_addresses; for (const auto& token_account : token_accounts) { // Decode Base64 - const absl::optional> data = + const std::optional> data = base::Base64Decode(token_account.data); if (data.has_value()) { // Decode the address - const absl::optional mint_address = + const std::optional mint_address = DecodeMintAddress(data.value()); if (mint_address.has_value()) { // Add the contract address to the list @@ -520,10 +521,10 @@ void AssetDiscoveryTask::MergeDiscoveredNFTs( // Parses the Account object for the `mint` field which is a 32 byte public key. // See // https://github.com/solana-labs/solana-program-library/blob/f97a3dc7cf0e6b8e346d473a8c9d02de7b213cfd/token/program/src/state.rs#L86-L105 -absl::optional AssetDiscoveryTask::DecodeMintAddress( +std::optional AssetDiscoveryTask::DecodeMintAddress( const std::vector& data) { if (data.size() < 32) { - return absl::nullopt; + return std::nullopt; } std::vector pub_key_bytes(data.begin(), data.begin() + 32); diff --git a/components/brave_wallet/browser/asset_discovery_task.h b/components/brave_wallet/browser/asset_discovery_task.h index d40bbb25631..138b9b5ede4 100644 --- a/components/brave_wallet/browser/asset_discovery_task.h +++ b/components/brave_wallet/browser/asset_discovery_task.h @@ -8,6 +8,7 @@ #include #include +#include #include #include #include @@ -134,10 +135,10 @@ class AssetDiscoveryTask { DiscoverAssetsCompletedCallback callback, const std::vector>& nfts); - absl::optional>> + std::optional>> ParseNFTsFromSimpleHash(const base::Value& json_value, mojom::CoinType coin); - static absl::optional DecodeMintAddress( + static std::optional DecodeMintAddress( const std::vector& data); raw_ptr api_request_helper_; diff --git a/components/brave_wallet/browser/asset_ratio_response_parser.cc b/components/brave_wallet/browser/asset_ratio_response_parser.cc index 79f6efef2c1..94a36946c31 100644 --- a/components/brave_wallet/browser/asset_ratio_response_parser.cc +++ b/components/brave_wallet/browser/asset_ratio_response_parser.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_wallet/browser/asset_ratio_response_parser.h" +#include + #include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" @@ -14,11 +16,10 @@ #include "brave/components/brave_wallet/common/brave_wallet_types.h" #include "brave/components/brave_wallet/common/eth_address.h" #include "brave/components/brave_wallet/common/hex_utils.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_wallet { -absl::optional ParseSardineAuthToken( +std::optional ParseSardineAuthToken( const base::Value& json_value) { // Parses results like this: // { @@ -29,13 +30,13 @@ absl::optional ParseSardineAuthToken( if (!json_value.is_dict()) { VLOG(0) << "Invalid response, JSON is not a dict"; - return absl::nullopt; + return std::nullopt; } const std::string* auth_token = json_value.GetDict().FindString("clientToken"); if (!auth_token) { - return absl::nullopt; + return std::nullopt; } return *auth_token; @@ -89,7 +90,7 @@ bool ParseAssetPrice(const base::Value& json_value, asset_price->from_asset = from_asset; asset_price->to_asset = to_asset; - absl::optional to_price = + std::optional to_price = from_asset_dict->FindDoubleByDottedPath(to_asset); if (!to_price) { return false; @@ -97,7 +98,7 @@ bool ParseAssetPrice(const base::Value& json_value, asset_price->price = base::NumberToString(*to_price); std::string to_asset_timeframe_key = base::StringPrintf("%s_timeframe_change", to_asset.c_str()); - absl::optional to_timeframe_change = + std::optional to_timeframe_change = from_asset_dict->FindDoubleByDottedPath(to_asset_timeframe_key); if (!to_timeframe_change) { return false; @@ -205,12 +206,12 @@ mojom::BlockchainTokenPtr ParseTokenInfo(const base::Value& json_value, "" /* token_id */, "" /* coingecko_id */, chain_id, coin); } -absl::optional> ParseCoinMarkets( +std::optional> ParseCoinMarkets( const base::Value& json_value) { auto coin_market_data = api::asset_ratio::CoinMarket::FromValue(json_value); if (!coin_market_data) { - return absl::nullopt; + return std::nullopt; } std::vector values; @@ -232,7 +233,7 @@ absl::optional> ParseCoinMarkets( return values; } -absl::optional ParseStripeBuyURL(const base::Value& json_value) { +std::optional ParseStripeBuyURL(const base::Value& json_value) { // Parses results like this: // { // "url": "https://crypto.link.com?session_hash=abcdefgh" @@ -241,7 +242,7 @@ absl::optional ParseStripeBuyURL(const base::Value& json_value) { api::asset_ratio::StripeBuyURLResponse::FromValue(json_value); if (!stripe_buy_url_response) { - return absl::nullopt; + return std::nullopt; } return stripe_buy_url_response->url; diff --git a/components/brave_wallet/browser/asset_ratio_response_parser.h b/components/brave_wallet/browser/asset_ratio_response_parser.h index 2a979385dea..b0b539f6482 100644 --- a/components/brave_wallet/browser/asset_ratio_response_parser.h +++ b/components/brave_wallet/browser/asset_ratio_response_parser.h @@ -6,18 +6,17 @@ #ifndef BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_ASSET_RATIO_RESPONSE_PARSER_H_ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_ASSET_RATIO_RESPONSE_PARSER_H_ +#include #include #include #include #include "base/values.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_wallet { -absl::optional ParseSardineAuthToken( - const base::Value& json_value); +std::optional ParseSardineAuthToken(const base::Value& json_value); bool ParseAssetPrice(const base::Value& json_value, const std::vector& from_assets, @@ -25,10 +24,10 @@ bool ParseAssetPrice(const base::Value& json_value, std::vector* values); bool ParseAssetPriceHistory(const base::Value& json_value, std::vector* values); -absl::optional> ParseCoinMarkets( +std::optional> ParseCoinMarkets( const base::Value& json_value); -absl::optional ParseStripeBuyURL(const base::Value& json_value); +std::optional ParseStripeBuyURL(const base::Value& json_value); mojom::BlockchainTokenPtr ParseTokenInfo(const base::Value& json_value, const std::string& chain_id, diff --git a/components/brave_wallet/browser/asset_ratio_service.cc b/components/brave_wallet/browser/asset_ratio_service.cc index 5afc74fcfa5..84afaccf34a 100644 --- a/components/brave_wallet/browser/asset_ratio_service.cc +++ b/components/brave_wallet/browser/asset_ratio_service.cc @@ -7,6 +7,7 @@ #include #include +#include #include #include "base/base64.h" @@ -98,15 +99,14 @@ std::vector VectorToLowerCase(const std::vector& v) { return v_lower; } -absl::optional ChainIdToStripeChainId( - const std::string& chain_id) { +std::optional ChainIdToStripeChainId(const std::string& chain_id) { static base::NoDestructor> chain_id_lookup( {{brave_wallet::mojom::kMainnetChainId, "ethereum"}, {brave_wallet::mojom::kSolanaMainnet, "solana"}, {brave_wallet::mojom::kPolygonMainnetChainId, "polygon"}}); if (!chain_id_lookup->contains(chain_id)) { - return absl::nullopt; + return std::nullopt; } return chain_id_lookup->at(chain_id); @@ -248,7 +248,7 @@ void AssetRatioService::GetBuyUrlV1(mojom::OnRampProvider provider, ramp_url = net::AppendQueryParameter(ramp_url, "fiatCurrency", currency_code); ramp_url = net::AppendQueryParameter(ramp_url, "hostApiKey", kRampID); - std::move(callback).Run(std::move(ramp_url.spec()), absl::nullopt); + std::move(callback).Run(std::move(ramp_url.spec()), std::nullopt); } else if (provider == mojom::OnRampProvider::kSardine) { auto internal_callback = base::BindOnce(&AssetRatioService::OnGetSardineAuthToken, @@ -293,7 +293,7 @@ void AssetRatioService::GetBuyUrlV1(mojom::OnRampProvider provider, transak_url = net::AppendQueryParameter(transak_url, "apiKey", kTransakApiKey); - std::move(callback).Run(std::move(transak_url.spec()), absl::nullopt); + std::move(callback).Run(std::move(transak_url.spec()), std::nullopt); } else if (provider == mojom::OnRampProvider::kStripe) { GetStripeBuyURL(std::move(callback), address, currency_code, amount, chain_id, symbol); @@ -340,7 +340,7 @@ void AssetRatioService::GetBuyUrlV1(mojom::OnRampProvider provider, coinbase_url = net::AppendQueryParameter(coinbase_url, "destinationWallets", destinationWalletsStr); - std::move(callback).Run(std::move(coinbase_url.spec()), absl::nullopt); + std::move(callback).Run(std::move(coinbase_url.spec()), std::nullopt); } else { std::move(callback).Run(url, "UNSUPPORTED_ONRAMP_PROVIDER"); } @@ -371,7 +371,7 @@ void AssetRatioService::GetSellUrl(mojom::OffRampProvider provider, net::AppendQueryParameter(off_ramp_url, "fiatCurrency", currency_code); off_ramp_url = net::AppendQueryParameter(off_ramp_url, "hostApiKey", kRampID); - std::move(callback).Run(off_ramp_url.spec(), absl::nullopt); + std::move(callback).Run(off_ramp_url.spec(), std::nullopt); } else { std::move(callback).Run(url, "UNSUPPORTED_OFFRAMP_PROVIDER"); } @@ -418,7 +418,7 @@ void AssetRatioService::OnGetSardineAuthToken( GURL sardine_buy_url = GetSardineBuyURL(chain_id, address, symbol, amount, currency_code, *auth_token); - std::move(callback).Run(std::move(sardine_buy_url.spec()), absl::nullopt); + std::move(callback).Run(std::move(sardine_buy_url.spec()), std::nullopt); } void AssetRatioService::GetStripeBuyURL( @@ -429,7 +429,7 @@ void AssetRatioService::GetStripeBuyURL( const std::string& chain_id, const std::string& destination_currency) { // Convert the frontend supplied chain ID to the chain ID used by Stripe - absl::optional destination_network = + std::optional destination_network = ChainIdToStripeChainId(chain_id); if (!destination_network) { std::move(callback).Run("", "UNSUPPORTED_CHAIN_ID"); @@ -473,7 +473,7 @@ void AssetRatioService::OnGetStripeBuyURL(GetBuyUrlV1Callback callback, return; } - std::move(callback).Run(*url, absl::nullopt); + std::move(callback).Run(*url, std::nullopt); } void AssetRatioService::OnGetPrice(std::vector from_assets, diff --git a/components/brave_wallet/browser/asset_ratio_service_unittest.cc b/components/brave_wallet/browser/asset_ratio_service_unittest.cc index 2c2a592cf11..6e47211e424 100644 --- a/components/brave_wallet/browser/asset_ratio_service_unittest.cc +++ b/components/brave_wallet/browser/asset_ratio_service_unittest.cc @@ -3,12 +3,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include "brave/components/brave_wallet/browser/asset_ratio_service.h" + #include +#include #include #include "base/test/bind.h" #include "base/test/task_environment.h" -#include "brave/components/brave_wallet/browser/asset_ratio_service.h" #include "brave/components/brave_wallet/browser/brave_wallet_constants.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" #include "services/data_decoder/public/cpp/test_support/in_process_data_decoder.h" @@ -109,13 +111,13 @@ class AssetRatioServiceUnitTest : public testing::Test { const std::string& amount, const std::string& currency_code, const std::string& expected_url, - absl::optional expected_error) { + std::optional expected_error) { base::RunLoop run_loop; asset_ratio_service_->GetBuyUrlV1( on_ramp_provider, chain_id, address, symbol, amount, currency_code, base::BindLambdaForTesting( [&](const std::string& url, - const absl::optional& error) { + const std::optional& error) { EXPECT_EQ(url, expected_url); EXPECT_EQ(error, expected_error); run_loop.Quit(); @@ -130,13 +132,13 @@ class AssetRatioServiceUnitTest : public testing::Test { const std::string& amount, const std::string& currency_code, const std::string& expected_url, - absl::optional expected_error) { + std::optional expected_error) { base::RunLoop run_loop; asset_ratio_service_->GetSellUrl( off_ramp_provider, chain_id, address, symbol, amount, currency_code, base::BindLambdaForTesting( [&](const std::string& url, - const absl::optional& error) { + const std::optional& error) { EXPECT_EQ(url, expected_url); EXPECT_EQ(error, expected_error); run_loop.Quit(); @@ -161,7 +163,7 @@ TEST_F(AssetRatioServiceUnitTest, GetBuyUrlV1Ramp) { "?userAddress=0xdeadbeef&swapAsset=USDC&fiatValue=55000000" "&fiatCurrency=USD&hostApiKey=" "8yxja8782as5essk2myz3bmh4az6gpq4nte9n2gf", - absl::nullopt); + std::nullopt); } TEST_F(AssetRatioServiceUnitTest, GetBuyUrlV1Sardine) { @@ -176,7 +178,7 @@ TEST_F(AssetRatioServiceUnitTest, GetBuyUrlV1Sardine) { "amount=55000000&fiat_currency=USD&client_token=74618e17-" "a537-4f5d-ab4d-9916739560b1&fixed_asset_type=USDC&fixed_" "network=ethereum", - absl::nullopt); + std::nullopt); // Timeout yields error std::string error = "error"; @@ -199,7 +201,7 @@ TEST_F(AssetRatioServiceUnitTest, GetSellUrl) { "&swapAmount=250" "&fiatCurrency=USD&hostApiKey=" "8yxja8782as5essk2myz3bmh4az6gpq4nte9n2gf", - absl::nullopt); + std::nullopt); } TEST_F(AssetRatioServiceUnitTest, GetPrice) { @@ -537,7 +539,7 @@ TEST_F(AssetRatioServiceUnitTest, GetStripeBuyURL) { TestGetBuyUrlV1(mojom::OnRampProvider::kStripe, mojom::kMainnetChainId, "0xdeadbeef", "USDC", "55000000", "USD", "https://crypto.link.com?session_hash=abcdefgh", - absl::nullopt); + std::nullopt); // Test with unexpected response SetInterceptor("mischief managed"); @@ -563,7 +565,7 @@ TEST_F(AssetRatioServiceUnitTest, GetBuyUrlV1Coinbase) { "22USDC%22%5D%2C%22blockchains%22%3A%5B%22ethereum%22%2C%22arbitrum%22%" "2C%22optimism%22%2C%22polygon%22%2C%22avalanche-c-chain%22%2C%22celo%22%" "5D%7D%5D", - absl::nullopt); + std::nullopt); // Sol address TestGetBuyUrlV1( @@ -574,7 +576,7 @@ TEST_F(AssetRatioServiceUnitTest, GetBuyUrlV1Coinbase) { "presetFiatAmount=1&destinationWallets=%5B%7B%22address%22%3A%" "22FBG2vwk2tGKHbEWHSxf7rJGDuZ2eHaaNQ8u6c7xGt9Yv%22%2C%22assets%22%3A%5B%" "22SOL%22%5D%2C%22blockchains%22%3A%5B%22solana%22%5D%7D%5D", - absl::nullopt); + std::nullopt); } } // namespace brave_wallet diff --git a/components/brave_wallet/browser/bitcoin/bitcoin_block_tracker.cc b/components/brave_wallet/browser/bitcoin/bitcoin_block_tracker.cc index 4d35bc8a1c2..6056986d653 100644 --- a/components/brave_wallet/browser/bitcoin/bitcoin_block_tracker.cc +++ b/components/brave_wallet/browser/bitcoin/bitcoin_block_tracker.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_wallet/browser/bitcoin/bitcoin_block_tracker.h" #include +#include #include #include "base/containers/contains.h" @@ -37,10 +38,10 @@ void BitcoinBlockTracker::GetBlockHeight(const std::string& chain_id) { weak_ptr_factory_.GetWeakPtr(), chain_id)); } -absl::optional BitcoinBlockTracker::GetLatestHeight( +std::optional BitcoinBlockTracker::GetLatestHeight( const std::string& chain_id) const { if (!base::Contains(latest_height_map_, chain_id)) { - return absl::nullopt; + return std::nullopt; } return latest_height_map_.at(chain_id); } diff --git a/components/brave_wallet/browser/bitcoin/bitcoin_block_tracker.h b/components/brave_wallet/browser/bitcoin/bitcoin_block_tracker.h index 0428c47d59e..80003fa9dd3 100644 --- a/components/brave_wallet/browser/bitcoin/bitcoin_block_tracker.h +++ b/components/brave_wallet/browser/bitcoin/bitcoin_block_tracker.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_BITCOIN_BITCOIN_BLOCK_TRACKER_H_ #include +#include #include #include "base/memory/weak_ptr.h" @@ -14,7 +15,6 @@ #include "base/time/time.h" #include "base/types/expected.h" #include "brave/components/brave_wallet/browser/block_tracker.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_wallet { @@ -39,7 +39,7 @@ class BitcoinBlockTracker : public BlockTracker { void RemoveObserver(Observer* observer); void Start(const std::string& chain_id, base::TimeDelta interval) override; - absl::optional GetLatestHeight(const std::string& chain_id) const; + std::optional GetLatestHeight(const std::string& chain_id) const; private: void GetBlockHeight(const std::string& chain_id); diff --git a/components/brave_wallet/browser/bitcoin/bitcoin_block_tracker_unittest.cc b/components/brave_wallet/browser/bitcoin/bitcoin_block_tracker_unittest.cc index 58a7f90d08b..8fe4b61e77f 100644 --- a/components/brave_wallet/browser/bitcoin/bitcoin_block_tracker_unittest.cc +++ b/components/brave_wallet/browser/bitcoin/bitcoin_block_tracker_unittest.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_wallet/browser/bitcoin/bitcoin_block_tracker.h" #include +#include #include #include "base/scoped_observation.h" @@ -106,7 +107,7 @@ TEST_F(BitcoinBlockTrackerUnitTest, GetLatestHeight) { task_environment_.FastForwardBy(base::Seconds(5)); EXPECT_EQ(tracker_->GetLatestHeight(mojom::kBitcoinMainnet), UINT32_MAX); EXPECT_EQ(tracker_->GetLatestHeight(mojom::kBitcoinTestnet), UINT32_MAX); - EXPECT_EQ(tracker_->GetLatestHeight("skynet"), absl::nullopt); + EXPECT_EQ(tracker_->GetLatestHeight("skynet"), std::nullopt); EXPECT_TRUE(testing::Mock::VerifyAndClearExpectations(&observer)); response_height_ = 1; @@ -144,8 +145,8 @@ TEST_F(BitcoinBlockTrackerUnitTest, GetLatestHeightInvalidResponseJSON) { tracker_->Start(mojom::kBitcoinTestnet, base::Seconds(2)); EXPECT_CALL(observer, OnLatestHeightUpdated(_, _)).Times(0); task_environment_.FastForwardBy(base::Seconds(5)); - EXPECT_EQ(tracker_->GetLatestHeight(mojom::kBitcoinMainnet), absl::nullopt); - EXPECT_EQ(tracker_->GetLatestHeight(mojom::kBitcoinTestnet), absl::nullopt); + EXPECT_EQ(tracker_->GetLatestHeight(mojom::kBitcoinMainnet), std::nullopt); + EXPECT_EQ(tracker_->GetLatestHeight(mojom::kBitcoinTestnet), std::nullopt); EXPECT_TRUE(testing::Mock::VerifyAndClearExpectations(&observer)); } @@ -164,8 +165,8 @@ TEST_F(BitcoinBlockTrackerUnitTest, GetLatestHeightInternalError) { tracker_->Start(mojom::kBitcoinTestnet, base::Seconds(2)); EXPECT_CALL(observer, OnLatestHeightUpdated(_, _)).Times(0); task_environment_.FastForwardBy(base::Seconds(5)); - EXPECT_EQ(tracker_->GetLatestHeight(mojom::kBitcoinMainnet), absl::nullopt); - EXPECT_EQ(tracker_->GetLatestHeight(mojom::kBitcoinTestnet), absl::nullopt); + EXPECT_EQ(tracker_->GetLatestHeight(mojom::kBitcoinMainnet), std::nullopt); + EXPECT_EQ(tracker_->GetLatestHeight(mojom::kBitcoinTestnet), std::nullopt); EXPECT_TRUE(testing::Mock::VerifyAndClearExpectations(&observer)); } @@ -184,8 +185,8 @@ TEST_F(BitcoinBlockTrackerUnitTest, GetLatestHeightRequestTimeout) { tracker_->Start(mojom::kBitcoinTestnet, base::Seconds(2)); EXPECT_CALL(observer, OnLatestHeightUpdated(_, _)).Times(0); task_environment_.FastForwardBy(base::Seconds(5)); - EXPECT_EQ(tracker_->GetLatestHeight(mojom::kBitcoinMainnet), absl::nullopt); - EXPECT_EQ(tracker_->GetLatestHeight(mojom::kBitcoinTestnet), absl::nullopt); + EXPECT_EQ(tracker_->GetLatestHeight(mojom::kBitcoinMainnet), std::nullopt); + EXPECT_EQ(tracker_->GetLatestHeight(mojom::kBitcoinTestnet), std::nullopt); EXPECT_TRUE(testing::Mock::VerifyAndClearExpectations(&observer)); } diff --git a/components/brave_wallet/browser/bitcoin/bitcoin_keyring.cc b/components/brave_wallet/browser/bitcoin/bitcoin_keyring.cc index ff98cf2e88d..60e18050fa3 100644 --- a/components/brave_wallet/browser/bitcoin/bitcoin_keyring.cc +++ b/components/brave_wallet/browser/bitcoin/bitcoin_keyring.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_wallet/browser/bitcoin/bitcoin_keyring.h" #include +#include #include #include "base/check.h" @@ -14,12 +15,12 @@ namespace brave_wallet { BitcoinKeyring::BitcoinKeyring(bool testnet) : testnet_(testnet) {} -absl::optional BitcoinKeyring::GetAddress( +std::optional BitcoinKeyring::GetAddress( uint32_t account, const mojom::BitcoinKeyId& key_id) { auto key = DeriveKey(account, key_id); if (!key) { - return absl::nullopt; + return std::nullopt; } HDKey* hd_key = static_cast(key.get()); @@ -27,24 +28,24 @@ absl::optional BitcoinKeyring::GetAddress( return hd_key->GetSegwitAddress(testnet_); } -absl::optional> BitcoinKeyring::GetPubkey( +std::optional> BitcoinKeyring::GetPubkey( uint32_t account, const mojom::BitcoinKeyId& key_id) { auto hd_key_base = DeriveKey(account, key_id); if (!hd_key_base) { - return absl::nullopt; + return std::nullopt; } return hd_key_base->GetPublicKeyBytes(); } -absl::optional> BitcoinKeyring::SignMessage( +std::optional> BitcoinKeyring::SignMessage( uint32_t account, const mojom::BitcoinKeyId& key_id, base::span message) { auto hd_key_base = DeriveKey(account, key_id); if (!hd_key_base) { - return absl::nullopt; + return std::nullopt; } auto* hd_key = static_cast(hd_key_base.get()); diff --git a/components/brave_wallet/browser/bitcoin/bitcoin_keyring.h b/components/brave_wallet/browser/bitcoin/bitcoin_keyring.h index dc11a376f48..c2ee15475eb 100644 --- a/components/brave_wallet/browser/bitcoin/bitcoin_keyring.h +++ b/components/brave_wallet/browser/bitcoin/bitcoin_keyring.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_BITCOIN_BITCOIN_KEYRING_H_ #include +#include #include #include @@ -22,14 +23,14 @@ class BitcoinKeyring : public HDKeyring { BitcoinKeyring(const BitcoinKeyring&) = delete; BitcoinKeyring& operator=(const BitcoinKeyring&) = delete; - absl::optional GetAddress(uint32_t account, - const mojom::BitcoinKeyId& key_id); + std::optional GetAddress(uint32_t account, + const mojom::BitcoinKeyId& key_id); - absl::optional> GetPubkey( + std::optional> GetPubkey( uint32_t account, const mojom::BitcoinKeyId& key_id); - absl::optional> SignMessage( + std::optional> SignMessage( uint32_t account, const mojom::BitcoinKeyId& key_id, base::span message); diff --git a/components/brave_wallet/browser/bitcoin/bitcoin_rpc.cc b/components/brave_wallet/browser/bitcoin/bitcoin_rpc.cc index 05c91b71d35..ffa30578d59 100644 --- a/components/brave_wallet/browser/bitcoin/bitcoin_rpc.cc +++ b/components/brave_wallet/browser/bitcoin/bitcoin_rpc.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_wallet/browser/bitcoin/bitcoin_rpc.h" +#include + #include "base/check.h" #include "base/functional/bind.h" #include "base/ranges/algorithm.h" @@ -157,16 +159,16 @@ const GURL MakePostTransactionUrl(const GURL& base_url) { return base_url.ReplaceComponents(replacements); } -absl::optional ConvertPlainStringToJsonArray( +std::optional ConvertPlainStringToJsonArray( const std::string& json) { return base::StrCat({"[\"", json, "\"]"}); } -absl::optional ConvertAllNumbersToString(const std::string& json) { +std::optional ConvertAllNumbersToString(const std::string& json) { auto converted_json = std::string(json::convert_all_numbers_to_string(json, "")); if (converted_json.empty()) { - return absl::nullopt; + return std::nullopt; } return converted_json; diff --git a/components/brave_wallet/browser/bitcoin/bitcoin_serializer.cc b/components/brave_wallet/browser/bitcoin/bitcoin_serializer.cc index 83d16b4c0d1..269962f3ea8 100644 --- a/components/brave_wallet/browser/bitcoin/bitcoin_serializer.cc +++ b/components/brave_wallet/browser/bitcoin/bitcoin_serializer.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/bitcoin/bitcoin_serializer.h" +#include #include #include "base/sys_byteorder.h" @@ -312,19 +313,19 @@ std::vector BitcoinSerializer::AddressToScriptPubkey( } // static -absl::optional BitcoinSerializer::SerializeInputForSign( +std::optional BitcoinSerializer::SerializeInputForSign( const BitcoinTransaction& tx, size_t input_index) { CHECK_LT(input_index, tx.inputs().size()); auto& input = tx.inputs()[input_index]; auto decoded_address = DecodeBitcoinAddress(input.utxo_address); if (!decoded_address) { - return absl::nullopt; + return std::nullopt; } // TODO(apaymyshev): support other account types. if (decoded_address->address_type != BitcoinAddressType::kWitnessV0PubkeyHash) { - return absl::nullopt; + return std::nullopt; } std::vector data; diff --git a/components/brave_wallet/browser/bitcoin/bitcoin_serializer.h b/components/brave_wallet/browser/bitcoin/bitcoin_serializer.h index 18dfac222b7..fb63063ceaf 100644 --- a/components/brave_wallet/browser/bitcoin/bitcoin_serializer.h +++ b/components/brave_wallet/browser/bitcoin/bitcoin_serializer.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_BITCOIN_BITCOIN_SERIALIZER_H_ #include +#include #include #include #include @@ -23,7 +24,7 @@ class BitcoinSerializer { static std::vector AddressToScriptPubkey(const std::string& address, bool testnet); - static absl::optional SerializeInputForSign( + static std::optional SerializeInputForSign( const BitcoinTransaction& tx, size_t input_index); diff --git a/components/brave_wallet/browser/bitcoin/bitcoin_test_utils.cc b/components/brave_wallet/browser/bitcoin/bitcoin_test_utils.cc index 3b788ae5bad..37e28c35ef4 100644 --- a/components/brave_wallet/browser/bitcoin/bitcoin_test_utils.cc +++ b/components/brave_wallet/browser/bitcoin/bitcoin_test_utils.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_wallet/browser/bitcoin/bitcoin_test_utils.h" #include +#include #include #include "base/strings/string_split.h" @@ -23,7 +24,7 @@ namespace brave_wallet { namespace { -absl::optional IsAddressStatsRequest( +std::optional IsAddressStatsRequest( const network::ResourceRequest& request) { auto parts = base::SplitStringPiece(request.url.path_piece(), "/", @@ -32,10 +33,10 @@ absl::optional IsAddressStatsRequest( return std::string(parts[1]); } - return absl::nullopt; + return std::nullopt; } -absl::optional IsAddressUtxoRequest( +std::optional IsAddressUtxoRequest( const network::ResourceRequest& request) { auto parts = base::SplitStringPiece(request.url.path_piece(), "/", @@ -44,7 +45,7 @@ absl::optional IsAddressUtxoRequest( return std::string(parts[1]); } - return absl::nullopt; + return std::nullopt; } } // namespace diff --git a/components/brave_wallet/browser/bitcoin/bitcoin_transaction.cc b/components/brave_wallet/browser/bitcoin/bitcoin_transaction.cc index de204d928c8..0a6a4db3ba2 100644 --- a/components/brave_wallet/browser/bitcoin/bitcoin_transaction.cc +++ b/components/brave_wallet/browser/bitcoin/bitcoin_transaction.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_wallet/browser/bitcoin/bitcoin_transaction.h" #include +#include #include #include #include @@ -129,21 +130,21 @@ base::Value::Dict BitcoinTransaction::Outpoint::ToValue() const { } // static -absl::optional +std::optional BitcoinTransaction::Outpoint::FromValue(const base::Value::Dict& value) { Outpoint result; auto* txid_hex = value.FindString("txid"); if (!txid_hex) { - return absl::nullopt; + return std::nullopt; } if (!base::HexStringToSpan(*txid_hex, result.txid)) { - return absl::nullopt; + return std::nullopt; } auto index_value = value.FindInt("index"); if (!index_value) { - return absl::nullopt; + return std::nullopt; } result.index = *index_value; @@ -186,35 +187,35 @@ base::Value::Dict BitcoinTransaction::TxInput::ToValue() const { } // static -absl::optional +std::optional BitcoinTransaction::TxInput::FromValue(const base::Value::Dict& value) { BitcoinTransaction::TxInput result; if (!ReadStringTo(value, "utxo_address", result.utxo_address)) { - return absl::nullopt; + return std::nullopt; } if (!ReadDictTo(value, "utxo_outpoint", result.utxo_outpoint)) { - return absl::nullopt; + return std::nullopt; } if (!ReadUint64StringTo(value, "utxo_value", result.utxo_value)) { - return absl::nullopt; + return std::nullopt; } if (!ReadHexByteArrayTo(value, "script_sig", result.script_sig)) { - return absl::nullopt; + return std::nullopt; } if (!ReadHexByteArrayTo(value, "witness", result.witness)) { - return absl::nullopt; + return std::nullopt; } return result; } // static -absl::optional +std::optional BitcoinTransaction::TxInput::FromRpcUtxo( const std::string& address, const bitcoin_rpc::UnspentOutput& utxo) { @@ -222,13 +223,13 @@ BitcoinTransaction::TxInput::FromRpcUtxo( result.utxo_address = address; if (!base::HexStringToSpan(utxo.txid, result.utxo_outpoint.txid)) { - return absl::nullopt; + return std::nullopt; } if (!base::StringToUint(utxo.vout, &result.utxo_outpoint.index)) { - return absl::nullopt; + return std::nullopt; } if (!base::StringToUint64(utxo.value, &result.utxo_value)) { - return absl::nullopt; + return std::nullopt; } return result; @@ -304,28 +305,28 @@ base::Value::Dict BitcoinTransaction::TxOutput::ToValue() const { } // static -absl::optional +std::optional BitcoinTransaction::TxOutput::FromValue(const base::Value::Dict& value) { BitcoinTransaction::TxOutput result; std::string type_string; if (!ReadStringTo(value, "type", type_string) && type_string != kChangeOuputType && type_string != kTargetOutputType) { - return absl::nullopt; + return std::nullopt; } result.type = type_string == kTargetOutputType ? TxOutputType::kTarget : TxOutputType::kChange; if (!ReadStringTo(value, "address", result.address)) { - return absl::nullopt; + return std::nullopt; } if (!ReadHexByteArrayTo(value, "script_pubkey", result.script_pubkey)) { - return absl::nullopt; + return std::nullopt; } if (!ReadUint64StringTo(value, "amount", result.amount)) { - return absl::nullopt; + return std::nullopt; } return result; @@ -364,50 +365,50 @@ base::Value::Dict BitcoinTransaction::ToValue() const { } // static -absl::optional BitcoinTransaction::FromValue( +std::optional BitcoinTransaction::FromValue( const base::Value::Dict& value) { BitcoinTransaction result; auto* inputs_list = value.FindList("inputs"); if (!inputs_list) { - return absl::nullopt; + return std::nullopt; } for (auto& item : *inputs_list) { if (!item.is_dict()) { - return absl::nullopt; + return std::nullopt; } auto input_opt = BitcoinTransaction::TxInput::FromValue(item.GetDict()); if (!input_opt) { - return absl::nullopt; + return std::nullopt; } result.inputs_.push_back(std::move(*input_opt)); } auto* outputs_list = value.FindList("outputs"); if (!outputs_list) { - return absl::nullopt; + return std::nullopt; } for (auto& item : *outputs_list) { if (!item.is_dict()) { - return absl::nullopt; + return std::nullopt; } auto output_opt = BitcoinTransaction::TxOutput::FromValue(item.GetDict()); if (!output_opt) { - return absl::nullopt; + return std::nullopt; } result.outputs_.push_back(std::move(*output_opt)); } if (!ReadUint32StringTo(value, "locktime", result.locktime_)) { - return absl::nullopt; + return std::nullopt; } if (!ReadStringTo(value, "to", result.to_)) { - return absl::nullopt; + return std::nullopt; } if (!ReadUint64StringTo(value, "amount", result.amount_)) { - return absl::nullopt; + return std::nullopt; } return result; diff --git a/components/brave_wallet/browser/bitcoin/bitcoin_transaction.h b/components/brave_wallet/browser/bitcoin/bitcoin_transaction.h index cbbbdf821a4..84973acbcdb 100644 --- a/components/brave_wallet/browser/bitcoin/bitcoin_transaction.h +++ b/components/brave_wallet/browser/bitcoin/bitcoin_transaction.h @@ -6,12 +6,12 @@ #ifndef BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_BITCOIN_BITCOIN_TRANSACTION_H_ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_BITCOIN_BITCOIN_TRANSACTION_H_ +#include #include #include #include "brave/components/brave_wallet/browser/bitcoin_rpc_responses.h" #include "brave/components/brave_wallet/common/hash_utils.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_wallet { @@ -30,7 +30,7 @@ class BitcoinTransaction { bool operator<(const Outpoint& other) const; base::Value::Dict ToValue() const; - static absl::optional FromValue(const base::Value::Dict& value); + static std::optional FromValue(const base::Value::Dict& value); SHA256HashArray txid; uint32_t index = 0; @@ -48,9 +48,9 @@ class BitcoinTransaction { bool operator!=(const TxInput& other) const; base::Value::Dict ToValue() const; - static absl::optional FromValue(const base::Value::Dict& value); + static std::optional FromValue(const base::Value::Dict& value); - static absl::optional FromRpcUtxo( + static std::optional FromRpcUtxo( const std::string& address, const bitcoin_rpc::UnspentOutput& utxo); @@ -104,7 +104,7 @@ class BitcoinTransaction { bool operator!=(const TxOutput& other) const; base::Value::Dict ToValue() const; - static absl::optional FromValue(const base::Value::Dict& value); + static std::optional FromValue(const base::Value::Dict& value); TxOutputType type = TxOutputType::kTarget; std::string address; @@ -123,7 +123,7 @@ class BitcoinTransaction { BitcoinTransaction Clone() const; base::Value::Dict ToValue() const; - static absl::optional FromValue( + static std::optional FromValue( const base::Value::Dict& value); // All inputs are signed. diff --git a/components/brave_wallet/browser/bitcoin/bitcoin_tx_manager.cc b/components/brave_wallet/browser/bitcoin/bitcoin_tx_manager.cc index 0ad220a3c63..dfdeaeb849a 100644 --- a/components/brave_wallet/browser/bitcoin/bitcoin_tx_manager.cc +++ b/components/brave_wallet/browser/bitcoin/bitcoin_tx_manager.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_wallet/browser/bitcoin/bitcoin_tx_manager.h" #include +#include #include #include #include @@ -55,7 +56,7 @@ void BitcoinTxManager::AddUnapprovedTransaction( const std::string& chain_id, mojom::TxDataUnionPtr tx_data_union, const mojom::AccountIdPtr& from, - const absl::optional& origin, + const std::optional& origin, AddUnapprovedTransactionCallback callback) { if (chain_id != GetNetworkForBitcoinAccount(from)) { std::move(callback).Run(false, "", WalletInternalErrorMessage()); @@ -74,7 +75,7 @@ void BitcoinTxManager::AddUnapprovedTransaction( void BitcoinTxManager::ContinueAddUnapprovedTransaction( const std::string& chain_id, const mojom::AccountIdPtr& from, - const absl::optional& origin, + const std::optional& origin, AddUnapprovedTransactionCallback callback, base::expected bitcoin_transaction) { if (!bitcoin_transaction.has_value()) { @@ -202,9 +203,9 @@ mojom::CoinType BitcoinTxManager::GetCoinType() const { } void BitcoinTxManager::UpdatePendingTransactions( - const absl::optional& chain_id) { + const std::optional& chain_id) { auto pending_transactions = tx_state_manager_->GetTransactionsByStatus( - chain_id, mojom::TransactionStatus::Submitted, absl::nullopt); + chain_id, mojom::TransactionStatus::Submitted, std::nullopt); std::set pending_chain_ids; for (const auto& pending_transaction : pending_transactions) { auto pending_chain_id = pending_transaction->chain_id(); diff --git a/components/brave_wallet/browser/bitcoin/bitcoin_tx_manager.h b/components/brave_wallet/browser/bitcoin/bitcoin_tx_manager.h index 0270fe134ee..5cb13873f93 100644 --- a/components/brave_wallet/browser/bitcoin/bitcoin_tx_manager.h +++ b/components/brave_wallet/browser/bitcoin/bitcoin_tx_manager.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_BITCOIN_BITCOIN_TX_MANAGER_H_ #include +#include #include #include "base/scoped_observation.h" @@ -49,7 +50,7 @@ class BitcoinTxManager : public TxManager, void AddUnapprovedTransaction(const std::string& chain_id, mojom::TxDataUnionPtr tx_data_union, const mojom::AccountIdPtr& from, - const absl::optional& origin, + const std::optional& origin, AddUnapprovedTransactionCallback) override; void ApproveTransaction(const std::string& chain_id, const std::string& tx_meta_id, @@ -69,12 +70,12 @@ class BitcoinTxManager : public TxManager, RetryTransactionCallback callback) override; mojom::CoinType GetCoinType() const override; void UpdatePendingTransactions( - const absl::optional& chain_id) override; + const std::optional& chain_id) override; void ContinueAddUnapprovedTransaction( const std::string& chain_id, const mojom::AccountIdPtr& from, - const absl::optional& origin, + const std::optional& origin, AddUnapprovedTransactionCallback callback, base::expected bitcoin_transaction); diff --git a/components/brave_wallet/browser/bitcoin/bitcoin_tx_meta.cc b/components/brave_wallet/browser/bitcoin/bitcoin_tx_meta.cc index e7a2cf76eed..20526b69a23 100644 --- a/components/brave_wallet/browser/bitcoin/bitcoin_tx_meta.cc +++ b/components/brave_wallet/browser/bitcoin/bitcoin_tx_meta.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/bitcoin/bitcoin_tx_meta.h" +#include #include #include @@ -52,7 +53,7 @@ base::Value::Dict BitcoinTxMeta::ToValue() const { mojom::TransactionInfoPtr BitcoinTxMeta::ToTransactionInfo() const { return mojom::TransactionInfo::New( - id_, absl::nullopt, from_.Clone(), tx_hash_, + id_, std::nullopt, from_.Clone(), tx_hash_, mojom::TxDataUnion::NewBtcTxData(ToBtcTxData(*tx_)), status_, mojom::TransactionType::Other, std::vector() /* tx_params */, std::vector() /* tx_args */, diff --git a/components/brave_wallet/browser/bitcoin/bitcoin_tx_meta_unittest.cc b/components/brave_wallet/browser/bitcoin/bitcoin_tx_meta_unittest.cc index 31b43af1e44..e6e81802801 100644 --- a/components/brave_wallet/browser/bitcoin/bitcoin_tx_meta_unittest.cc +++ b/components/brave_wallet/browser/bitcoin/bitcoin_tx_meta_unittest.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_wallet/browser/bitcoin/bitcoin_tx_meta.h" +#include + #include "base/values.h" #include "brave/components/brave_wallet/browser/bitcoin/bitcoin_serializer.h" #include "brave/components/brave_wallet/browser/bitcoin/bitcoin_transaction.h" @@ -46,7 +48,7 @@ TEST(BitcoinTxMeta, ToTransactionInfo) { mojom::TransactionInfoPtr ti = meta.ToTransactionInfo(); EXPECT_EQ(ti->id, meta.id()); EXPECT_EQ(ti->chain_id, meta.chain_id()); - EXPECT_EQ(ti->from_address, absl::nullopt); + EXPECT_EQ(ti->from_address, std::nullopt); EXPECT_EQ(ti->from_account_id, btc_account_id); EXPECT_EQ(ti->tx_status, meta.status()); EXPECT_TRUE(ti->tx_data_union->is_btc_tx_data()); diff --git a/components/brave_wallet/browser/bitcoin/bitcoin_tx_state_manager.cc b/components/brave_wallet/browser/bitcoin/bitcoin_tx_state_manager.cc index 7d247138b8f..f3d00524e18 100644 --- a/components/brave_wallet/browser/bitcoin/bitcoin_tx_state_manager.cc +++ b/components/brave_wallet/browser/bitcoin/bitcoin_tx_state_manager.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/bitcoin/bitcoin_tx_state_manager.h" +#include #include #include "base/strings/strcat.h" @@ -39,7 +40,7 @@ std::unique_ptr BitcoinTxStateManager::ValueToBitcoinTxMeta( } std::string BitcoinTxStateManager::GetTxPrefPathPrefix( - const absl::optional& chain_id) { + const std::optional& chain_id) { if (chain_id.has_value()) { return base::StrCat( {kBitcoinPrefKey, ".", @@ -63,7 +64,7 @@ std::unique_ptr BitcoinTxStateManager::ValueToTxMeta( if (!tx) { return nullptr; } - absl::optional tx_from_value = + std::optional tx_from_value = BitcoinTransaction::FromValue(*tx); if (!tx_from_value) { return nullptr; diff --git a/components/brave_wallet/browser/bitcoin/bitcoin_tx_state_manager.h b/components/brave_wallet/browser/bitcoin/bitcoin_tx_state_manager.h index 5b247a894dd..74924cfac79 100644 --- a/components/brave_wallet/browser/bitcoin/bitcoin_tx_state_manager.h +++ b/components/brave_wallet/browser/bitcoin/bitcoin_tx_state_manager.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_BITCOIN_BITCOIN_TX_STATE_MANAGER_H_ #include +#include #include #include @@ -46,7 +47,7 @@ class BitcoinTxStateManager : public TxStateManager { std::unique_ptr ValueToTxMeta( const base::Value::Dict& value) override; std::string GetTxPrefPathPrefix( - const absl::optional& chain_id) override; + const std::optional& chain_id) override; }; } // namespace brave_wallet diff --git a/components/brave_wallet/browser/bitcoin/bitcoin_tx_state_manager_unittest.cc b/components/brave_wallet/browser/bitcoin/bitcoin_tx_state_manager_unittest.cc index c04c3940025..d99f7c1b2e0 100644 --- a/components/brave_wallet/browser/bitcoin/bitcoin_tx_state_manager_unittest.cc +++ b/components/brave_wallet/browser/bitcoin/bitcoin_tx_state_manager_unittest.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_wallet/browser/bitcoin/bitcoin_tx_state_manager.h" #include +#include #include #include @@ -98,7 +99,7 @@ TEST_F(BitcoinTxStateManagerUnitTest, GetTxPrefPathPrefix) { EXPECT_EQ("bitcoin.testnet", bitcoin_tx_state_manager_->GetTxPrefPathPrefix( mojom::kBitcoinTestnet)); EXPECT_EQ("bitcoin", - bitcoin_tx_state_manager_->GetTxPrefPathPrefix(absl::nullopt)); + bitcoin_tx_state_manager_->GetTxPrefPathPrefix(std::nullopt)); } } // namespace brave_wallet diff --git a/components/brave_wallet/browser/bitcoin/bitcoin_wallet_service.cc b/components/brave_wallet/browser/bitcoin/bitcoin_wallet_service.cc index b0b06469896..9645e069591 100644 --- a/components/brave_wallet/browser/bitcoin/bitcoin_wallet_service.cc +++ b/components/brave_wallet/browser/bitcoin/bitcoin_wallet_service.cc @@ -6,8 +6,10 @@ #include "brave/components/brave_wallet/browser/bitcoin/bitcoin_wallet_service.h" #include + #include #include +#include #include #include "base/check.h" @@ -107,7 +109,7 @@ class GetBalanceTask : public base::RefCountedThreadSafe { bool requests_sent_ = false; std::map balances_; - absl::optional error_; + std::optional error_; mojom::BitcoinBalancePtr result_; GetBalanceCallback callback_; }; @@ -166,7 +168,7 @@ void GetBalanceTask::WorkOnTask() { } if (result_) { - std::move(callback_).Run(std::move(result_), absl::nullopt); + std::move(callback_).Run(std::move(result_), std::nullopt); return; } @@ -223,8 +225,8 @@ class GetUtxosTask : public base::RefCountedThreadSafe { bool requests_sent_ = false; BitcoinWalletService::UtxoMap utxos_; - absl::optional error_; - absl::optional result_; + std::optional error_; + std::optional result_; BitcoinWalletService::GetUtxosCallback callback_; }; @@ -344,12 +346,12 @@ class CreateTransactionTask { mojom::AccountIdPtr account_id_; CreateTransactionCallback callback_; - absl::optional chain_height_; + std::optional chain_height_; BitcoinWalletService::UtxoMap utxo_map_; mojom::BitcoinAddressPtr change_address_; std::map estimates_; // target block -> fee rate (sat/byte) - absl::optional error_; + std::optional error_; BitcoinTransaction transaction_; bool arrange_for_testing_ = false; @@ -569,7 +571,7 @@ class DiscoverNextUnusedAddressTask mojom::BitcoinAddressPtr start_address_; mojom::BitcoinAddressPtr current_address_; mojom::BitcoinAddressPtr result_; - absl::optional error_; + std::optional error_; BitcoinWalletService::DiscoverNextUnusedAddressCallback callback_; }; @@ -694,7 +696,7 @@ class DiscoverAccountTask : public base::RefCounted { uint32_t change_addresses_gap_ = 0; bool account_is_used_ = false; - absl::optional error_; + std::optional error_; BitcoinWalletService::DiscoverAccountCallback callback_; }; @@ -887,18 +889,18 @@ void BitcoinWalletService::OnRunDiscoveryDone( } UpdateNextUnusedAddressForAccount(account_id, discovered_address.value()); - std::move(callback).Run(discovered_address.value().Clone(), absl::nullopt); + std::move(callback).Run(discovered_address.value().Clone(), std::nullopt); } void BitcoinWalletService::UpdateNextUnusedAddressForAccount( const mojom::AccountIdPtr& account_id, const mojom::BitcoinAddressPtr& address) { - absl::optional next_receive_index = address->key_id->change - ? absl::optional() - : address->key_id->index; - absl::optional next_change_index = !address->key_id->change - ? absl::optional() + std::optional next_receive_index = address->key_id->change + ? std::optional() : address->key_id->index; + std::optional next_change_index = !address->key_id->change + ? std::optional() + : address->key_id->index; keyring_service()->UpdateNextUnusedAddressForBitcoinAccount( account_id, next_receive_index, next_change_index); } diff --git a/components/brave_wallet/browser/bitcoin/bitcoin_wallet_service_unittest.cc b/components/brave_wallet/browser/bitcoin/bitcoin_wallet_service_unittest.cc index 98310bd0e58..cd95363d37d 100644 --- a/components/brave_wallet/browser/bitcoin/bitcoin_wallet_service_unittest.cc +++ b/components/brave_wallet/browser/bitcoin/bitcoin_wallet_service_unittest.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_wallet/browser/bitcoin/bitcoin_wallet_service.h" #include +#include #include #include "base/strings/string_number_conversions.h" @@ -118,7 +119,7 @@ TEST_F(BitcoinWalletServiceUnitTest, GetBalance) { expected_balance->total_balance = expected_balance->balances[address_0] + expected_balance->balances[address_6]; EXPECT_CALL(callback, - Run(EqualsMojo(expected_balance), absl::optional())); + Run(EqualsMojo(expected_balance), std::optional())); bitcoin_wallet_service_->GetBalance(account_id(), callback.Get()); base::RunLoop().RunUntilIdle(); testing::Mock::VerifyAndClearExpectations(&callback); @@ -192,7 +193,7 @@ TEST_F(BitcoinWalletServiceUnitTest, RunDiscovery) { auto expected_receive_address = keyring_service_->GetBitcoinAddress( account_id(), mojom::BitcoinKeyId::New(0, 10)); EXPECT_CALL(callback, Run(Eq(std::ref(expected_receive_address)), - absl::optional())); + std::optional())); bitcoin_wallet_service_->RunDiscovery(account_id(), false, callback.Get()); base::RunLoop().RunUntilIdle(); testing::Mock::VerifyAndClearExpectations(&callback); @@ -207,7 +208,7 @@ TEST_F(BitcoinWalletServiceUnitTest, RunDiscovery) { auto expected_change_address = keyring_service_->GetBitcoinAddress( account_id(), mojom::BitcoinKeyId::New(1, 8)); EXPECT_CALL(callback, Run(Eq(std::ref(expected_change_address)), - absl::optional())); + std::optional())); bitcoin_wallet_service_->RunDiscovery(account_id(), true, callback.Get()); base::RunLoop().RunUntilIdle(); testing::Mock::VerifyAndClearExpectations(&callback); diff --git a/components/brave_wallet/browser/blockchain_list_parser.cc b/components/brave_wallet/browser/blockchain_list_parser.cc index 2807c8b1aa5..08f4db0169d 100644 --- a/components/brave_wallet/browser/blockchain_list_parser.cc +++ b/components/brave_wallet/browser/blockchain_list_parser.cc @@ -4,9 +4,9 @@ * You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "brave/components/brave_wallet/browser/blockchain_list_parser.h" -#include "brave/components/brave_wallet/browser/blockchain_list_schemas.h" #include +#include #include #include @@ -14,6 +14,7 @@ #include "base/logging.h" #include "base/strings/strcat.h" #include "base/strings/stringprintf.h" +#include "brave/components/brave_wallet/browser/blockchain_list_schemas.h" #include "brave/components/brave_wallet/browser/brave_wallet_utils.h" #include "brave/components/brave_wallet/common/common_utils.h" #include "brave/components/brave_wallet/common/value_conversion_utils.h" @@ -33,47 +34,47 @@ bool ParseResultFromDict(const base::Value::Dict* response_dict, return true; } -absl::optional ParseNullableStringAsDouble(const base::Value& value) { +std::optional ParseNullableStringAsDouble(const base::Value& value) { if (value.is_none()) { - return absl::nullopt; + return std::nullopt; } double result; if (value.is_string()) { if (!base::StringToDouble(value.GetString(), &result)) { - return absl::nullopt; + return std::nullopt; } return result; } - return absl::nullopt; + return std::nullopt; } -absl::optional ParseNullableStringAsUint32(const base::Value& value) { +std::optional ParseNullableStringAsUint32(const base::Value& value) { if (value.is_none()) { - return absl::nullopt; + return std::nullopt; } uint32_t result; if (value.is_string()) { if (!base::StringToUint(value.GetString(), &result)) { - return absl::nullopt; + return std::nullopt; } return result; } - return absl::nullopt; + return std::nullopt; } -absl::optional ParseJsonToDict(const std::string& json) { - absl::optional records_v = +std::optional ParseJsonToDict(const std::string& json) { + std::optional records_v = base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS | base::JSONParserOptions::JSON_PARSE_RFC); if (!records_v || !records_v->is_dict()) { VLOG(1) << "Invalid response, could not parse JSON, JSON is: " << json; - return absl::nullopt; + return std::nullopt; } return records_v; } @@ -85,7 +86,7 @@ std::string EmptyIfNull(const std::string* str) { return ""; } -absl::optional ParseProvider( +std::optional ParseProvider( const std::string& provider_str) { if (provider_str == "ramp") { return mojom::OnRampProvider::kRamp; @@ -99,7 +100,7 @@ absl::optional ParseProvider( return mojom::OnRampProvider::kCoinbase; } - return absl::nullopt; + return std::nullopt; } void AddDappListToMap( @@ -128,28 +129,28 @@ void AddDappListToMap( dapp_from_component.categories.end()); // If any of the metrics fields are null, skip the dapp - absl::optional transactions = + std::optional transactions = ParseNullableStringAsUint32(dapp_from_component.metrics.transactions); if (!transactions) { continue; } dapp->transactions = *transactions; - absl::optional uaw = + std::optional uaw = ParseNullableStringAsUint32(dapp_from_component.metrics.uaw); if (!uaw) { continue; } dapp->uaw = *uaw; - absl::optional volume = + std::optional volume = ParseNullableStringAsDouble(dapp_from_component.metrics.volume); if (!volume) { continue; } dapp->volume = *volume; - absl::optional balance = + std::optional balance = ParseNullableStringAsDouble(dapp_from_component.metrics.balance); if (!balance) { continue; @@ -232,7 +233,7 @@ bool ParseTokenList(const std::string& json, // } // } - absl::optional records_v = + std::optional records_v = base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS | base::JSONParserOptions::JSON_PARSE_RFC); if (!records_v || !records_v->is_dict()) { @@ -250,7 +251,7 @@ bool ParseTokenList(const std::string& json, return false; } - absl::optional is_erc20_opt = + std::optional is_erc20_opt = blockchain_token_value->FindBool("erc20"); if (is_erc20_opt) { blockchain_token->is_erc20 = *is_erc20_opt; @@ -258,7 +259,7 @@ bool ParseTokenList(const std::string& json, blockchain_token->is_erc20 = false; } - absl::optional is_erc721_opt = + std::optional is_erc721_opt = blockchain_token_value->FindBool("erc721"); if (is_erc721_opt) { blockchain_token->is_erc721 = *is_erc721_opt; @@ -279,7 +280,7 @@ bool ParseTokenList(const std::string& json, ParseResultFromDict(blockchain_token_value, "logo", &blockchain_token->logo); - absl::optional decimals_opt = + std::optional decimals_opt = blockchain_token_value->FindInt("decimals"); if (decimals_opt) { blockchain_token->decimals = *decimals_opt; @@ -306,7 +307,7 @@ bool ParseTokenList(const std::string& json, return true; } -absl::optional ParseRampTokenListMaps( +std::optional ParseRampTokenListMaps( const std::string& json) { // { // "tokens" : [ @@ -385,9 +386,9 @@ absl::optional ParseRampTokenListMaps( // ] // } - absl::optional records_v = ParseJsonToDict(json); + std::optional records_v = ParseJsonToDict(json); if (!records_v) { - return absl::nullopt; + return std::nullopt; } OnRampTokensListMap on_ramp_supported_tokens_lists; @@ -396,7 +397,7 @@ absl::optional ParseRampTokenListMaps( const auto tokens_list = blockchain_lists::OnRampTokenLists::FromValue(records_v->GetDict()); if (!tokens_list) { - return absl::nullopt; + return std::nullopt; } for (const auto& token : (*tokens_list).tokens) { @@ -408,18 +409,18 @@ absl::optional ParseRampTokenListMaps( std::move(off_ramp_supported_tokens_lists)}; } -absl::optional> ParseOnRampCurrencyLists( +std::optional> ParseOnRampCurrencyLists( const std::string& json) { - absl::optional records_v = ParseJsonToDict(json); + std::optional records_v = ParseJsonToDict(json); if (!records_v) { - return absl::nullopt; + return std::nullopt; } const auto on_ramp_supported_currencies_from_component = blockchain_lists::OnRampCurrencyLists::FromValue(records_v->GetDict()); if (!on_ramp_supported_currencies_from_component) { - return absl::nullopt; + return std::nullopt; } std::vector on_ramp_supported_currencies; @@ -569,7 +570,7 @@ bool ParseChainList(const std::string& json, ChainList* result) { return true; } -absl::optional ParseDappLists(const std::string& json) { +std::optional ParseDappLists(const std::string& json) { // { // "solana": { // "success": true, @@ -642,15 +643,15 @@ absl::optional ParseDappLists(const std::string& json) { // ... // } - absl::optional records_v = ParseJsonToDict(json); + std::optional records_v = ParseJsonToDict(json); if (!records_v) { - return absl::nullopt; + return std::nullopt; } auto dapp_lists_from_component = blockchain_lists::DappLists::FromValue(records_v->GetDict()); if (!dapp_lists_from_component) { - return absl::nullopt; + return std::nullopt; } DappListMap dapp_lists; @@ -681,7 +682,7 @@ absl::optional ParseDappLists(const std::string& json) { return dapp_lists; } -absl::optional ParseCoingeckoIdsMap(const std::string& json) { +std::optional ParseCoingeckoIdsMap(const std::string& json) { // { // "0x1": { // "0xb9ef770b6a5e12e45983c5d80545258aa38f3b78": "0chain", @@ -695,14 +696,14 @@ absl::optional ParseCoingeckoIdsMap(const std::string& json) { // } // } - absl::optional records_v = ParseJsonToDict(json); + std::optional records_v = ParseJsonToDict(json); if (!records_v) { - return absl::nullopt; + return std::nullopt; } const base::Value::Dict* chain_ids = records_v->GetIfDict(); if (!chain_ids) { - return absl::nullopt; + return std::nullopt; } std::map, std::string> coingecko_ids_map; @@ -711,7 +712,7 @@ absl::optional ParseCoingeckoIdsMap(const std::string& json) { const auto* contract_addresses = chain_id_record.second.GetIfDict(); if (!contract_addresses) { - return absl::nullopt; + return std::nullopt; } for (const auto contract_address_record : *contract_addresses) { @@ -719,7 +720,7 @@ absl::optional ParseCoingeckoIdsMap(const std::string& json) { base::ToLowerASCII(contract_address_record.first); const auto* coingecko_id = contract_address_record.second.GetIfString(); if (!coingecko_id) { - return absl::nullopt; + return std::nullopt; } coingecko_ids_map[{chain_id, contract_address}] = *coingecko_id; @@ -729,7 +730,7 @@ absl::optional ParseCoingeckoIdsMap(const std::string& json) { return CoingeckoIdsMap(coingecko_ids_map.begin(), coingecko_ids_map.end()); } -absl::optional> ParseOfacAddressesList( +std::optional> ParseOfacAddressesList( const std::string& json) { // { // "addresses": [ @@ -738,15 +739,15 @@ absl::optional> ParseOfacAddressesList( // ... // ] // } - absl::optional records_v = ParseJsonToDict(json); + std::optional records_v = ParseJsonToDict(json); if (!records_v) { - return absl::nullopt; + return std::nullopt; } auto ofac_list_from_component = blockchain_lists::OfacAddressesList::FromValue(records_v->GetDict()); if (!ofac_list_from_component) { - return absl::nullopt; + return std::nullopt; } std::vector ofac_list; diff --git a/components/brave_wallet/browser/blockchain_list_parser.h b/components/brave_wallet/browser/blockchain_list_parser.h index 9546a52277c..719a2187db0 100644 --- a/components/brave_wallet/browser/blockchain_list_parser.h +++ b/components/brave_wallet/browser/blockchain_list_parser.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_BLOCKCHAIN_LIST_PARSER_H_ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_BLOCKCHAIN_LIST_PARSER_H_ +#include #include #include #include @@ -34,15 +35,15 @@ using RampTokenListMaps = std::pair; bool ParseTokenList(const std::string& json, TokenListMap* token_list, mojom::CoinType coin); -absl::optional ParseRampTokenListMaps( +std::optional ParseRampTokenListMaps( const std::string& json); -absl::optional> ParseOnRampCurrencyLists( +std::optional> ParseOnRampCurrencyLists( const std::string& json); std::string GetTokenListKey(mojom::CoinType coin, const std::string& chain_id); bool ParseChainList(const std::string& json, ChainList* chain_list); -absl::optional ParseDappLists(const std::string& json); -absl::optional ParseCoingeckoIdsMap(const std::string& json); -absl::optional> ParseOfacAddressesList( +std::optional ParseDappLists(const std::string& json); +std::optional ParseCoingeckoIdsMap(const std::string& json); +std::optional> ParseOfacAddressesList( const std::string& json); } // namespace brave_wallet diff --git a/components/brave_wallet/browser/blockchain_list_parser_unittest.cc b/components/brave_wallet/browser/blockchain_list_parser_unittest.cc index a23748393b2..8a0a2d371b5 100644 --- a/components/brave_wallet/browser/blockchain_list_parser_unittest.cc +++ b/components/brave_wallet/browser/blockchain_list_parser_unittest.cc @@ -3,11 +3,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include "brave/components/brave_wallet/browser/blockchain_list_parser.h" + #include +#include #include #include -#include "brave/components/brave_wallet/browser/blockchain_list_parser.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -415,7 +417,7 @@ TEST(BlockchainListParseUnitTest, ParseDappLists) { })"; // Parse the dapp list - absl::optional dapp_list_map = ParseDappLists(dapp_list); + std::optional dapp_list_map = ParseDappLists(dapp_list); ASSERT_TRUE(dapp_list_map); // There should be eight lists, for Ethereum, Solana, Polygon, Binance Smart @@ -491,7 +493,7 @@ TEST(BlockchainListParseUnitTest, ParseDappLists) { TEST(BlockchainListParseUnitTest, ParseOnRampTokensListMap) { // Invalid JSON is not parsed - absl::optional supported_tokens_list_map = + std::optional supported_tokens_list_map = ParseRampTokenListMaps(R"({)"); ASSERT_FALSE(supported_tokens_list_map); @@ -700,7 +702,7 @@ TEST(BlockchainListParseUnitTest, ParseOffRampTokensListMap) { ] })"; - absl::optional supported_tokens_list_map = + std::optional supported_tokens_list_map = ParseRampTokenListMaps(supported_tokens_list); ASSERT_TRUE(supported_tokens_list_map); EXPECT_EQ((*supported_tokens_list_map).second.size(), 1UL); @@ -727,8 +729,8 @@ TEST(BlockchainListParseUnitTest, ParseOffRampTokensListMap) { TEST(ParseOnRampCurrencyListTest, ParseOnRampCurrencyLists) { // Invalid JSON is not parsed - absl::optional> - supported_currencies_lists = ParseOnRampCurrencyLists(R"({)"); + std::optional> supported_currencies_lists = + ParseOnRampCurrencyLists(R"({)"); ASSERT_FALSE(supported_currencies_lists); const std::string supported_currencies_lists_json = R"({ @@ -788,8 +790,7 @@ TEST(BlockchainListParseUnitTest, ParseCoingeckoIdsMap) { } })"; - absl::optional coingecko_ids_map = - ParseCoingeckoIdsMap(json); + std::optional coingecko_ids_map = ParseCoingeckoIdsMap(json); ASSERT_TRUE(coingecko_ids_map); @@ -822,7 +823,7 @@ TEST(BlockchainListParseUnitTest, ParseOfacAddressesList) { ] })"; - absl::optional> ofac_addresses_list = + std::optional> ofac_addresses_list = ParseOfacAddressesList(json); ASSERT_TRUE(ofac_addresses_list); diff --git a/components/brave_wallet/browser/blockchain_registry.cc b/components/brave_wallet/browser/blockchain_registry.cc index 02a2b00e1ce..f9449f6e071 100644 --- a/components/brave_wallet/browser/blockchain_registry.cc +++ b/components/brave_wallet/browser/blockchain_registry.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_wallet/browser/blockchain_registry.h" #include +#include #include #include "base/containers/flat_set.h" @@ -36,7 +37,7 @@ struct ParseListsResult { std::vector ofac_addresses; }; -void HandleRampTokenLists(const absl::optional& result, +void HandleRampTokenLists(const std::optional& result, ParseListsResult& out) { if (!result.has_value()) { return; @@ -60,13 +61,13 @@ void HandleRampTokenLists(const absl::optional& result, } } -void HandleOnRampCurrenciesLists(const absl::optional& result, +void HandleOnRampCurrenciesLists(const std::optional& result, ParseListsResult& out) { if (!result.has_value()) { return; } - absl::optional> lists = + std::optional> lists = ParseOnRampCurrencyLists(*result); if (!lists) { VLOG(1) << "Can't parse on ramp supported sell token lists."; @@ -89,8 +90,8 @@ base::FilePath ResolveAbsolutePath(const base::FilePath& input_path) { return output_path; } -absl::optional ParseJsonFile(base::FilePath path, - const std::string& filename) { +std::optional ParseJsonFile(base::FilePath path, + const std::string& filename) { // We do not sanitize the result here via JsonSanitizer::Sanitize to optimize // the performance because we are processing data from our own CRX downloaded // via component updater, hence it is considered as trusted input. @@ -99,7 +100,7 @@ absl::optional ParseJsonFile(base::FilePath path, const base::FilePath json_path = path.AppendASCII(filename); if (!base::ReadFileToString(json_path, &json_content)) { LOG(ERROR) << "Can't read file: " << filename; - return absl::nullopt; + return std::nullopt; } return json_content; @@ -111,7 +112,7 @@ void DoParseCoingeckoIdsMap(const base::FilePath& dir, ParseListsResult& out) { return; } - absl::optional coingecko_ids_map = + std::optional coingecko_ids_map = ParseCoingeckoIdsMap(*result); if (!coingecko_ids_map) { VLOG(1) << "Can't parse coingecko-ids.json"; @@ -175,7 +176,7 @@ void DoParseDappLists(const base::FilePath& dir, ParseListsResult& out) { return; } - absl::optional lists = ParseDappLists(converted_json); + std::optional lists = ParseDappLists(converted_json); if (!lists) { VLOG(1) << "Can't parse dapp lists."; return; @@ -200,7 +201,7 @@ void DoParseOfacAddressesLists(const base::FilePath& dir, return; } - absl::optional> list = + std::optional> list = ParseOfacAddressesList(*result); if (!list) { VLOG(1) << "Can't parse ofac addresses list."; @@ -510,14 +511,14 @@ void BlockchainRegistry::GetTopDapps(const std::string& chain_id, std::move(callback).Run(std::move(dapps_copy)); } -absl::optional BlockchainRegistry::GetCoingeckoId( +std::optional BlockchainRegistry::GetCoingeckoId( const std::string& chain_id, const std::string& contract_address) { const auto& chain_id_lower = base::ToLowerASCII(chain_id); const auto& contract_address_lower = base::ToLowerASCII(contract_address); if (!coingecko_ids_map_.contains({chain_id_lower, contract_address_lower})) { - return absl::nullopt; + return std::nullopt; } return coingecko_ids_map_[{chain_id_lower, contract_address_lower}]; diff --git a/components/brave_wallet/browser/blockchain_registry.h b/components/brave_wallet/browser/blockchain_registry.h index 1204f86c175..38fae10090a 100644 --- a/components/brave_wallet/browser/blockchain_registry.h +++ b/components/brave_wallet/browser/blockchain_registry.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_BLOCKCHAIN_REGISTRY_H_ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_BLOCKCHAIN_REGISTRY_H_ +#include #include #include @@ -52,7 +53,7 @@ class BlockchainRegistry : public mojom::BlockchainRegistry { mojom::CoinType coin, const std::string& address); std::vector GetPrepopulatedNetworks(); - absl::optional GetCoingeckoId( + std::optional GetCoingeckoId( const std::string& chain_id, const std::string& contract_address); diff --git a/components/brave_wallet/browser/blockchain_registry_unittest.cc b/components/brave_wallet/browser/blockchain_registry_unittest.cc index e58a23acbe7..79edbf15f02 100644 --- a/components/brave_wallet/browser/blockchain_registry_unittest.cc +++ b/components/brave_wallet/browser/blockchain_registry_unittest.cc @@ -3,7 +3,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include "brave/components/brave_wallet/browser/blockchain_registry.h" + #include +#include #include #include @@ -13,7 +16,6 @@ #include "base/test/bind.h" #include "base/test/task_environment.h" #include "brave/components/brave_wallet/browser/blockchain_list_parser.h" -#include "brave/components/brave_wallet/browser/blockchain_registry.h" #include "brave/components/brave_wallet/browser/brave_wallet_constants.h" #include "brave/components/brave_wallet/browser/json_rpc_requests_helper.h" #include "testing/gmock/include/gmock/gmock.h" @@ -672,7 +674,7 @@ TEST(BlockchainRegistryUnitTest, GetBuyTokens) { })); run_loop->Run(); - absl::optional ramp_token_lists = + std::optional ramp_token_lists = ParseRampTokenListMaps(ramp_token_lists_json); ASSERT_TRUE(ramp_token_lists); registry->UpdateOnRampTokenLists(std::move(*ramp_token_lists).first); @@ -717,7 +719,7 @@ TEST(BlockchainRegistryUnitTest, GetProvidersBuyTokens) { base::test::TaskEnvironment task_environment; auto* registry = BlockchainRegistry::GetInstance(); - absl::optional ramp_token_lists = + std::optional ramp_token_lists = ParseRampTokenListMaps(ramp_token_lists_json); ASSERT_TRUE(ramp_token_lists); registry->UpdateOnRampTokenLists(std::move(*ramp_token_lists).first); @@ -779,7 +781,7 @@ TEST(BlockchainRegistryUnitTest, GetSellTokens) { })); run_loop->Run(); - absl::optional ramp_token_lists = + std::optional ramp_token_lists = ParseRampTokenListMaps(ramp_token_lists_json); ASSERT_TRUE(ramp_token_lists); registry->UpdateOffRampTokenLists(std::move(*ramp_token_lists).second); @@ -832,7 +834,7 @@ TEST(BlockchainRegistryUnitTest, GetOnRampCurrencies) { })); run_loop->Run(); - absl::optional> on_ramp_currency_lists = + std::optional> on_ramp_currency_lists = ParseOnRampCurrencyLists(on_ramp_currency_lists_json); ASSERT_TRUE(on_ramp_currency_lists); registry->UpdateOnRampCurrenciesLists(std::move(*on_ramp_currency_lists)); @@ -899,7 +901,7 @@ TEST(BlockchainRegistryUnitTest, GetPrepopulatedNetworksKnownOnesArePreferred) { TEST(BlockchainRegistryUnitTest, GetTopDapps) { base::test::TaskEnvironment task_environment; auto* registry = BlockchainRegistry::GetInstance(); - absl::optional dapp_lists_map = ParseDappLists(dapp_lists_json); + std::optional dapp_lists_map = ParseDappLists(dapp_lists_json); ASSERT_TRUE(dapp_lists_map); registry->UpdateDappList(std::move(*dapp_lists_map)); @@ -977,7 +979,7 @@ TEST(BlockchainRegistryUnitTest, GetEthTokenListMap) { TEST(BlockchainRegistryUnitTest, GetCoingeckoId) { base::test::TaskEnvironment task_environment; auto* registry = BlockchainRegistry::GetInstance(); - absl::optional coingecko_ids_map = + std::optional coingecko_ids_map = ParseCoingeckoIdsMap(coingecko_ids_map_json); ASSERT_TRUE(coingecko_ids_map); registry->UpdateCoingeckoIdsMap(std::move(*coingecko_ids_map)); @@ -995,20 +997,19 @@ TEST(BlockchainRegistryUnitTest, GetCoingeckoId) { // Result: ❌ EXPECT_EQ( registry->GetCoingeckoId(mojom::kOptimismMainnetChainId, "0xdeadbeef"), - absl::nullopt); + std::nullopt); // Chain: ❌ // Contract: ✅ // Result: ❌ EXPECT_EQ(registry->GetCoingeckoId( "0xdeadbeef", "0x7f5c764cbc14f9669b88837ca1490cca17c31607"), - absl::nullopt); + std::nullopt); // Chain: ❌ // Contract: ❌ // Result: ❌ - EXPECT_EQ(registry->GetCoingeckoId("0xdeadbeef", "0xcafebabe"), - absl::nullopt); + EXPECT_EQ(registry->GetCoingeckoId("0xdeadbeef", "0xcafebabe"), std::nullopt); // Chain: ✅ (wrong case) // Contract: ✅ diff --git a/components/brave_wallet/browser/brave_wallet_auto_pin_service.cc b/components/brave_wallet/browser/brave_wallet_auto_pin_service.cc index 48e7fe14f4f..0100d33b7c9 100644 --- a/components/brave_wallet/browser/brave_wallet_auto_pin_service.cc +++ b/components/brave_wallet/browser/brave_wallet_auto_pin_service.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/brave_wallet_auto_pin_service.h" +#include #include #include "brave/components/brave_wallet/browser/pref_names.h" @@ -16,9 +17,9 @@ bool ShouldRetryOnError(const mojom::PinErrorPtr& error) { mojom::WalletPinServiceErrorCode::ERR_NON_IPFS_TOKEN_URL; } -absl::optional GetTokenStringValue( +std::optional GetTokenStringValue( const mojom::BlockchainTokenPtr& token) { - return BraveWalletPinService::GetTokenPrefPath(absl::nullopt, token); + return BraveWalletPinService::GetTokenPrefPath(std::nullopt, token); } } // namespace @@ -26,7 +27,7 @@ absl::optional GetTokenStringValue( BraveWalletAutoPinService::IntentData::IntentData( const BlockchainTokenPtr& token, Operation operation, - absl::optional service) + std::optional service) : token(token.Clone()), operation(operation), service(std::move(service)) {} BraveWalletAutoPinService::IntentData::~IntentData() = default; @@ -126,7 +127,7 @@ void BraveWalletAutoPinService::OnTokenAdded(BlockchainTokenPtr token) { return GetTokenStringValue(intent->token) == token_str; }); AddOrExecute( - std::make_unique(token, Operation::kAdd, absl::nullopt)); + std::make_unique(token, Operation::kAdd, std::nullopt)); } void BraveWalletAutoPinService::OnTokenRemoved(BlockchainTokenPtr token) { @@ -145,7 +146,7 @@ void BraveWalletAutoPinService::OnTokenRemoved(BlockchainTokenPtr token) { return GetTokenStringValue(intent->token) == token_str; }); AddOrExecute( - std::make_unique(token, Operation::kDelete, absl::nullopt)); + std::make_unique(token, Operation::kDelete, std::nullopt)); } void BraveWalletAutoPinService::Restore() { @@ -168,14 +169,14 @@ void BraveWalletAutoPinService::OnTokenListResolved( // Resolves list of user tokens. // Check whether they are pinned or not and posts corresponding tasks. std::set known_tokens = - brave_wallet_pin_service_->GetTokens(absl::nullopt); + brave_wallet_pin_service_->GetTokens(std::nullopt); for (const auto& token : token_list) { if (!BraveWalletPinService::IsTokenSupportedForPinning(token)) { continue; } auto token_path = - BraveWalletPinService::GetTokenPrefPath(absl::nullopt, token); + BraveWalletPinService::GetTokenPrefPath(std::nullopt, token); auto token_str = GetTokenStringValue(token); // Currently they are same but may be different in the future @@ -187,29 +188,29 @@ void BraveWalletAutoPinService::OnTokenListResolved( tokens_.insert(token_str.value()); mojom::TokenPinStatusPtr status = - brave_wallet_pin_service_->GetTokenStatus(absl::nullopt, token); + brave_wallet_pin_service_->GetTokenStatus(std::nullopt, token); std::unique_ptr intent; if (!status) { AddOrExecute( - std::make_unique(token, Operation::kAdd, absl::nullopt)); + std::make_unique(token, Operation::kAdd, std::nullopt)); } else if (status->code == mojom::TokenPinStatusCode::STATUS_PINNED) { // Pinned tokens should be verified for entirety time to time. // We should check that related CIDs are still pinned. auto t1 = status->validate_time; if ((base::Time::Now() - t1) > base::Days(1) || t1 > base::Time::Now()) { AddOrExecute(std::make_unique(token, Operation::kValidate, - absl::nullopt)); + std::nullopt)); } } else if (status->code == mojom::TokenPinStatusCode::STATUS_PINNING_FAILED) { if (ShouldRetryOnError(status->error)) { - AddOrExecute(std::make_unique(token, Operation::kAdd, - absl::nullopt)); + AddOrExecute( + std::make_unique(token, Operation::kAdd, std::nullopt)); } } else { AddOrExecute( - std::make_unique(token, Operation::kAdd, absl::nullopt)); + std::make_unique(token, Operation::kAdd, std::nullopt)); } } @@ -220,7 +221,7 @@ void BraveWalletAutoPinService::OnTokenListResolved( BraveWalletPinService::TokenFromPrefPath(t); if (token) { AddOrExecute(std::make_unique(token, Operation::kDelete, - absl::nullopt)); + std::nullopt)); } } diff --git a/components/brave_wallet/browser/brave_wallet_auto_pin_service.h b/components/brave_wallet/browser/brave_wallet_auto_pin_service.h index 38cd1b7f3cc..971f47f2914 100644 --- a/components/brave_wallet/browser/brave_wallet_auto_pin_service.h +++ b/components/brave_wallet/browser/brave_wallet_auto_pin_service.h @@ -8,6 +8,7 @@ #include #include +#include #include #include #include @@ -26,7 +27,6 @@ #include "mojo/public/cpp/bindings/pending_remote.h" #include "mojo/public/cpp/bindings/receiver_set.h" #include "mojo/public/cpp/bindings/remote_set.h" -#include "third_party/abseil-cpp/absl/types/optional.h" using brave_wallet::mojom::BlockchainTokenPtr; @@ -72,12 +72,12 @@ class BraveWalletAutoPinService struct IntentData { BlockchainTokenPtr token; Operation operation; - absl::optional service; + std::optional service; size_t attempt = 0; IntentData(const BlockchainTokenPtr& token, Operation operation, - absl::optional service); + std::optional service); ~IntentData(); bool Equals( @@ -95,8 +95,8 @@ class BraveWalletAutoPinService void AddOrExecute(std::unique_ptr data); void PostRetry(std::unique_ptr data); - std::vector> GetServicesToPin(); - std::vector> GetKnownServices(); + std::vector> GetServicesToPin(); + std::vector> GetKnownServices(); void ValidateToken(const std::unique_ptr& data); void PinToken(const std::unique_ptr& data); diff --git a/components/brave_wallet/browser/brave_wallet_auto_pin_service_unittest.cc b/components/brave_wallet/browser/brave_wallet_auto_pin_service_unittest.cc index e3d7c2c147a..ff9a6130411 100644 --- a/components/brave_wallet/browser/brave_wallet_auto_pin_service_unittest.cc +++ b/components/brave_wallet/browser/brave_wallet_auto_pin_service_unittest.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_wallet/browser/brave_wallet_auto_pin_service.h" #include +#include #include #include #include @@ -44,30 +45,30 @@ class MockBraveWalletPinService : public BraveWalletPinService { MOCK_METHOD0(Restore, void()); MOCK_METHOD3(AddPin, void(mojom::BlockchainTokenPtr, - const absl::optional&, + const std::optional&, BraveWalletPinService::AddPinCallback callback)); MOCK_METHOD3(RemovePin, void(mojom::BlockchainTokenPtr, - const absl::optional&, + const std::optional&, BraveWalletPinService::RemovePinCallback callback)); MOCK_METHOD3(Validate, void(mojom::BlockchainTokenPtr, - const absl::optional&, + const std::optional&, BraveWalletPinService::ValidateCallback)); MOCK_METHOD1(GetTokens, - std::set(const absl::optional&)); + std::set(const std::optional&)); MOCK_METHOD2(GetTokenStatus, - mojom::TokenPinStatusPtr(const absl::optional&, + mojom::TokenPinStatusPtr(const std::optional&, const mojom::BlockchainTokenPtr&)); MOCK_METHOD2(GetLastValidateTime, - absl::optional(const absl::optional&, - const mojom::BlockchainTokenPtr&)); + std::optional(const std::optional&, + const mojom::BlockchainTokenPtr&)); MOCK_METHOD2(MarkAsPendingForPinning, void(const mojom::BlockchainTokenPtr&, - const absl::optional&)); + const std::optional&)); MOCK_METHOD2(MarkAsPendingForUnpinning, void(const mojom::BlockchainTokenPtr&, - const absl::optional&)); + const std::optional&)); MOCK_METHOD1(Reset, void(base::OnceCallback callback)); }; @@ -133,7 +134,7 @@ TEST_F(BraveWalletAutoPinServiceTest, Autopin_WhenTokenAdded) { ON_CALL(*GetBraveWalletPinService(), AddPin(_, _, _)) .WillByDefault( ::testing::Invoke([](BlockchainTokenPtr token, - const absl::optional& service, + const std::optional& service, BraveWalletPinService::AddPinCallback callback) { std::move(callback).Run(true, nullptr); })); @@ -165,7 +166,7 @@ TEST_F(BraveWalletAutoPinServiceTest, TokenRemoved) { ON_CALL(*GetBraveWalletPinService(), AddPin(_, _, _)) .WillByDefault( ::testing::Invoke([](BlockchainTokenPtr token, - const absl::optional& service, + const std::optional& service, BraveWalletPinService::AddPinCallback callback) { std::move(callback).Run(true, nullptr); })); @@ -182,9 +183,9 @@ TEST_F(BraveWalletAutoPinServiceTest, UnpinUnknownTokens_WhenRestore) { "nft.local.60.0x1.0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d.0x3"); ON_CALL(*GetBraveWalletPinService(), - GetTokenStatus(testing::Eq(absl::nullopt), _)) + GetTokenStatus(testing::Eq(std::nullopt), _)) .WillByDefault( - ::testing::Invoke([](absl::optional service, + ::testing::Invoke([](std::optional service, const mojom::BlockchainTokenPtr& token) -> mojom::TokenPinStatusPtr { mojom::TokenPinStatusPtr status = mojom::TokenPinStatus::New(); @@ -209,7 +210,7 @@ TEST_F(BraveWalletAutoPinServiceTest, UnpinUnknownTokens_WhenRestore) { RemovePin(TokenPathMatches( "nft.local.60.0x1." "0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d.0x3"), - testing::Eq(absl::nullopt), _)) + testing::Eq(std::nullopt), _)) .Times(1); BraveWalletAutoPinService auto_pin_service( @@ -228,9 +229,9 @@ TEST_F(BraveWalletAutoPinServiceTest, ValidateOldTokens_WhenRestore) { known_tokens.insert( "nft.local.60.0x1.0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d.0x4"); ON_CALL(*GetBraveWalletPinService(), - GetTokenStatus(testing::Eq(absl::nullopt), _)) + GetTokenStatus(testing::Eq(std::nullopt), _)) .WillByDefault( - ::testing::Invoke([](absl::optional service, + ::testing::Invoke([](std::optional service, const mojom::BlockchainTokenPtr& token) -> mojom::TokenPinStatusPtr { mojom::TokenPinStatusPtr status = mojom::TokenPinStatus::New(); @@ -268,7 +269,7 @@ TEST_F(BraveWalletAutoPinServiceTest, ValidateOldTokens_WhenRestore) { ON_CALL(*GetBraveWalletPinService(), Validate(_, _, _)) .WillByDefault(::testing::Invoke( [](BlockchainTokenPtr token, - const absl::optional& service, + const std::optional& service, BraveWalletPinService::ValidateCallback callback) { std::move(callback).Run( mojom::TokenValidationResult::kValidationPassed); @@ -278,25 +279,25 @@ TEST_F(BraveWalletAutoPinServiceTest, ValidateOldTokens_WhenRestore) { Validate(TokenPathMatches( "nft.local.60.0x1." "0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d.0x1"), - testing::Eq(absl::nullopt), _)) + testing::Eq(std::nullopt), _)) .Times(1); EXPECT_CALL(*GetBraveWalletPinService(), Validate(TokenPathMatches( "nft.local.60.0x1." "0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d.0x2"), - testing::Eq(absl::nullopt), _)) + testing::Eq(std::nullopt), _)) .Times(1); EXPECT_CALL(*GetBraveWalletPinService(), Validate(TokenPathMatches( "nft.local.60.0x1." "0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d.0x3"), - testing::Eq(absl::nullopt), _)) + testing::Eq(std::nullopt), _)) .Times(1); EXPECT_CALL(*GetBraveWalletPinService(), Validate(TokenPathMatches( "nft.local.60.0x1." "0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d.0x4"), - testing::Eq(absl::nullopt), _)) + testing::Eq(std::nullopt), _)) .Times(0); BraveWalletAutoPinService auto_pin_service( @@ -314,9 +315,9 @@ TEST_F(BraveWalletAutoPinServiceTest, PinContinue_WhenRestore) { "nft.local.60.0x1.0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d.0x3"); ON_CALL(*GetBraveWalletPinService(), - GetTokenStatus(testing::Eq(absl::nullopt), _)) + GetTokenStatus(testing::Eq(std::nullopt), _)) .WillByDefault( - ::testing::Invoke([](absl::optional service, + ::testing::Invoke([](std::optional service, const mojom::BlockchainTokenPtr& token) -> mojom::TokenPinStatusPtr { mojom::TokenPinStatusPtr status = mojom::TokenPinStatus::New(); @@ -357,7 +358,7 @@ TEST_F(BraveWalletAutoPinServiceTest, PinContinue_WhenRestore) { ON_CALL(*GetBraveWalletPinService(), AddPin(_, _, _)) .WillByDefault( ::testing::Invoke([](BlockchainTokenPtr token, - const absl::optional& service, + const std::optional& service, BraveWalletPinService::AddPinCallback callback) { std::move(callback).Run(true, nullptr); })); @@ -366,31 +367,31 @@ TEST_F(BraveWalletAutoPinServiceTest, PinContinue_WhenRestore) { *GetBraveWalletPinService(), AddPin(TokenPathMatches("nft.local.60.0x1." "0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d.0x1"), - testing::Eq(absl::nullopt), _)) + testing::Eq(std::nullopt), _)) .Times(1); EXPECT_CALL( *GetBraveWalletPinService(), AddPin(TokenPathMatches("nft.local.60.0x1." "0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d.0x2"), - testing::Eq(absl::nullopt), _)) + testing::Eq(std::nullopt), _)) .Times(1); EXPECT_CALL( *GetBraveWalletPinService(), AddPin(TokenPathMatches("nft.local.60.0x1." "0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d.0x3"), - testing::Eq(absl::nullopt), _)) + testing::Eq(std::nullopt), _)) .Times(1); EXPECT_CALL( *GetBraveWalletPinService(), AddPin(TokenPathMatches("nft.local.60.0x1." "0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d.0x4"), - testing::Eq(absl::nullopt), _)) + testing::Eq(std::nullopt), _)) .Times(1); EXPECT_CALL( *GetBraveWalletPinService(), AddPin(TokenPathMatches("nft.local.60.0x1." "0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d.0x5"), - testing::Eq(absl::nullopt), _)) + testing::Eq(std::nullopt), _)) .Times(1); BraveWalletAutoPinService auto_pin_service( @@ -410,9 +411,9 @@ TEST_F(BraveWalletAutoPinServiceTest, UnpinContinue_WhenRestore) { "nft.local.60.0x1.0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d.0x4"); ON_CALL(*GetBraveWalletPinService(), - GetTokenStatus(testing::Eq(absl::nullopt), _)) + GetTokenStatus(testing::Eq(std::nullopt), _)) .WillByDefault( - ::testing::Invoke([](absl::optional service, + ::testing::Invoke([](std::optional service, const mojom::BlockchainTokenPtr& token) -> mojom::TokenPinStatusPtr { mojom::TokenPinStatusPtr status = mojom::TokenPinStatus::New(); @@ -444,7 +445,7 @@ TEST_F(BraveWalletAutoPinServiceTest, UnpinContinue_WhenRestore) { ON_CALL(*GetBraveWalletPinService(), RemovePin(_, _, _)) .WillByDefault(::testing::Invoke( [](BlockchainTokenPtr token, - const absl::optional& service, + const std::optional& service, BraveWalletPinService::RemovePinCallback callback) { std::move(callback).Run(true, nullptr); })); @@ -452,7 +453,7 @@ TEST_F(BraveWalletAutoPinServiceTest, UnpinContinue_WhenRestore) { ON_CALL(*GetBraveWalletPinService(), AddPin(_, _, _)) .WillByDefault(::testing::Invoke( [](BlockchainTokenPtr token, - const absl::optional& service, + const std::optional& service, BraveWalletPinService::RemovePinCallback callback) { std::move(callback).Run(true, nullptr); })); @@ -461,25 +462,25 @@ TEST_F(BraveWalletAutoPinServiceTest, UnpinContinue_WhenRestore) { RemovePin(TokenPathMatches( "nft.local.60.0x1." "0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d.0x1"), - testing::Eq(absl::nullopt), _)) + testing::Eq(std::nullopt), _)) .Times(1); EXPECT_CALL(*GetBraveWalletPinService(), RemovePin(TokenPathMatches( "nft.local.60.0x1." "0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d.0x2"), - testing::Eq(absl::nullopt), _)) + testing::Eq(std::nullopt), _)) .Times(1); EXPECT_CALL(*GetBraveWalletPinService(), RemovePin(TokenPathMatches( "nft.local.60.0x1." "0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d.0x3"), - testing::Eq(absl::nullopt), _)) + testing::Eq(std::nullopt), _)) .Times(1); EXPECT_CALL(*GetBraveWalletPinService(), RemovePin(TokenPathMatches( "nft.local.60.0x1." "0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d.0x4"), - testing::Eq(absl::nullopt), _)) + testing::Eq(std::nullopt), _)) .Times(0); BraveWalletAutoPinService auto_pin_service( @@ -492,7 +493,7 @@ TEST_F(BraveWalletAutoPinServiceTest, DoNotAutoPin_WhenAutoPinDisabled) { ON_CALL(*GetBraveWalletPinService(), AddPin(_, _, _)) .WillByDefault( ::testing::Invoke([](BlockchainTokenPtr token, - const absl::optional& service, + const std::optional& service, BraveWalletPinService::AddPinCallback callback) { std::move(callback).Run(true, nullptr); })); @@ -514,9 +515,9 @@ TEST_F(BraveWalletAutoPinServiceTest, PinOldTokens_WhenAutoPinEnabled) { "nft.local.60.0x1.0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d.0x2"); ON_CALL(*GetBraveWalletPinService(), - GetTokenStatus(testing::Eq(absl::nullopt), _)) + GetTokenStatus(testing::Eq(std::nullopt), _)) .WillByDefault( - ::testing::Invoke([](absl::optional service, + ::testing::Invoke([](std::optional service, const mojom::BlockchainTokenPtr& token) -> mojom::TokenPinStatusPtr { mojom::TokenPinStatusPtr status = mojom::TokenPinStatus::New(); @@ -543,7 +544,7 @@ TEST_F(BraveWalletAutoPinServiceTest, PinOldTokens_WhenAutoPinEnabled) { ON_CALL(*GetBraveWalletPinService(), AddPin(_, _, _)) .WillByDefault( ::testing::Invoke([](BlockchainTokenPtr token, - const absl::optional& service, + const std::optional& service, BraveWalletPinService::AddPinCallback callback) { std::move(callback).Run(true, nullptr); })); @@ -552,13 +553,13 @@ TEST_F(BraveWalletAutoPinServiceTest, PinOldTokens_WhenAutoPinEnabled) { *GetBraveWalletPinService(), AddPin(TokenPathMatches("nft.local.60.0x1." "0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d.0x1"), - testing::Eq(absl::nullopt), _)) + testing::Eq(std::nullopt), _)) .Times(1); EXPECT_CALL( *GetBraveWalletPinService(), AddPin(TokenPathMatches("nft.local.60.0x1." "0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d.0x2"), - testing::Eq(absl::nullopt), _)) + testing::Eq(std::nullopt), _)) .Times(1); BraveWalletAutoPinService auto_pin_service( @@ -615,7 +616,7 @@ TEST_F(BraveWalletAutoPinServiceTest, RemoveQueuedTokens) { std::make_unique( GetErc721Token("nft.local.60.0x1." "0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d.0x1"), - BraveWalletAutoPinService::Operation::kDelete, absl::nullopt))); + BraveWalletAutoPinService::Operation::kDelete, std::nullopt))); auto_pin_service.OnTokenRemoved(GetErc721Token( "nft.local.60.0x1.0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d.0x3")); @@ -625,7 +626,7 @@ TEST_F(BraveWalletAutoPinServiceTest, RemoveQueuedTokens) { std::make_unique( GetErc721Token("nft.local.60.0x1." "0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d.0x3"), - BraveWalletAutoPinService::Operation::kDelete, absl::nullopt))); + BraveWalletAutoPinService::Operation::kDelete, std::nullopt))); } TEST_F(BraveWalletAutoPinServiceTest, AddQueuedTokens) { @@ -641,9 +642,9 @@ TEST_F(BraveWalletAutoPinServiceTest, AddQueuedTokens) { "nft.local.60.0x1.0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d.0x4"); ON_CALL(*GetBraveWalletPinService(), - GetTokenStatus(testing::Eq(absl::nullopt), _)) + GetTokenStatus(testing::Eq(std::nullopt), _)) .WillByDefault( - ::testing::Invoke([](absl::optional service, + ::testing::Invoke([](std::optional service, const mojom::BlockchainTokenPtr& token) -> mojom::TokenPinStatusPtr { mojom::TokenPinStatusPtr status = mojom::TokenPinStatus::New(); @@ -685,7 +686,7 @@ TEST_F(BraveWalletAutoPinServiceTest, AddQueuedTokens) { std::make_unique( GetErc721Token("nft.local.60.0x1." "0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d.0x4"), - BraveWalletAutoPinService::Operation::kDelete, absl::nullopt))); + BraveWalletAutoPinService::Operation::kDelete, std::nullopt))); auto_pin_service.OnTokenAdded(GetErc721Token( "nft.local.60.0x1.0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d.0x4")); @@ -695,7 +696,7 @@ TEST_F(BraveWalletAutoPinServiceTest, AddQueuedTokens) { BraveWalletAutoPinService::IntentData>( GetErc721Token( "nft.local.60.0x1.0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d.0x4"), - BraveWalletAutoPinService::Operation::kAdd, absl::nullopt)); + BraveWalletAutoPinService::Operation::kAdd, std::nullopt)); auto_pin_service.OnTokenAdded(GetErc721Token( "nft.local.60.0x1.0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d.0x5")); @@ -706,7 +707,7 @@ TEST_F(BraveWalletAutoPinServiceTest, AddQueuedTokens) { std::make_unique( GetErc721Token("nft.local.60.0x1." "0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d.0x5"), - BraveWalletAutoPinService::Operation::kAdd, absl::nullopt))); + BraveWalletAutoPinService::Operation::kAdd, std::nullopt))); } TEST_F(BraveWalletAutoPinServiceTest, RestoreNotCalled_WhenAutoPinDisabled) { diff --git a/components/brave_wallet/browser/brave_wallet_ipfs_service.cc b/components/brave_wallet/browser/brave_wallet_ipfs_service.cc index cb0084d983c..76beb15e5ab 100644 --- a/components/brave_wallet/browser/brave_wallet_ipfs_service.cc +++ b/components/brave_wallet/browser/brave_wallet_ipfs_service.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/brave_wallet_ipfs_service.h" +#include #include #include #include @@ -38,7 +39,7 @@ void BraveWalletIpfsService::TranslateToNFTGatewayURL( false)) { std::move(callback).Run(new_url.spec()); } else { - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(std::nullopt); } } @@ -51,7 +52,7 @@ void BraveWalletIpfsService::TranslateToGatewayURL( false)) { std::move(callback).Run(new_url.spec()); } else { - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(std::nullopt); } } @@ -62,7 +63,7 @@ void BraveWalletIpfsService::ExtractIPFSUrlFromGatewayLikeUrl( if (result.has_value()) { std::move(callback).Run(result.value().spec()); } else { - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(std::nullopt); } } diff --git a/components/brave_wallet/browser/brave_wallet_p3a.cc b/components/brave_wallet/browser/brave_wallet_p3a.cc index fd11cb0e5d5..062a2689511 100644 --- a/components/brave_wallet/browser/brave_wallet_p3a.cc +++ b/components/brave_wallet/browser/brave_wallet_p3a.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/brave_wallet_p3a.h" +#include #include #include @@ -188,14 +189,14 @@ void BraveWalletP3A::ReportJSProvider(mojom::JSProviderType provider_type, base::UmaHistogramEnumeration(histogram_name, answer); } -absl::optional +std::optional BraveWalletP3A::GetLastOnboardingAction() { if (local_state_->HasPrefPath(kBraveWalletP3AOnboardingLastStep)) { int pref_value = local_state_->GetInteger(kBraveWalletP3AOnboardingLastStep); return static_cast(pref_value); } - return absl::nullopt; + return std::nullopt; } void BraveWalletP3A::ReportOnboardingAction(mojom::OnboardingAction action) { @@ -206,7 +207,7 @@ void BraveWalletP3A::ReportOnboardingAction(mojom::OnboardingAction action) { onboarding_report_timer_.Stop(); return; } - absl::optional last_step = GetLastOnboardingAction(); + std::optional last_step = GetLastOnboardingAction(); if (!last_step.has_value() || *last_step < action) { // Only record steps that are ahead of the previous step so we // don't record back navigation. @@ -230,7 +231,7 @@ void BraveWalletP3A::ReportOnboardingAction(mojom::OnboardingAction action) { } void BraveWalletP3A::RecordOnboardingHistogram() { - absl::optional last_step = GetLastOnboardingAction(); + std::optional last_step = GetLastOnboardingAction(); if (!last_step.has_value()) { return; } diff --git a/components/brave_wallet/browser/brave_wallet_p3a.h b/components/brave_wallet/browser/brave_wallet_p3a.h index edd1ac9b8ae..2b92f36f3b0 100644 --- a/components/brave_wallet/browser/brave_wallet_p3a.h +++ b/components/brave_wallet/browser/brave_wallet_p3a.h @@ -6,6 +6,8 @@ #ifndef BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_BRAVE_WALLET_P3A_H_ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_BRAVE_WALLET_P3A_H_ +#include + #include "base/memory/raw_ptr.h" #include "brave/components/brave_wallet/browser/keyring_service_observer_base.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" @@ -107,7 +109,7 @@ class BraveWalletP3A : public KeyringServiceObserverBase, void OnUpdateTimerFired(); void WriteUsageStatsToHistogram(); void RecordInitialBraveWalletP3AState(); - absl::optional GetLastOnboardingAction(); + std::optional GetLastOnboardingAction(); void RecordOnboardingHistogram(); void MaybeRecordNewUserBalance(); void ReportNftDiscoverySetting(); diff --git a/components/brave_wallet/browser/brave_wallet_pin_service.cc b/components/brave_wallet/browser/brave_wallet_pin_service.cc index 631e7df3f56..1495c40dd63 100644 --- a/components/brave_wallet/browser/brave_wallet_pin_service.cc +++ b/components/brave_wallet/browser/brave_wallet_pin_service.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/brave_wallet_pin_service.h" +#include #include #include "base/json/values_util.h" @@ -38,12 +39,12 @@ const char kEmptyTokenIdPart[] = "*"; const char kNftPart[] = "nft"; /** * Service name used in prefs for local pinning service. - * Use absl::nullopt in methods to perform operations on + * Use std::nullopt in methods to perform operations on * the local pinning service. */ const char kLocalService[] = "local"; -absl::optional StringToStatus( +std::optional StringToStatus( const std::string& status) { if (status == "not_pinned") { return mojom::TokenPinStatusCode::STATUS_NOT_PINNED; @@ -62,10 +63,10 @@ absl::optional StringToStatus( } else if (status == "unpinning_pendig") { return mojom::TokenPinStatusCode::STATUS_UNPINNING_PENDING; } - return absl::nullopt; + return std::nullopt; } -absl::optional StringToErrorCode( +std::optional StringToErrorCode( const std::string& error) { if (error == "ERR_WRONG_TOKEN") { return mojom::WalletPinServiceErrorCode::ERR_WRONG_TOKEN; @@ -84,14 +85,14 @@ absl::optional StringToErrorCode( } else if (error == "ERR_MEDIA_TYPE_UNSUPPORTED") { return mojom::WalletPinServiceErrorCode::ERR_MEDIA_TYPE_UNSUPPORTED; } - return absl::nullopt; + return std::nullopt; } -absl::optional ExtractIpfsUrl(const std::string& url) { +std::optional ExtractIpfsUrl(const std::string& url) { GURL gurl = GURL(url); if (!gurl.is_valid()) { - return absl::nullopt; + return std::nullopt; } if (gurl.SchemeIs(ipfs::kIPFSScheme)) { @@ -100,7 +101,7 @@ absl::optional ExtractIpfsUrl(const std::string& url) { auto source = ipfs::ExtractSourceFromGateway(gurl); if (!source || !source->SchemeIs(ipfs::kIPFSScheme)) { - return absl::nullopt; + return std::nullopt; } return source.value().spec(); @@ -170,7 +171,7 @@ ContentTypeChecker::~ContentTypeChecker() = default; void ContentTypeChecker::CheckContentTypeSupported( const std::string& ipfs_url, - base::OnceCallback)> callback) { + base::OnceCallback)> callback) { // Create a request with no data or cookies. auto resource_request = std::make_unique(); GURL translated_url; @@ -226,11 +227,11 @@ void ContentTypeChecker::CheckContentTypeSupported( void ContentTypeChecker::OnHeadersFetched( UrlLoaderList::iterator loader_it, - base::OnceCallback)> callback, + base::OnceCallback)> callback, scoped_refptr headers) { loaders_in_progress_.erase(loader_it); if (!headers) { - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(std::nullopt); return; } std::string content_type_value; @@ -352,18 +353,18 @@ void BraveWalletPinService::AddObserver( } // static -absl::optional BraveWalletPinService::GetTokenPrefPath( - const absl::optional& service, +std::optional BraveWalletPinService::GetTokenPrefPath( + const std::optional& service, const mojom::BlockchainTokenPtr& token) { if (service && base::ContainsOnlyChars(service.value(), ".")) { - return absl::nullopt; + return std::nullopt; } if (base::ContainsOnlyChars(token->contract_address, ".")) { - return absl::nullopt; + return std::nullopt; } if (!token->token_id.empty() && base::ContainsOnlyChars(token->token_id, ".")) { - return absl::nullopt; + return std::nullopt; } DCHECK(!base::ContainsOnlyChars(token->chain_id, ".")); return base::StrCat( @@ -395,7 +396,7 @@ mojom::BlockchainTokenPtr BraveWalletPinService::TokenFromPrefPath( } // static -absl::optional BraveWalletPinService::ServiceFromPrefPath( +std::optional BraveWalletPinService::ServiceFromPrefPath( const std::string& path) { std::vector parts = base::SplitString(path, ".", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); @@ -403,16 +404,16 @@ absl::optional BraveWalletPinService::ServiceFromPrefPath( return nullptr; } if (parts.at(1) == kLocalService) { - return absl::nullopt; + return std::nullopt; } else { return parts.at(1); } } void BraveWalletPinService::Validate(mojom::BlockchainTokenPtr token, - const absl::optional& service, + const std::optional& service, ValidateCallback callback) { - auto path = GetTokenPrefPath(absl::nullopt, token); + auto path = GetTokenPrefPath(std::nullopt, token); if (!path) { std::move(callback).Run(mojom::TokenValidationResult::kValidationIgnored); return; @@ -429,7 +430,7 @@ void BraveWalletPinService::Validate(mojom::BlockchainTokenPtr token, return; } - absl::optional> ipfs_urls = + std::optional> ipfs_urls = ResolvePinItems(service, token); if (!ipfs_urls) { @@ -477,20 +478,20 @@ void BraveWalletPinService::OnIpfsShutdown() { void BraveWalletPinService::MarkAsPendingForPinning( const mojom::BlockchainTokenPtr& token, - const absl::optional& service) { + const std::optional& service) { SetTokenStatus(service, token, mojom::TokenPinStatusCode::STATUS_PINNING_PENDING, nullptr); } void BraveWalletPinService::MarkAsPendingForUnpinning( const mojom::BlockchainTokenPtr& token, - const absl::optional& service) { + const std::optional& service) { SetTokenStatus(service, token, mojom::TokenPinStatusCode::STATUS_UNPINNING_PENDING, nullptr); } void BraveWalletPinService::AddPin(mojom::BlockchainTokenPtr token, - const absl::optional& service, + const std::optional& service, AddPinCallback callback) { if (!IsTokenSupportedForPinning(token)) { auto pin_error = @@ -525,17 +526,16 @@ void BraveWalletPinService::AddPin(mojom::BlockchainTokenPtr token, } } -void BraveWalletPinService::RemovePin( - mojom::BlockchainTokenPtr token, - const absl::optional& service, - RemovePinCallback callback) { +void BraveWalletPinService::RemovePin(mojom::BlockchainTokenPtr token, + const std::optional& service, + RemovePinCallback callback) { auto token_status = GetTokenStatus(service, token); if (!token_status) { std::move(callback).Run(true, nullptr); return; } - auto path = GetTokenPrefPath(absl::nullopt, token); + auto path = GetTokenPrefPath(std::nullopt, token); if (!path) { std::move(callback).Run( false, @@ -562,11 +562,11 @@ void BraveWalletPinService::RemovePin( void BraveWalletPinService::GetTokenStatus(mojom::BlockchainTokenPtr token, GetTokenStatusCallback callback) { mojom::TokenPinOverviewPtr result = mojom::TokenPinOverview::New(); - result->local = GetTokenStatus(absl::nullopt, token); + result->local = GetTokenStatus(std::nullopt, token); std::move(callback).Run(std::move(result), nullptr); } -void BraveWalletPinService::OnPinsRemoved(absl::optional service, +void BraveWalletPinService::OnPinsRemoved(std::optional service, RemovePinCallback callback, mojom::BlockchainTokenPtr token, bool result) { @@ -581,7 +581,7 @@ void BraveWalletPinService::OnPinsRemoved(absl::optional service, } void BraveWalletPinService::OnSolTokenMetaDataReceived( - absl::optional service, + std::optional service, AddPinCallback callback, mojom::BlockchainTokenPtr token, const std::string& token_url, @@ -602,7 +602,7 @@ void BraveWalletPinService::OnSolTokenMetaDataReceived( } void BraveWalletPinService::OnTokenMetaDataReceived( - absl::optional service, + std::optional service, AddPinCallback callback, mojom::BlockchainTokenPtr token, const std::string& token_url, @@ -623,7 +623,7 @@ void BraveWalletPinService::OnTokenMetaDataReceived( } void BraveWalletPinService::ProcessTokenMetadata( - const absl::optional& service, + const std::optional& service, const mojom::BlockchainTokenPtr& token, const std::string& token_url, const std::string& result, @@ -639,7 +639,7 @@ void BraveWalletPinService::ProcessTokenMetadata( return; } - absl::optional parsed_result = base::JSONReader::Read( + std::optional parsed_result = base::JSONReader::Read( result, base::JSON_PARSE_CHROMIUM_EXTENSIONS | base::JSONParserOptions::JSON_PARSE_RFC); if (!parsed_result || !parsed_result->is_dict()) { @@ -654,7 +654,7 @@ void BraveWalletPinService::ProcessTokenMetadata( auto* image_url = parsed_result->GetDict().FindString("image"); auto image_ipfs_url = - image_url != nullptr ? ExtractIpfsUrl(*image_url) : absl::nullopt; + image_url != nullptr ? ExtractIpfsUrl(*image_url) : std::nullopt; if (!image_ipfs_url) { auto pin_error = mojom::PinError::New( @@ -678,11 +678,11 @@ void BraveWalletPinService::ProcessTokenMetadata( } void BraveWalletPinService::OnContentTypeChecked( - absl::optional service, + std::optional service, mojom::BlockchainTokenPtr token, std::vector ipfs_urls, AddPinCallback callback, - absl::optional result) { + std::optional result) { if (!result.has_value()) { SetTokenStatus(service, token, mojom::TokenPinStatusCode::STATUS_PINNING_FAILED, nullptr); @@ -723,7 +723,7 @@ void BraveWalletPinService::OnContentTypeChecked( local_pin_service_->AddPins( path.value(), ipfs_urls, base::BindOnce(&BraveWalletPinService::OnTokenPinned, - weak_ptr_factory_.GetWeakPtr(), absl::nullopt, + weak_ptr_factory_.GetWeakPtr(), std::nullopt, std::move(callback), std::move(token))); } else { // Remote pinning not implemented yet @@ -731,7 +731,7 @@ void BraveWalletPinService::OnContentTypeChecked( } } -void BraveWalletPinService::OnTokenPinned(absl::optional service, +void BraveWalletPinService::OnTokenPinned(std::optional service, AddPinCallback callback, mojom::BlockchainTokenPtr token, bool result) { @@ -748,11 +748,10 @@ void BraveWalletPinService::OnTokenPinned(absl::optional service, std::move(callback).Run(result, std::move(error)); } -void BraveWalletPinService::OnTokenValidated( - absl::optional service, - ValidateCallback callback, - mojom::BlockchainTokenPtr token, - absl::optional result) { +void BraveWalletPinService::OnTokenValidated(std::optional service, + ValidateCallback callback, + mojom::BlockchainTokenPtr token, + std::optional result) { if (!result.has_value()) { std::move(callback).Run(mojom::TokenValidationResult::kValidationError); return; @@ -772,7 +771,7 @@ void BraveWalletPinService::OnTokenValidated( } bool BraveWalletPinService::AddToken( - const absl::optional& service, + const std::optional& service, const mojom::BlockchainTokenPtr& token, const std::vector& ipfs_urls) { auto path = GetTokenPrefPath(service, token); @@ -802,7 +801,7 @@ bool BraveWalletPinService::AddToken( } bool BraveWalletPinService::RemoveToken( - const absl::optional& service, + const std::optional& service, const mojom::BlockchainTokenPtr& token) { auto path = GetTokenPrefPath(service, token); if (!path) { @@ -822,7 +821,7 @@ bool BraveWalletPinService::RemoveToken( } bool BraveWalletPinService::SetTokenStatus( - const absl::optional& service, + const std::optional& service, const mojom::BlockchainTokenPtr& token, mojom::TokenPinStatusCode status, const mojom::PinErrorPtr& error) { @@ -861,26 +860,26 @@ bool BraveWalletPinService::SetTokenStatus( return true; } -absl::optional> BraveWalletPinService::ResolvePinItems( - const absl::optional& service, +std::optional> BraveWalletPinService::ResolvePinItems( + const std::optional& service, const mojom::BlockchainTokenPtr& token) { const base::Value::Dict& pinned_assets_pref = prefs_->GetDict(kPinnedNFTAssets); auto path = GetTokenPrefPath(service, token); if (!path) { - return absl::nullopt; + return std::nullopt; } auto* token_data_as_dict = pinned_assets_pref.FindDictByDottedPath(path.value()); if (!token_data_as_dict) { - return absl::nullopt; + return std::nullopt; } auto* ipfs_urls = token_data_as_dict->FindList(kAssetUrlListKey); if (!ipfs_urls) { - return absl::nullopt; + return std::nullopt; } std::vector result; @@ -939,7 +938,7 @@ mojom::TokenPinStatusPtr BraveWalletPinService::GetTokenStatus( } mojom::TokenPinStatusPtr BraveWalletPinService::GetTokenStatus( - const absl::optional& service, + const std::optional& service, const mojom::BlockchainTokenPtr& token) { auto path = GetTokenPrefPath(service, token); if (!path) { @@ -949,21 +948,21 @@ mojom::TokenPinStatusPtr BraveWalletPinService::GetTokenStatus( return GetTokenStatus(path.value()); } -absl::optional BraveWalletPinService::GetLastValidateTime( - const absl::optional& service, +std::optional BraveWalletPinService::GetLastValidateTime( + const std::optional& service, const mojom::BlockchainTokenPtr& token) { const base::Value::Dict& pinned_assets_pref = prefs_->GetDict(kPinnedNFTAssets); auto path = GetTokenPrefPath(service, token); if (!path) { - return absl::nullopt; + return std::nullopt; } auto* token_data_as_dict = pinned_assets_pref.FindDictByDottedPath(path.value()); if (!token_data_as_dict) { - return absl::nullopt; + return std::nullopt; } auto* time = token_data_as_dict->Find(kValidateTimestamp); @@ -971,7 +970,7 @@ absl::optional BraveWalletPinService::GetLastValidateTime( } std::set BraveWalletPinService::GetTokens( - const absl::optional& service) { + const std::optional& service) { std::set result; const base::Value::Dict& pinned_assets_pref = @@ -1016,7 +1015,7 @@ std::set BraveWalletPinService::GetTokens( } size_t BraveWalletPinService::GetPinnedTokensCount() { - return base::ranges::count_if(GetTokens(absl::nullopt), [this](auto& v) { + return base::ranges::count_if(GetTokens(std::nullopt), [this](auto& v) { auto status = this->GetTokenStatus(v); return !status.is_null() && status->code == mojom::TokenPinStatusCode::STATUS_PINNED; diff --git a/components/brave_wallet/browser/brave_wallet_pin_service.h b/components/brave_wallet/browser/brave_wallet_pin_service.h index 0cec9e2e246..75e507aa60b 100644 --- a/components/brave_wallet/browser/brave_wallet_pin_service.h +++ b/components/brave_wallet/browser/brave_wallet_pin_service.h @@ -8,6 +8,7 @@ #include #include +#include #include #include #include @@ -26,7 +27,6 @@ #include "mojo/public/cpp/bindings/remote_set.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" namespace brave_wallet { @@ -39,7 +39,7 @@ class ContentTypeChecker { virtual void CheckContentTypeSupported( const std::string& cid, - base::OnceCallback)> callback); + base::OnceCallback)> callback); protected: // For tests @@ -49,7 +49,7 @@ class ContentTypeChecker { using UrlLoaderList = std::list>; void OnHeadersFetched(UrlLoaderList::iterator iterator, - base::OnceCallback)> callback, + base::OnceCallback)> callback, scoped_refptr headers); raw_ptr pref_service_; @@ -61,7 +61,7 @@ class ContentTypeChecker { }; /** - * At the moment only local pinning is supported so use absl::nullopt + * At the moment only local pinning is supported so use std::nullopt * for optional service argument. */ class BraveWalletPinService : public KeyedService, @@ -82,11 +82,11 @@ class BraveWalletPinService : public KeyedService, mojo::PendingRemote MakeRemote(); void Bind(mojo::PendingReceiver receiver); - static absl::optional GetTokenPrefPath( - const absl::optional& service, + static std::optional GetTokenPrefPath( + const std::optional& service, const mojom::BlockchainTokenPtr& token); static mojom::BlockchainTokenPtr TokenFromPrefPath(const std::string& path); - static absl::optional ServiceFromPrefPath( + static std::optional ServiceFromPrefPath( const std::string& path); static std::string StatusToString(const mojom::TokenPinStatusCode& status); static std::string ErrorCodeToString( @@ -98,15 +98,15 @@ class BraveWalletPinService : public KeyedService, void AddObserver(::mojo::PendingRemote observer) override; void AddPin(mojom::BlockchainTokenPtr token, - const absl::optional& service, + const std::optional& service, AddPinCallback callback) override; void RemovePin(mojom::BlockchainTokenPtr token, - const absl::optional& service, + const std::optional& service, RemovePinCallback callback) override; void GetTokenStatus(mojom::BlockchainTokenPtr token, GetTokenStatusCallback callback) override; void Validate(mojom::BlockchainTokenPtr token, - const absl::optional& service, + const std::optional& service, ValidateCallback callback) override; void IsLocalNodeRunning(IsLocalNodeRunningCallback callback) override; void IsTokenSupported(mojom::BlockchainTokenPtr token, @@ -114,23 +114,23 @@ class BraveWalletPinService : public KeyedService, virtual void MarkAsPendingForPinning( const mojom::BlockchainTokenPtr& token, - const absl::optional& service); + const std::optional& service); virtual void MarkAsPendingForUnpinning( const mojom::BlockchainTokenPtr& token, - const absl::optional& service); + const std::optional& service); virtual mojom::TokenPinStatusPtr GetTokenStatus( - const absl::optional& service, + const std::optional& service, const mojom::BlockchainTokenPtr& token); mojom::TokenPinStatusPtr GetTokenStatus(const std::string& path); - virtual absl::optional GetLastValidateTime( - const absl::optional& service, + virtual std::optional GetLastValidateTime( + const std::optional& service, const mojom::BlockchainTokenPtr& token); // Returns list of known tokens for the provided pinning service. // Tokens are returned in the format of string path. // See BraveWalletPinService::GetTokenPrefPath. virtual std::set GetTokens( - const absl::optional& service); + const std::optional& service); size_t GetPinnedTokensCount(); @@ -139,53 +139,53 @@ class BraveWalletPinService : public KeyedService, BraveWalletPinService(); private: - bool AddToken(const absl::optional& service, + bool AddToken(const std::optional& service, const mojom::BlockchainTokenPtr& token, const std::vector& cids); - bool RemoveToken(const absl::optional& service, + bool RemoveToken(const std::optional& service, const mojom::BlockchainTokenPtr& token); - bool SetTokenStatus(const absl::optional& service, + bool SetTokenStatus(const std::optional& service, const mojom::BlockchainTokenPtr& token, mojom::TokenPinStatusCode, const mojom::PinErrorPtr& error); - absl::optional> ResolvePinItems( - const absl::optional& service, + std::optional> ResolvePinItems( + const std::optional& service, const mojom::BlockchainTokenPtr& token); - void OnPinsRemoved(absl::optional service, + void OnPinsRemoved(std::optional service, RemovePinCallback callback, mojom::BlockchainTokenPtr token, bool result); - void OnTokenPinned(absl::optional service, + void OnTokenPinned(std::optional service, AddPinCallback callback, mojom::BlockchainTokenPtr, bool result); - void OnTokenValidated(absl::optional service, + void OnTokenValidated(std::optional service, ValidateCallback callback, mojom::BlockchainTokenPtr, - absl::optional result); + std::optional result); - void ProcessTokenMetadata(const absl::optional& service, + void ProcessTokenMetadata(const std::optional& service, const mojom::BlockchainTokenPtr& token, const std::string& token_url, const std::string& result, AddPinCallback callback); - void OnTokenMetaDataReceived(absl::optional service, + void OnTokenMetaDataReceived(std::optional service, AddPinCallback callback, mojom::BlockchainTokenPtr token, const std::string& token_url, const std::string& result, mojom::ProviderError error, const std::string& error_message); - void OnContentTypeChecked(absl::optional service, + void OnContentTypeChecked(std::optional service, mojom::BlockchainTokenPtr token, std::vector cids, AddPinCallback callback, - absl::optional result); + std::optional result); - void OnSolTokenMetaDataReceived(absl::optional service, + void OnSolTokenMetaDataReceived(std::optional service, AddPinCallback callback, mojom::BlockchainTokenPtr token, const std::string& token_url, diff --git a/components/brave_wallet/browser/brave_wallet_pin_service_unittest.cc b/components/brave_wallet/browser/brave_wallet_pin_service_unittest.cc index 83985c50f42..ac2aadf8d87 100644 --- a/components/brave_wallet/browser/brave_wallet_pin_service_unittest.cc +++ b/components/brave_wallet/browser/brave_wallet_pin_service_unittest.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_wallet/browser/brave_wallet_pin_service.h" #include +#include #include #include #include @@ -187,7 +188,7 @@ class MockContentTypeChecker : public ContentTypeChecker { public: MOCK_METHOD2(CheckContentTypeSupported, void(const std::string&, - base::OnceCallback)>)); + base::OnceCallback)>)); }; } // namespace @@ -243,7 +244,7 @@ TEST_F(BraveWalletPinServiceTest, AddSolPin) { ON_CALL(*GetContentTypeChecker(), CheckContentTypeSupported(_, _)) .WillByDefault(::testing::Invoke( [](const std::string& cid, - base::OnceCallback)> callback) { + base::OnceCallback)> callback) { std::move(callback).Run(true); })); } @@ -280,9 +281,9 @@ TEST_F(BraveWalletPinServiceTest, AddSolPin) { mojom::BlockchainTokenPtr token = BraveWalletPinService::TokenFromPrefPath(kSolMonkey1Path); token->is_nft = true; - absl::optional call_status; + std::optional call_status; service()->AddPin( - std::move(token), absl::nullopt, + std::move(token), std::nullopt, base::BindLambdaForTesting( [&call_status](bool result, mojom::PinErrorPtr error) { call_status = result; @@ -327,9 +328,9 @@ TEST_F(BraveWalletPinServiceTest, AddSolPin) { mojom::BlockchainTokenPtr token = BraveWalletPinService::TokenFromPrefPath(kSolMonkey2Path); token->is_nft = true; - absl::optional call_status; + std::optional call_status; service()->AddPin( - std::move(token), absl::nullopt, + std::move(token), std::nullopt, base::BindLambdaForTesting( [&call_status](bool result, mojom::PinErrorPtr error) { call_status = result; @@ -357,7 +358,7 @@ TEST_F(BraveWalletPinServiceTest, AddPin) { ON_CALL(*GetContentTypeChecker(), CheckContentTypeSupported(_, _)) .WillByDefault(::testing::Invoke( [](const std::string& cid, - base::OnceCallback)> callback) { + base::OnceCallback)> callback) { std::move(callback).Run(true); })); } @@ -394,9 +395,9 @@ TEST_F(BraveWalletPinServiceTest, AddPin) { mojom::BlockchainTokenPtr token = BraveWalletPinService::TokenFromPrefPath(kMonkey1Path); token->is_erc721 = true; - absl::optional call_status; + std::optional call_status; service()->AddPin( - std::move(token), absl::nullopt, + std::move(token), std::nullopt, base::BindLambdaForTesting( [&call_status](bool result, mojom::PinErrorPtr error) { call_status = result; @@ -441,9 +442,9 @@ TEST_F(BraveWalletPinServiceTest, AddPin) { mojom::BlockchainTokenPtr token = BraveWalletPinService::TokenFromPrefPath(kMonkey2Path); token->is_erc721 = true; - absl::optional call_status; + std::optional call_status; service()->AddPin( - std::move(token), absl::nullopt, + std::move(token), std::nullopt, base::BindLambdaForTesting( [&call_status](bool result, mojom::PinErrorPtr error) { call_status = result; @@ -471,7 +472,7 @@ TEST_F(BraveWalletPinServiceTest, AddPin_GatewayUrl) { ON_CALL(*GetContentTypeChecker(), CheckContentTypeSupported(_, _)) .WillByDefault(::testing::Invoke( [](const std::string& cid, - base::OnceCallback)> callback) { + base::OnceCallback)> callback) { std::move(callback).Run(true); })); } @@ -509,9 +510,9 @@ TEST_F(BraveWalletPinServiceTest, AddPin_GatewayUrl) { mojom::BlockchainTokenPtr token = BraveWalletPinService::TokenFromPrefPath(kMonkey5Path); token->is_erc721 = true; - absl::optional call_status; + std::optional call_status; service()->AddPin( - std::move(token), absl::nullopt, + std::move(token), std::nullopt, base::BindLambdaForTesting( [&call_status](bool result, mojom::PinErrorPtr error) { call_status = result; @@ -557,9 +558,9 @@ TEST_F(BraveWalletPinServiceTest, AddPin_GatewayUrl) { mojom::BlockchainTokenPtr token = BraveWalletPinService::TokenFromPrefPath(kMonkey6Path); token->is_erc721 = true; - absl::optional call_status; + std::optional call_status; service()->AddPin( - std::move(token), absl::nullopt, + std::move(token), std::nullopt, base::BindLambdaForTesting( [&call_status](bool result, mojom::PinErrorPtr error) { call_status = result; @@ -587,7 +588,7 @@ TEST_F(BraveWalletPinServiceTest, AddPin_ContentVerification) { ON_CALL(*GetContentTypeChecker(), CheckContentTypeSupported(_, _)) .WillByDefault(::testing::Invoke([](const std::string& cid, base::OnceCallback)> + std::optional)> callback) { EXPECT_EQ( cid, @@ -627,9 +628,9 @@ TEST_F(BraveWalletPinServiceTest, AddPin_ContentVerification) { mojom::BlockchainTokenPtr token = BraveWalletPinService::TokenFromPrefPath(kMonkey1Path); token->is_erc721 = true; - absl::optional call_status; + std::optional call_status; service()->AddPin( - std::move(token), absl::nullopt, + std::move(token), std::nullopt, base::BindLambdaForTesting( [&call_status](bool result, mojom::PinErrorPtr error) { call_status = result; @@ -661,7 +662,7 @@ TEST_F(BraveWalletPinServiceTest, AddPin_ContentVerification) { ON_CALL(*GetContentTypeChecker(), CheckContentTypeSupported(_, _)) .WillByDefault(::testing::Invoke([](const std::string& cid, base::OnceCallback)> + std::optional)> callback) { EXPECT_EQ( cid, @@ -700,9 +701,9 @@ TEST_F(BraveWalletPinServiceTest, AddPin_ContentVerification) { mojom::BlockchainTokenPtr token = BraveWalletPinService::TokenFromPrefPath(kMonkey1Path); token->is_erc721 = true; - absl::optional call_status; + std::optional call_status; service()->AddPin( - std::move(token), absl::nullopt, + std::move(token), std::nullopt, base::BindLambdaForTesting( [&call_status](bool result, mojom::PinErrorPtr error) { call_status = result; @@ -721,13 +722,13 @@ TEST_F(BraveWalletPinServiceTest, AddPin_ContentVerification) { ON_CALL(*GetContentTypeChecker(), CheckContentTypeSupported(_, _)) .WillByDefault(::testing::Invoke([](const std::string& cid, base::OnceCallback)> + std::optional)> callback) { EXPECT_EQ( cid, "ipfs://" "bafybeibqch4za325rjzva4nxtgrjd4k4qdf6dval4jwjxbtpj2dyt6qjhy"); - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(std::nullopt); })); ON_CALL(*GetJsonRpcService(), GetERC721Metadata(_, _, _, _)) .WillByDefault(::testing::Invoke( @@ -760,9 +761,9 @@ TEST_F(BraveWalletPinServiceTest, AddPin_ContentVerification) { mojom::BlockchainTokenPtr token = BraveWalletPinService::TokenFromPrefPath(kMonkey1Path); token->is_erc721 = true; - absl::optional call_status; + std::optional call_status; service()->AddPin( - std::move(token), absl::nullopt, + std::move(token), std::nullopt, base::BindLambdaForTesting( [&call_status](bool result, mojom::PinErrorPtr error) { call_status = result; @@ -792,9 +793,9 @@ TEST_F(BraveWalletPinServiceTest, AddPin_NonIpfsImage) { mojom::BlockchainTokenPtr token = BraveWalletPinService::TokenFromPrefPath(kMonkey4Path); token->is_erc721 = true; - absl::optional call_status; + std::optional call_status; service()->AddPin( - std::move(token), absl::nullopt, + std::move(token), std::nullopt, base::BindLambdaForTesting( [&call_status](bool result, mojom::PinErrorPtr error) { call_status = result; @@ -839,9 +840,9 @@ TEST_F(BraveWalletPinServiceTest, RemoveSolPin) { mojom::BlockchainTokenPtr token = BraveWalletPinService::TokenFromPrefPath(kSolMonkey1Path); token->is_nft = true; - absl::optional remove_status; + std::optional remove_status; service()->RemovePin( - std::move(token), absl::nullopt, + std::move(token), std::nullopt, base::BindLambdaForTesting( [&remove_status](bool status, mojom::PinErrorPtr error) { remove_status = status; @@ -866,9 +867,9 @@ TEST_F(BraveWalletPinServiceTest, RemoveSolPin) { mojom::BlockchainTokenPtr token = BraveWalletPinService::TokenFromPrefPath(kMonkey1Path); token->is_erc721 = true; - absl::optional remove_status; + std::optional remove_status; service()->RemovePin( - std::move(token), absl::nullopt, + std::move(token), std::nullopt, base::BindLambdaForTesting( [&remove_status](bool status, mojom::PinErrorPtr error) { remove_status = status; @@ -907,9 +908,9 @@ TEST_F(BraveWalletPinServiceTest, RemovePin) { mojom::BlockchainTokenPtr token = BraveWalletPinService::TokenFromPrefPath(kMonkey1Path); token->is_erc721 = true; - absl::optional remove_status; + std::optional remove_status; service()->RemovePin( - std::move(token), absl::nullopt, + std::move(token), std::nullopt, base::BindLambdaForTesting( [&remove_status](bool status, mojom::PinErrorPtr error) { remove_status = status; @@ -934,9 +935,9 @@ TEST_F(BraveWalletPinServiceTest, RemovePin) { mojom::BlockchainTokenPtr token = BraveWalletPinService::TokenFromPrefPath(kMonkey1Path); token->is_erc721 = true; - absl::optional remove_status; + std::optional remove_status; service()->RemovePin( - std::move(token), absl::nullopt, + std::move(token), std::nullopt, base::BindLambdaForTesting( [&remove_status](bool status, mojom::PinErrorPtr error) { remove_status = status; @@ -982,9 +983,9 @@ TEST_F(BraveWalletPinServiceTest, ValidatePin) { std::move(callback).Run(true); })); - absl::optional validate_status; + std::optional validate_status; service()->Validate( - std::move(token), absl::nullopt, + std::move(token), std::nullopt, base::BindLambdaForTesting( [&validate_status](mojom::TokenValidationResult status) { validate_status = status; @@ -1008,12 +1009,12 @@ TEST_F(BraveWalletPinServiceTest, ValidatePin) { .WillByDefault(::testing::Invoke( [](const std::string& prefix, const std::vector& cids, ipfs::ValidatePinsCallback callback) { - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(std::nullopt); })); - absl::optional validate_status; + std::optional validate_status; service()->Validate( - std::move(token), absl::nullopt, + std::move(token), std::nullopt, base::BindLambdaForTesting( [&validate_status](mojom::TokenValidationResult status) { validate_status = status; @@ -1041,9 +1042,9 @@ TEST_F(BraveWalletPinServiceTest, ValidatePin) { std::move(callback).Run(false); })); - absl::optional validate_status; + std::optional validate_status; service()->Validate( - std::move(token), absl::nullopt, + std::move(token), std::nullopt, base::BindLambdaForTesting( [&validate_status](mojom::TokenValidationResult status) { validate_status = status; @@ -1116,7 +1117,7 @@ TEST_F(BraveWalletPinServiceTest, GetTokenStatus) { token1->is_erc721 = true; { mojom::TokenPinStatusPtr status = - service()->GetTokenStatus(absl::nullopt, token1); + service()->GetTokenStatus(std::nullopt, token1); EXPECT_EQ(mojom::TokenPinStatusCode::STATUS_PINNED, status->code); EXPECT_TRUE(status->error.is_null()); EXPECT_EQ(base::Time::FromTimeT(123u), status->validate_time); @@ -1133,7 +1134,7 @@ TEST_F(BraveWalletPinServiceTest, GetTokenStatus) { token2->is_erc721 = true; { mojom::TokenPinStatusPtr status = - service()->GetTokenStatus(absl::nullopt, token2); + service()->GetTokenStatus(std::nullopt, token2); EXPECT_EQ(mojom::TokenPinStatusCode::STATUS_PINNING_FAILED, status->code); EXPECT_EQ(mojom::WalletPinServiceErrorCode::ERR_FETCH_METADATA_FAILED, status->error->error_code); @@ -1146,7 +1147,7 @@ TEST_F(BraveWalletPinServiceTest, GetTokenStatus) { token1->is_nft = true; { mojom::TokenPinStatusPtr status = - service()->GetTokenStatus(absl::nullopt, token3); + service()->GetTokenStatus(std::nullopt, token3); EXPECT_EQ(mojom::TokenPinStatusCode::STATUS_PINNED, status->code); EXPECT_TRUE(status->error.is_null()); EXPECT_EQ(base::Time::FromTimeT(123u), status->validate_time); @@ -1176,7 +1177,7 @@ TEST_F(BraveWalletPinServiceTest, GetLastValidateTime) { token->is_erc721 = true; { base::Time last_validate_time = - service()->GetLastValidateTime(absl::nullopt, token).value(); + service()->GetLastValidateTime(std::nullopt, token).value(); EXPECT_EQ(base::Time::FromTimeT(123u), last_validate_time); } @@ -1233,7 +1234,7 @@ TEST_F(BraveWalletPinServiceTest, GetPath) { token->contract_address = "abc"; token->token_id = "0x2"; token->chain_id = "mainnet"; - auto path = BraveWalletPinService::GetTokenPrefPath(absl::nullopt, token); + auto path = BraveWalletPinService::GetTokenPrefPath(std::nullopt, token); EXPECT_EQ("nft.local.60.mainnet.abc.0x2", path.value()); } @@ -1299,7 +1300,7 @@ TEST_F(BraveWalletPinServiceTest, GetTokens) { } { - auto tokens = service()->GetTokens(absl::nullopt); + auto tokens = service()->GetTokens(std::nullopt); EXPECT_EQ(3u, tokens.size()); EXPECT_TRUE(tokens.contains(kMonkey1Path)); EXPECT_TRUE(tokens.contains(kMonkey2Path)); @@ -1340,7 +1341,7 @@ TEST_F(BraveWalletPinServiceTest, Reset) { ::testing::Invoke([](base::OnceCallback callback) { std::move(callback).Run(true); })); - absl::optional reset_result; + std::optional reset_result; service()->Reset(base::BindLambdaForTesting( [&reset_result](bool result) { reset_result = result; })); EXPECT_TRUE(reset_result.value()); @@ -1369,7 +1370,7 @@ TEST_F(BraveWalletPinServiceTest, Reset_Failed) { ::testing::Invoke([](base::OnceCallback callback) { std::move(callback).Run(false); })); - absl::optional reset_result; + std::optional reset_result; service()->Reset(base::BindLambdaForTesting( [&reset_result](bool result) { reset_result = result; })); EXPECT_FALSE(reset_result.value()); diff --git a/components/brave_wallet/browser/brave_wallet_provider_delegate.h b/components/brave_wallet/browser/brave_wallet_provider_delegate.h index ae239c0ee59..0116a745985 100644 --- a/components/brave_wallet/browser/brave_wallet_provider_delegate.h +++ b/components/brave_wallet/browser/brave_wallet_provider_delegate.h @@ -6,12 +6,12 @@ #ifndef BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_BRAVE_WALLET_PROVIDER_DELEGATE_H_ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_BRAVE_WALLET_PROVIDER_DELEGATE_H_ +#include #include #include #include "base/functional/callback.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom-forward.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/origin.h" namespace brave_wallet { @@ -20,7 +20,7 @@ class BraveWalletProviderDelegate { public: using RequestPermissionsCallback = base::OnceCallback>& allowed_accounts)>; + const std::optional>& allowed_accounts)>; BraveWalletProviderDelegate() = default; BraveWalletProviderDelegate(const BraveWalletProviderDelegate&) = delete; @@ -39,7 +39,7 @@ class BraveWalletProviderDelegate { RequestPermissionsCallback) = 0; virtual bool IsAccountAllowed(mojom::CoinType type, const std::string& account) = 0; - virtual absl::optional> GetAllowedAccounts( + virtual std::optional> GetAllowedAccounts( mojom::CoinType type, const std::vector& accounts) = 0; virtual bool IsPermissionDenied(mojom::CoinType type) = 0; diff --git a/components/brave_wallet/browser/brave_wallet_service.cc b/components/brave_wallet/browser/brave_wallet_service.cc index 7760c7197df..7ae2d50aed0 100644 --- a/components/brave_wallet/browser/brave_wallet_service.cc +++ b/components/brave_wallet/browser/brave_wallet_service.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_wallet/browser/brave_wallet_service.h" #include +#include #include #include "base/check_is_test.h" @@ -298,7 +299,7 @@ void BraveWalletService::Bind( // For EVM, convert the address to a checksum address. // For Solana, verify if address is a base58 encoded address, if so, return it. // static -absl::optional BraveWalletService::GetUserAssetAddress( +std::optional BraveWalletService::GetUserAssetAddress( const std::string& address, mojom::CoinType coin, const std::string& chain_id) { @@ -313,7 +314,7 @@ absl::optional BraveWalletService::GetUserAssetAddress( if (coin == mojom::CoinType::SOL) { std::vector bytes; if (!::brave_wallet::IsBase58EncodedSolanaPubkey(address)) { - return absl::nullopt; + return std::nullopt; } return address; } @@ -321,11 +322,11 @@ absl::optional BraveWalletService::GetUserAssetAddress( // TODO(spylogsster): Handle Filecoin here when if we need to support tokens // other than the native asset in the future. - return absl::nullopt; + return std::nullopt; } // static -absl::optional BraveWalletService::GetChecksumAddress( +std::optional BraveWalletService::GetChecksumAddress( const std::string& contract_address, const std::string& chain_id) { if (contract_address.empty()) { @@ -334,11 +335,11 @@ absl::optional BraveWalletService::GetChecksumAddress( const auto eth_addr = EthAddress::FromHex(contract_address); if (eth_addr.IsEmpty()) { - return absl::nullopt; + return std::nullopt; } uint256_t chain; if (!HexValueToUint256(chain_id, &chain)) { - return absl::nullopt; + return std::nullopt; } return eth_addr.ToChecksumAddress(chain); @@ -416,7 +417,7 @@ std::vector BraveWalletService::GetUserAssets( bool BraveWalletService::AddUserAsset(mojom::BlockchainTokenPtr token, bool visible, PrefService* profile_prefs) { - absl::optional address = GetUserAssetAddress( + std::optional address = GetUserAssetAddress( token->contract_address, token->coin, token->chain_id); if (!address) { return false; @@ -522,7 +523,7 @@ void BraveWalletService::AddUserAsset(mojom::BlockchainTokenPtr token, void BraveWalletService::OnGetEthNftStandard( mojom::BlockchainTokenPtr token, AddUserAssetCallback callback, - const absl::optional& standard, + const std::optional& standard, mojom::ProviderError error, const std::string& error_message) { if (error != mojom::ProviderError::kSuccess || !standard) { @@ -551,7 +552,7 @@ void BraveWalletService::RemoveUserAsset(mojom::BlockchainTokenPtr token, } bool BraveWalletService::RemoveUserAsset(mojom::BlockchainTokenPtr token) { - absl::optional address = GetUserAssetAddress( + std::optional address = GetUserAssetAddress( token->contract_address, token->coin, token->chain_id); if (!address) { return false; @@ -595,7 +596,7 @@ bool BraveWalletService::SetUserAssetVisible(mojom::BlockchainTokenPtr token, bool visible) { DCHECK(token); - absl::optional address = GetUserAssetAddress( + std::optional address = GetUserAssetAddress( token->contract_address, token->coin, token->chain_id); if (!address) { return false; @@ -635,7 +636,7 @@ bool BraveWalletService::SetAssetSpamStatus(mojom::BlockchainTokenPtr token, bool is_spam) { DCHECK(token); - absl::optional address = GetUserAssetAddress( + std::optional address = GetUserAssetAddress( token->contract_address, token->coin, token->chain_id); if (!address) { return false; @@ -678,7 +679,7 @@ mojom::BlockchainTokenPtr BraveWalletService::GetUserAsset( bool check_token_id, const std::string& chain_id, mojom::CoinType coin) { - absl::optional address = + std::optional address = GetUserAssetAddress(raw_address, coin, chain_id); if (!address) { return nullptr; @@ -1279,7 +1280,7 @@ bool ShouldMigrateRemovedPreloadedNetwork(PrefService* prefs, } } - return GetCurrentChainId(prefs, coin, absl::nullopt) == chain_id; + return GetCurrentChainId(prefs, coin, std::nullopt) == chain_id; } void BraveWalletService::MigrateFantomMainnetAsCustomNetwork( @@ -1496,7 +1497,7 @@ void BraveWalletService::NotifySignMessageRequestProcessed( bool approved, int id, mojom::ByteArrayStringUnionPtr signature, - const absl::optional& error) { + const std::optional& error) { if (sign_message_requests_.empty() || sign_message_requests_.front()->id != id) { VLOG(1) << "id: " << id << " is not expected, should be " @@ -1554,7 +1555,7 @@ void BraveWalletService::NotifySignTransactionRequestProcessed( bool approved, int id, mojom::ByteArrayStringUnionPtr signature, - const absl::optional& error) { + const std::optional& error) { if (sign_transaction_requests_.empty() || sign_transaction_requests_.front()->id != id) { VLOG(1) << "id: " << id << " is not expected, should be " @@ -1586,8 +1587,8 @@ void BraveWalletService::GetPendingSignAllTransactionsRequests( void BraveWalletService::NotifySignAllTransactionsRequestProcessed( bool approved, int id, - absl::optional> signatures, - const absl::optional& error) { + std::optional> signatures, + const std::optional& error) { if (sign_all_transactions_requests_.empty() || sign_all_transactions_requests_.front()->id != id) { VLOG(1) << "id: " << id << " is not expected, should be " @@ -1644,7 +1645,7 @@ void BraveWalletService::OnDiscoverAssetsCompleted( void BraveWalletService::OnGetImportInfo( const std::string& new_password, - base::OnceCallback&)> callback, + base::OnceCallback&)> callback, bool result, ImportInfo info, ImportError error) { @@ -1688,10 +1689,9 @@ void BraveWalletService::OnGetImportInfo( CHECK(is_valid_mnemonic); WalletDataFilesInstaller::GetInstance() .MaybeRegisterWalletDataFilesComponentOnDemand(base::BindOnce( - [](base::OnceCallback&)> + [](base::OnceCallback&)> callback) { - std::move(callback).Run(true /* is_valid_mnemonic */, - absl::nullopt); + std::move(callback).Run(true /* is_valid_mnemonic */, std::nullopt); }, std::move(callback))); } @@ -1776,7 +1776,7 @@ void BraveWalletService::AddSuggestTokenRequest( } if (request->token->coingecko_id.empty()) { - absl::optional coingecko_id = + std::optional coingecko_id = BlockchainRegistry::GetInstance()->GetCoingeckoId( request->token->chain_id, request->token->contract_address); if (coingecko_id) { @@ -2090,7 +2090,7 @@ void BraveWalletService::GenerateReceiveAddress( const auto& accounts = keyring_service_->GetAllAccountInfos(); for (auto& account : accounts) { if (account->account_id == account_id) { - std::move(callback).Run(account->address, absl::nullopt); + std::move(callback).Run(account->address, std::nullopt); return; } } @@ -2105,26 +2105,26 @@ void BraveWalletService::GenerateReceiveAddress( void BraveWalletService::OnGenerateBtcReceiveAddress( GenerateReceiveAddressCallback callback, mojom::BitcoinAddressPtr address, - const absl::optional& error_message) { + const std::optional& error_message) { if (address) { - std::move(callback).Run(address->address_string, absl::nullopt); + std::move(callback).Run(address->address_string, std::nullopt); return; } - std::move(callback).Run(absl::nullopt, + std::move(callback).Run(std::nullopt, error_message.value_or(WalletInternalErrorMessage())); } void BraveWalletService::OnGenerateZecReceiveAddress( GenerateReceiveAddressCallback callback, mojom::ZCashAddressPtr address, - const absl::optional& error_message) { + const std::optional& error_message) { if (address) { - std::move(callback).Run(address->address_string, absl::nullopt); + std::move(callback).Run(address->address_string, std::nullopt); return; } - std::move(callback).Run(absl::nullopt, + std::move(callback).Run(std::nullopt, error_message.value_or(WalletInternalErrorMessage())); } @@ -2132,12 +2132,12 @@ void BraveWalletService::GetSimpleHashSpamNFTs( const std::string& wallet_address, const std::vector& chain_ids, mojom::CoinType coin, - const absl::optional& cursor, + const std::optional& cursor, GetSimpleHashSpamNFTsCallback callback) { // Do not make requests to SimpleHash unless the user has // opted in to NFT discovery. if (!profile_prefs_->GetBoolean(kBraveWalletNftDiscoveryEnabled)) { - std::move(callback).Run({}, absl::nullopt); + std::move(callback).Run({}, std::nullopt); return; } simple_hash_client_->FetchNFTsFromSimpleHash( @@ -2166,7 +2166,7 @@ void BraveWalletService::CancelAllSignMessageCallbacks() { auto callback = std::move(sign_message_callbacks_.front()); sign_message_requests_.pop_front(); sign_message_callbacks_.pop_front(); - std::move(callback).Run(false, nullptr, absl::nullopt); + std::move(callback).Run(false, nullptr, std::nullopt); } } @@ -2175,7 +2175,7 @@ void BraveWalletService::CancelAllSignTransactionCallbacks() { auto callback = std::move(sign_transaction_callbacks_.front()); sign_transaction_requests_.pop_front(); sign_transaction_callbacks_.pop_front(); - std::move(callback).Run(false, nullptr, absl::nullopt); + std::move(callback).Run(false, nullptr, std::nullopt); } } @@ -2184,7 +2184,7 @@ void BraveWalletService::CancelAllSignAllTransactionsCallbacks() { auto callback = std::move(sign_all_transactions_callbacks_.front()); sign_all_transactions_requests_.pop_front(); sign_all_transactions_callbacks_.pop_front(); - std::move(callback).Run(false, absl::nullopt, absl::nullopt); + std::move(callback).Run(false, std::nullopt, std::nullopt); } } diff --git a/components/brave_wallet/browser/brave_wallet_service.h b/components/brave_wallet/browser/brave_wallet_service.h index 90b12bd7b70..52439ee39ca 100644 --- a/components/brave_wallet/browser/brave_wallet_service.h +++ b/components/brave_wallet/browser/brave_wallet_service.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_BRAVE_WALLET_SERVICE_H_ #include +#include #include #include #include @@ -28,7 +29,6 @@ #include "mojo/public/cpp/bindings/pending_remote.h" #include "mojo/public/cpp/bindings/receiver_set.h" #include "mojo/public/cpp/bindings/remote_set.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/origin.h" namespace network { @@ -56,15 +56,15 @@ class BraveWalletService : public KeyedService, using SignMessageRequestCallback = base::OnceCallback&)>; + const std::optional&)>; using SignTransactionRequestCallback = base::OnceCallback&)>; + const std::optional&)>; using SignAllTransactionsRequestCallback = base::OnceCallback>, - const absl::optional&)>; + std::optional>, + const std::optional&)>; using AddSuggestTokenCallback = base::OnceCallback; @@ -128,7 +128,7 @@ class BraveWalletService : public KeyedService, AddUserAssetCallback callback) override; void OnGetEthNftStandard(mojom::BlockchainTokenPtr token, AddUserAssetCallback callback, - const absl::optional& standard, + const std::optional& standard, mojom::ProviderError error, const std::string& error_message); void RemoveUserAsset(mojom::BlockchainTokenPtr token, @@ -199,17 +199,17 @@ class BraveWalletService : public KeyedService, bool approved, int id, mojom::ByteArrayStringUnionPtr signature, - const absl::optional& error) override; + const std::optional& error) override; void NotifySignAllTransactionsRequestProcessed( bool approved, int id, - absl::optional> signatures, - const absl::optional& error) override; + std::optional> signatures, + const std::optional& error) override; void NotifySignMessageRequestProcessed( bool approved, int id, mojom::ByteArrayStringUnionPtr signature, - const absl::optional& error) override; + const std::optional& error) override; void NotifySignMessageErrorProcessed(const std::string& error_id) override; void GetPendingAddSuggestTokenRequests( GetPendingAddSuggestTokenRequestsCallback callback) override; @@ -244,7 +244,7 @@ class BraveWalletService : public KeyedService, void GetSimpleHashSpamNFTs(const std::string& wallet_address, const std::vector& chain_ids, mojom::CoinType coin, - const absl::optional& cursor, + const std::optional& cursor, GetSimpleHashSpamNFTsCallback callback) override; void ConvertFEVMToFVMAddress( @@ -343,17 +343,17 @@ class BraveWalletService : public KeyedService, void OnGenerateBtcReceiveAddress( GenerateReceiveAddressCallback callback, mojom::BitcoinAddressPtr, - const absl::optional& error_message); + const std::optional& error_message); void OnGenerateZecReceiveAddress( GenerateReceiveAddressCallback callback, mojom::ZCashAddressPtr, - const absl::optional& error_message); + const std::optional& error_message); - static absl::optional GetChecksumAddress( + static std::optional GetChecksumAddress( const std::string& contract_address, const std::string& chain_id); - static absl::optional GetUserAssetAddress( + static std::optional GetUserAssetAddress( const std::string& address, mojom::CoinType coin, const std::string& chain_id); @@ -361,7 +361,7 @@ class BraveWalletService : public KeyedService, void OnGetImportInfo( const std::string& new_password, - base::OnceCallback&)> + base::OnceCallback&)> callback, bool result, ImportInfo info, diff --git a/components/brave_wallet/browser/brave_wallet_service_delegate.cc b/components/brave_wallet/browser/brave_wallet_service_delegate.cc index b399946f471..01796f67be8 100644 --- a/components/brave_wallet/browser/brave_wallet_service_delegate.cc +++ b/components/brave_wallet/browser/brave_wallet_service_delegate.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/brave_wallet_service_delegate.h" +#include #include #include @@ -61,9 +62,9 @@ bool BraveWalletServiceDelegate::IsPermissionDenied(mojom::CoinType coin, return false; } -absl::optional BraveWalletServiceDelegate::GetActiveOrigin() { +std::optional BraveWalletServiceDelegate::GetActiveOrigin() { NOTIMPLEMENTED(); - return absl::nullopt; + return std::nullopt; } void BraveWalletServiceDelegate::ClearWalletUIStoragePartition() {} diff --git a/components/brave_wallet/browser/brave_wallet_service_delegate.h b/components/brave_wallet/browser/brave_wallet_service_delegate.h index 42c5c4ff1b9..92f16c5abe7 100644 --- a/components/brave_wallet/browser/brave_wallet_service_delegate.h +++ b/components/brave_wallet/browser/brave_wallet_service_delegate.h @@ -7,13 +7,13 @@ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_BRAVE_WALLET_SERVICE_DELEGATE_H_ #include +#include #include #include "base/functional/callback.h" #include "base/observer_list_types.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" #include "brave/components/brave_wallet/common/brave_wallet_types.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/origin.h" namespace content { @@ -73,7 +73,7 @@ class BraveWalletServiceDelegate { const std::string& formed_website, ResetWebSitePermissionCallback callback); - virtual absl::optional GetActiveOrigin(); + virtual std::optional GetActiveOrigin(); virtual void ClearWalletUIStoragePartition(); diff --git a/components/brave_wallet/browser/brave_wallet_utils.cc b/components/brave_wallet/browser/brave_wallet_utils.cc index 34b6b94ffce..f66d404e911 100644 --- a/components/brave_wallet/browser/brave_wallet_utils.cc +++ b/components/brave_wallet/browser/brave_wallet_utils.cc @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -41,7 +42,6 @@ #include "components/prefs/scoped_user_pref_update.h" #include "crypto/random.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/boringssl/src/include/openssl/evp.h" #include "ui/base/l10n/l10n_util.h" #include "url/gurl.h" @@ -1248,90 +1248,90 @@ base::Value::Dict TransactionReceiptToValue( return dict; } -absl::optional ValueToTransactionReceipt( +std::optional ValueToTransactionReceipt( const base::Value::Dict& value) { TransactionReceipt tx_receipt; const std::string* transaction_hash = value.FindString("transaction_hash"); if (!transaction_hash) { - return absl::nullopt; + return std::nullopt; } tx_receipt.transaction_hash = *transaction_hash; const std::string* transaction_index = value.FindString("transaction_index"); if (!transaction_index) { - return absl::nullopt; + return std::nullopt; } uint256_t transaction_index_uint; if (!HexValueToUint256(*transaction_index, &transaction_index_uint)) { - return absl::nullopt; + return std::nullopt; } tx_receipt.transaction_index = transaction_index_uint; const std::string* block_hash = value.FindString("block_hash"); if (!block_hash) { - return absl::nullopt; + return std::nullopt; } tx_receipt.block_hash = *block_hash; const std::string* block_number = value.FindString("block_number"); if (!block_number) { - return absl::nullopt; + return std::nullopt; } uint256_t block_number_uint; if (!HexValueToUint256(*block_number, &block_number_uint)) { - return absl::nullopt; + return std::nullopt; } tx_receipt.block_number = block_number_uint; const std::string* from = value.FindString("from"); if (!from) { - return absl::nullopt; + return std::nullopt; } tx_receipt.from = *from; const std::string* to = value.FindString("to"); if (!to) { - return absl::nullopt; + return std::nullopt; } tx_receipt.to = *to; const std::string* cumulative_gas_used = value.FindString("cumulative_gas_used"); if (!cumulative_gas_used) { - return absl::nullopt; + return std::nullopt; } uint256_t cumulative_gas_used_uint; if (!HexValueToUint256(*cumulative_gas_used, &cumulative_gas_used_uint)) { - return absl::nullopt; + return std::nullopt; } tx_receipt.cumulative_gas_used = cumulative_gas_used_uint; const std::string* gas_used = value.FindString("gas_used"); if (!gas_used) { - return absl::nullopt; + return std::nullopt; } uint256_t gas_used_uint; if (!HexValueToUint256(*gas_used, &gas_used_uint)) { - return absl::nullopt; + return std::nullopt; } tx_receipt.gas_used = gas_used_uint; const std::string* contract_address = value.FindString("contract_address"); if (!contract_address) { - return absl::nullopt; + return std::nullopt; } tx_receipt.contract_address = *contract_address; // TODO(darkdh): logs const std::string* logs_bloom = value.FindString("logs_bloom"); if (!logs_bloom) { - return absl::nullopt; + return std::nullopt; } tx_receipt.logs_bloom = *logs_bloom; - absl::optional status = value.FindBool("status"); + std::optional status = value.FindBool("status"); if (!status) { - return absl::nullopt; + return std::nullopt; } tx_receipt.status = *status; @@ -1585,9 +1585,9 @@ std::string GetNetworkId(PrefService* prefs, return base::ToLowerASCII(id); } -absl::optional GetChainId(PrefService* prefs, - const mojom::CoinType& coin, - const std::string& network_id) { +std::optional GetChainId(PrefService* prefs, + const mojom::CoinType& coin, + const std::string& network_id) { std::vector networks = GetAllChains(prefs, coin); for (const auto& network : networks) { std::string id = GetKnownNetworkId(coin, network->chain_id); @@ -1595,22 +1595,22 @@ absl::optional GetChainId(PrefService* prefs, return network->chain_id; } } - return absl::nullopt; + return std::nullopt; } -absl::optional GetChainIdByNetworkId( +std::optional GetChainIdByNetworkId( PrefService* prefs, const mojom::CoinType& coin, const std::string& network_id) { if (network_id.empty()) { - return absl::nullopt; + return std::nullopt; } for (const auto& network : GetAllChains(prefs, coin)) { if (network_id == GetNetworkId(prefs, coin, network->chain_id)) { return network->chain_id; } } - return absl::nullopt; + return std::nullopt; } mojom::DefaultWallet GetDefaultEthereumWallet(PrefService* prefs) { @@ -1806,7 +1806,7 @@ void RemoveHiddenNetwork(PrefService* prefs, std::string GetCurrentChainId(PrefService* prefs, mojom::CoinType coin, - const absl::optional& origin) { + const std::optional& origin) { if (!origin) { return GetCurrentChainId(prefs, coin); } @@ -1827,7 +1827,7 @@ std::string GetCurrentChainId(PrefService* prefs, bool SetCurrentChainId(PrefService* prefs, mojom::CoinType coin, - const absl::optional& origin, + const std::optional& origin, const std::string& chain_id) { // We cannot switch to an unknown chain_id if (!KnownChainExists(chain_id, coin) && @@ -1872,7 +1872,7 @@ std::string GetPrefKeyForCoinType(mojom::CoinType coin) { return ""; } -absl::optional GetCoinTypeFromPrefKey(const std::string& key) { +std::optional GetCoinTypeFromPrefKey(const std::string& key) { if (key == kEthereumPrefKey) { return mojom::CoinType::ETH; } else if (key == kFilecoinPrefKey) { @@ -1885,7 +1885,7 @@ absl::optional GetCoinTypeFromPrefKey(const std::string& key) { return mojom::CoinType::ZEC; } NOTREACHED(); - return absl::nullopt; + return std::nullopt; } std::string eTLDPlusOne(const url::Origin& origin) { diff --git a/components/brave_wallet/browser/brave_wallet_utils.h b/components/brave_wallet/browser/brave_wallet_utils.h index 805db1db230..9d764891ae0 100644 --- a/components/brave_wallet/browser/brave_wallet_utils.h +++ b/components/brave_wallet/browser/brave_wallet_utils.h @@ -7,12 +7,12 @@ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_BRAVE_WALLET_UTILS_H_ #include +#include #include #include #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" #include "brave/components/brave_wallet/common/brave_wallet_types.h" -#include "third_party/abseil-cpp/absl/types/optional.h" class PrefService; namespace base { @@ -59,7 +59,7 @@ bool HasCreatedWallets(PrefService* prefs); base::Value::Dict TransactionReceiptToValue( const TransactionReceipt& tx_receipt); -absl::optional ValueToTransactionReceipt( +std::optional ValueToTransactionReceipt( const base::Value::Dict& value); std::vector GetAllKnownChains(PrefService* prefs, @@ -156,27 +156,26 @@ void RemoveHiddenNetwork(PrefService* prefs, // kBraveWalletSelectedNetworks. std::string GetCurrentChainId(PrefService* prefs, mojom::CoinType coin, - const absl::optional& origin); + const std::optional& origin); bool SetCurrentChainId(PrefService* prefs, mojom::CoinType coin, - const absl::optional& origin, + const std::optional& origin, const std::string& chain_id); std::string GetPrefKeyForCoinType(mojom::CoinType coin); // Converts string representation of CoinType to enum. -absl::optional GetCoinTypeFromPrefKey(const std::string& key); +std::optional GetCoinTypeFromPrefKey(const std::string& key); // Resolves chain_id from network_id. -absl::optional GetChainId(PrefService* prefs, - const mojom::CoinType& coin, - const std::string& network_id); +std::optional GetChainId(PrefService* prefs, + const mojom::CoinType& coin, + const std::string& network_id); // Resolves chain_id from network_id (including custom networks). -absl::optional GetChainIdByNetworkId( - PrefService* prefs, - const mojom::CoinType& coin, - const std::string& network_id); +std::optional GetChainIdByNetworkId(PrefService* prefs, + const mojom::CoinType& coin, + const std::string& network_id); // Returns a string used for web3_clientVersion in the form of // BraveWallet/v[chromium-version]. Note that we expose only the Chromium diff --git a/components/brave_wallet/browser/brave_wallet_utils_unittest.cc b/components/brave_wallet/browser/brave_wallet_utils_unittest.cc index 5e35e252dd7..94f58846026 100644 --- a/components/brave_wallet/browser/brave_wallet_utils_unittest.cc +++ b/components/brave_wallet/browser/brave_wallet_utils_unittest.cc @@ -3,9 +3,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include "brave/components/brave_wallet/browser/brave_wallet_utils.h" + #include #include #include +#include #include #include #include @@ -20,7 +23,6 @@ #include "base/values.h" #include "brave/components/brave_wallet/browser/brave_wallet_constants.h" #include "brave/components/brave_wallet/browser/brave_wallet_prefs.h" -#include "brave/components/brave_wallet/browser/brave_wallet_utils.h" #include "brave/components/brave_wallet/browser/pref_names.h" #include "brave/components/brave_wallet/browser/test_utils.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom-shared.h" @@ -35,7 +37,6 @@ #include "components/sync_preferences/testing_pref_service_syncable.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/origin.h" using testing::ElementsAreArray; @@ -481,7 +482,7 @@ TEST(BraveWalletUtilsUnitTest, TransactionReceiptAndValue) { base::Value::Dict tx_receipt_value = TransactionReceiptToValue(tx_receipt); auto tx_receipt_from_value = ValueToTransactionReceipt(tx_receipt_value); - ASSERT_NE(tx_receipt_from_value, absl::nullopt); + ASSERT_NE(tx_receipt_from_value, std::nullopt); EXPECT_EQ(tx_receipt, *tx_receipt_from_value); } @@ -1279,7 +1280,7 @@ TEST(BraveWalletUtilsUnitTest, GetAndSetCurrentChainId) { } // default value - EXPECT_EQ(GetCurrentChainId(&prefs, coin_type, absl::nullopt), + EXPECT_EQ(GetCurrentChainId(&prefs, coin_type, std::nullopt), default_chain_ids.at(coin_type)); // fallback to default @@ -1300,8 +1301,8 @@ TEST(BraveWalletUtilsUnitTest, GetAndSetCurrentChainId) { EXPECT_EQ(GetCurrentChainId(&prefs, coin_type, url::Origin::Create(GURL("https://a.com"))), default_chain_ids.at(coin_type)); - EXPECT_FALSE(SetCurrentChainId(&prefs, coin_type, absl::nullopt, "0x5566")); - EXPECT_EQ(GetCurrentChainId(&prefs, coin_type, absl::nullopt), + EXPECT_FALSE(SetCurrentChainId(&prefs, coin_type, std::nullopt, "0x5566")); + EXPECT_EQ(GetCurrentChainId(&prefs, coin_type, std::nullopt), default_chain_ids.at(coin_type)); EXPECT_TRUE(SetCurrentChainId(&prefs, coin_type, @@ -1321,13 +1322,13 @@ TEST(BraveWalletUtilsUnitTest, GetAndSetCurrentChainId) { EXPECT_FALSE(SetCurrentChainId(&prefs, coin_type, url::Origin::Create(GURL("about:blank")), mojom::kLocalhostChainId)); - EXPECT_EQ(GetCurrentChainId(&prefs, coin_type, absl::nullopt), + EXPECT_EQ(GetCurrentChainId(&prefs, coin_type, std::nullopt), default_chain_ids.at(coin_type)); // now we change the default - EXPECT_TRUE(SetCurrentChainId(&prefs, coin_type, absl::nullopt, + EXPECT_TRUE(SetCurrentChainId(&prefs, coin_type, std::nullopt, new_default_chain_ids.at(coin_type))); - EXPECT_EQ(GetCurrentChainId(&prefs, coin_type, absl::nullopt), + EXPECT_EQ(GetCurrentChainId(&prefs, coin_type, std::nullopt), new_default_chain_ids.at(coin_type)); // should not affect per origin pref EXPECT_EQ(GetCurrentChainId(&prefs, coin_type, @@ -1338,12 +1339,12 @@ TEST(BraveWalletUtilsUnitTest, GetAndSetCurrentChainId) { EXPECT_TRUE(SetCurrentChainId( &prefs, coin_type, url::Origin::Create(GURL("file:///etc/passwd")), default_chain_ids.at(coin_type))); - EXPECT_EQ(GetCurrentChainId(&prefs, coin_type, absl::nullopt), + EXPECT_EQ(GetCurrentChainId(&prefs, coin_type, std::nullopt), default_chain_ids.at(coin_type)); EXPECT_TRUE(SetCurrentChainId(&prefs, coin_type, url::Origin::Create(GURL("chrome://wallet")), new_default_chain_ids.at(coin_type))); - EXPECT_EQ(GetCurrentChainId(&prefs, coin_type, absl::nullopt), + EXPECT_EQ(GetCurrentChainId(&prefs, coin_type, std::nullopt), new_default_chain_ids.at(coin_type)); } } diff --git a/components/brave_wallet/browser/eip1559_transaction.cc b/components/brave_wallet/browser/eip1559_transaction.cc index 95a88703d5c..9541436c8e2 100644 --- a/components/brave_wallet/browser/eip1559_transaction.cc +++ b/components/brave_wallet/browser/eip1559_transaction.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_wallet/browser/eip1559_transaction.h" #include +#include #include #include "base/values.h" @@ -16,41 +17,41 @@ namespace brave_wallet { // static -absl::optional +std::optional Eip1559Transaction::GasEstimation::FromMojomGasEstimation1559( mojom::GasEstimation1559Ptr gas_estimation) { if (!gas_estimation) { - return absl::nullopt; + return std::nullopt; } GasEstimation estimation; if (!HexValueToUint256(gas_estimation->slow_max_priority_fee_per_gas, &estimation.slow_max_priority_fee_per_gas)) { - return absl::nullopt; + return std::nullopt; } if (!HexValueToUint256(gas_estimation->avg_max_priority_fee_per_gas, &estimation.avg_max_priority_fee_per_gas)) { - return absl::nullopt; + return std::nullopt; } if (!HexValueToUint256(gas_estimation->fast_max_priority_fee_per_gas, &estimation.fast_max_priority_fee_per_gas)) { - return absl::nullopt; + return std::nullopt; } if (!HexValueToUint256(gas_estimation->slow_max_fee_per_gas, &estimation.slow_max_fee_per_gas)) { - return absl::nullopt; + return std::nullopt; } if (!HexValueToUint256(gas_estimation->avg_max_fee_per_gas, &estimation.avg_max_fee_per_gas)) { - return absl::nullopt; + return std::nullopt; } if (!HexValueToUint256(gas_estimation->fast_max_fee_per_gas, &estimation.fast_max_fee_per_gas)) { - return absl::nullopt; + return std::nullopt; } if (!HexValueToUint256(gas_estimation->base_fee_per_gas, &estimation.base_fee_per_gas)) { - return absl::nullopt; + return std::nullopt; } return estimation; @@ -97,7 +98,7 @@ Eip1559Transaction::Eip1559Transaction() type_ = 2; } -Eip1559Transaction::Eip1559Transaction(absl::optional nonce, +Eip1559Transaction::Eip1559Transaction(std::optional nonce, uint256_t gas_price, uint256_t gas_limit, const EthAddress& to, @@ -129,30 +130,30 @@ bool Eip1559Transaction::operator==(const Eip1559Transaction& tx) const { } // static -absl::optional Eip1559Transaction::FromTxData( +std::optional Eip1559Transaction::FromTxData( const mojom::TxData1559Ptr& tx_data1559, bool strict) { uint256_t chain_id = 0; if (!HexValueToUint256(tx_data1559->chain_id, &chain_id) && strict) { - return absl::nullopt; + return std::nullopt; } - absl::optional tx_2930 = + std::optional tx_2930 = Eip2930Transaction::FromTxData(tx_data1559->base_data, chain_id, strict); if (!tx_2930) { - return absl::nullopt; + return std::nullopt; } uint256_t max_priority_fee_per_gas = 0; if (!HexValueToUint256(tx_data1559->max_priority_fee_per_gas, &max_priority_fee_per_gas) && strict) { - return absl::nullopt; + return std::nullopt; } uint256_t max_fee_per_gas = 0; if (!HexValueToUint256(tx_data1559->max_fee_per_gas, &max_fee_per_gas) && strict) { - return absl::nullopt; + return std::nullopt; } GasEstimation gas_estimation; @@ -170,32 +171,32 @@ absl::optional Eip1559Transaction::FromTxData( } // static -absl::optional Eip1559Transaction::FromValue( +std::optional Eip1559Transaction::FromValue( const base::Value::Dict& value) { - absl::optional tx_2930 = + std::optional tx_2930 = Eip2930Transaction::FromValue(value); if (!tx_2930) { - return absl::nullopt; + return std::nullopt; } const std::string* tx_max_priority_fee_per_gas = value.FindString("max_priority_fee_per_gas"); if (!tx_max_priority_fee_per_gas) { - return absl::nullopt; + return std::nullopt; } uint256_t max_priority_fee_per_gas; if (!HexValueToUint256(*tx_max_priority_fee_per_gas, &max_priority_fee_per_gas)) { - return absl::nullopt; + return std::nullopt; } const std::string* tx_max_fee_per_gas = value.FindString("max_fee_per_gas"); if (!tx_max_fee_per_gas) { - return absl::nullopt; + return std::nullopt; } uint256_t max_fee_per_gas; if (!HexValueToUint256(*tx_max_fee_per_gas, &max_fee_per_gas)) { - return absl::nullopt; + return std::nullopt; } GasEstimation estimation; @@ -206,7 +207,7 @@ absl::optional Eip1559Transaction::FromValue( if (!tx_slow_max_priority_fee_per_gas || !HexValueToUint256(*tx_slow_max_priority_fee_per_gas, &estimation.slow_max_priority_fee_per_gas)) { - return absl::nullopt; + return std::nullopt; } const std::string* tx_avg_max_priority_fee_per_gas = @@ -214,7 +215,7 @@ absl::optional Eip1559Transaction::FromValue( if (!tx_avg_max_priority_fee_per_gas || !HexValueToUint256(*tx_avg_max_priority_fee_per_gas, &estimation.avg_max_priority_fee_per_gas)) { - return absl::nullopt; + return std::nullopt; } const std::string* tx_fast_max_priority_fee_per_gas = @@ -222,7 +223,7 @@ absl::optional Eip1559Transaction::FromValue( if (!tx_fast_max_priority_fee_per_gas || !HexValueToUint256(*tx_fast_max_priority_fee_per_gas, &estimation.fast_max_priority_fee_per_gas)) { - return absl::nullopt; + return std::nullopt; } const std::string* tx_slow_max_fee_per_gas = @@ -230,7 +231,7 @@ absl::optional Eip1559Transaction::FromValue( if (!tx_slow_max_fee_per_gas || !HexValueToUint256(*tx_slow_max_fee_per_gas, &estimation.slow_max_fee_per_gas)) { - return absl::nullopt; + return std::nullopt; } const std::string* tx_avg_max_fee_per_gas = @@ -238,7 +239,7 @@ absl::optional Eip1559Transaction::FromValue( if (!tx_avg_max_fee_per_gas || !HexValueToUint256(*tx_avg_max_fee_per_gas, &estimation.avg_max_fee_per_gas)) { - return absl::nullopt; + return std::nullopt; } const std::string* tx_fast_max_fee_per_gas = @@ -246,7 +247,7 @@ absl::optional Eip1559Transaction::FromValue( if (!tx_fast_max_fee_per_gas || !HexValueToUint256(*tx_fast_max_fee_per_gas, &estimation.fast_max_fee_per_gas)) { - return absl::nullopt; + return std::nullopt; } const std::string* tx_base_fee_per_gas = @@ -254,7 +255,7 @@ absl::optional Eip1559Transaction::FromValue( if (!tx_base_fee_per_gas || !HexValueToUint256(*tx_base_fee_per_gas, &estimation.base_fee_per_gas)) { - return absl::nullopt; + return std::nullopt; } } diff --git a/components/brave_wallet/browser/eip1559_transaction.h b/components/brave_wallet/browser/eip1559_transaction.h index 0180f6ff79c..a58c6d3b2fd 100644 --- a/components/brave_wallet/browser/eip1559_transaction.h +++ b/components/brave_wallet/browser/eip1559_transaction.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_EIP1559_TRANSACTION_H_ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_EIP1559_TRANSACTION_H_ +#include #include #include @@ -21,7 +22,7 @@ class Eip1559Transaction : public Eip2930Transaction { GasEstimation(const GasEstimation&) = default; bool operator==(const GasEstimation&) const; - static absl::optional FromMojomGasEstimation1559( + static std::optional FromMojomGasEstimation1559( mojom::GasEstimation1559Ptr gas_estimation); static mojom::GasEstimation1559Ptr ToMojomGasEstimation1559( GasEstimation gas_estimation); @@ -40,10 +41,10 @@ class Eip1559Transaction : public Eip2930Transaction { ~Eip1559Transaction() override; bool operator==(const Eip1559Transaction&) const; - static absl::optional FromTxData( + static std::optional FromTxData( const mojom::TxData1559Ptr& tx_data, bool strict = true); - static absl::optional FromValue( + static std::optional FromValue( const base::Value::Dict& value); uint256_t max_priority_fee_per_gas() const { @@ -82,7 +83,7 @@ class Eip1559Transaction : public Eip2930Transaction { uint256_t GetUpfrontCost(uint256_t block_base_fee = 0) const override; protected: - Eip1559Transaction(absl::optional nonce, + Eip1559Transaction(std::optional nonce, uint256_t gas_price, uint256_t gas_limit, const EthAddress& to, diff --git a/components/brave_wallet/browser/eip1559_transaction_unittest.cc b/components/brave_wallet/browser/eip1559_transaction_unittest.cc index 73ba9b90160..43c10e3d57a 100644 --- a/components/brave_wallet/browser/eip1559_transaction_unittest.cc +++ b/components/brave_wallet/browser/eip1559_transaction_unittest.cc @@ -3,13 +3,15 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include "brave/components/brave_wallet/browser/eip1559_transaction.h" + #include +#include #include #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/values.h" -#include "brave/components/brave_wallet/browser/eip1559_transaction.h" #include "brave/components/brave_wallet/browser/internal/hd_key.h" #include "testing/gtest/include/gtest/gtest.h" @@ -34,7 +36,7 @@ TEST(Eip1559TransactionUnitTest, GetMessageToSign) { *Eip1559Transaction::FromTxData(mojom::TxData1559::New( mojom::TxData::New("0x00", "0x00", "0x00", "0x0101010101010101010101010101010101010101", - "0x00", data, false, absl::nullopt), + "0x00", data, false, std::nullopt), "0x04", "0x0", "0x0", nullptr)); ASSERT_EQ(tx.type(), 2); auto* access_list = tx.access_list(); @@ -135,7 +137,7 @@ TEST(Eip1559TransactionUnitTest, GetSignedTransactionAndHash) { mojom::TxData::New(entry.nonce, "0x00", entry.gas_limit, "0x000000000000000000000000000000000000aaaa", entry.value, std::vector(), false, - absl::nullopt), + std::nullopt), "0x04", entry.max_priority_fee_per_gas, entry.max_fee_per_gas, nullptr)); @@ -154,7 +156,7 @@ TEST(Eip1559TransactionUnitTest, GetUpfrontCost) { mojom::TxData::New("0x00", "0x00", "0x64", "0x0101010101010101010101010101010101010101", "0x06", std::vector(), false, - absl::nullopt), + std::nullopt), "0x04", "0x8", "0xA", nullptr)); EXPECT_EQ(tx.GetUpfrontCost(), uint256_t(806)); EXPECT_EQ(tx.GetUpfrontCost(0), uint256_t(806)); @@ -167,7 +169,7 @@ TEST(Eip1559TransactionUnitTest, Serialization) { mojom::TxData::New("0x09", "0x4a817c800", "0x5208", "0x3535353535353535353535353535353535353535", "0xde0b6b3a7640000", std::vector(), false, - absl::nullopt), + std::nullopt), "0x15BE", "0x7B", "0x1C8", GetMojomGasEstimation())); auto* access_list = tx.access_list(); @@ -181,7 +183,7 @@ TEST(Eip1559TransactionUnitTest, Serialization) { base::Value::Dict tx_value = tx.ToValue(); auto tx_from_value = Eip1559Transaction::FromValue(tx_value); - ASSERT_NE(tx_from_value, absl::nullopt); + ASSERT_NE(tx_from_value, std::nullopt); EXPECT_EQ(*tx_from_value, tx); } @@ -189,7 +191,7 @@ TEST(Eip1559TransactionUnitTest, FromTxData) { auto tx = Eip1559Transaction::FromTxData(mojom::TxData1559::New( mojom::TxData::New("0x01", "0x3E8", "0x989680", "0x3535353535353535353535353535353535353535", "0x2A", - std::vector{1}, false, absl::nullopt), + std::vector{1}, false, std::nullopt), "0x15BE", "0x7B", "0x1C8", GetMojomGasEstimation())); ASSERT_TRUE(tx); EXPECT_EQ(tx->nonce().value(), uint256_t(1)); @@ -219,7 +221,7 @@ TEST(Eip1559TransactionUnitTest, FromTxData) { tx = Eip1559Transaction::FromTxData(mojom::TxData1559::New( mojom::TxData::New("", "0x3E8", "0x989680", "0x3535353535353535353535353535353535353535", "0x2A", - std::vector{1}, false, absl::nullopt), + std::vector{1}, false, std::nullopt), "0x15BE", "0x7B", "0x1C8", nullptr)); ASSERT_TRUE(tx); EXPECT_FALSE(tx->nonce()); @@ -228,7 +230,7 @@ TEST(Eip1559TransactionUnitTest, FromTxData) { EXPECT_FALSE(Eip1559Transaction::FromTxData(mojom::TxData1559::New( mojom::TxData::New("123", "0x3E8", "0x989680", "0x3535353535353535353535353535353535353535", "0x2A", - std::vector{1}, false, absl::nullopt), + std::vector{1}, false, std::nullopt), "0x15BE", "0x7B", "0x1C8", nullptr))); // Make sure chain id, and the max priority fee fields must all have @@ -236,17 +238,17 @@ TEST(Eip1559TransactionUnitTest, FromTxData) { EXPECT_FALSE(Eip1559Transaction::FromTxData(mojom::TxData1559::New( mojom::TxData::New("0x1", "0x3E8", "0x989680", "0x3535353535353535353535353535353535353535", "0x2A", - std::vector{1}, false, absl::nullopt), + std::vector{1}, false, std::nullopt), "", "0x7B", "0x1C8", nullptr))); EXPECT_FALSE(Eip1559Transaction::FromTxData(mojom::TxData1559::New( mojom::TxData::New("0x1", "0x3E8", "0x989680", "0x3535353535353535353535353535353535353535", "0x2A", - std::vector{1}, false, absl::nullopt), + std::vector{1}, false, std::nullopt), "0x15BE", "", "0x1C8", nullptr))); EXPECT_FALSE(Eip1559Transaction::FromTxData(mojom::TxData1559::New( mojom::TxData::New("0x1", "0x3E8", "0x989680", "0x3535353535353535353535353535353535353535", "0x2A", - std::vector{1}, false, absl::nullopt), + std::vector{1}, false, std::nullopt), "0x15BE", "0x7B", "", nullptr))); // But missing data is allowed when strict is false @@ -254,11 +256,11 @@ TEST(Eip1559TransactionUnitTest, FromTxData) { mojom::TxData1559::New( mojom::TxData::New("", "0x3E8", "", "0x3535353535353535353535353535353535353535", "", - std::vector{1}, false, absl::nullopt), + std::vector{1}, false, std::nullopt), "", "0x7B", "0x1C8", nullptr), false); ASSERT_TRUE(tx); - // Empty nonce will be absl::nullopt + // Empty nonce will be std::nullopt EXPECT_FALSE(tx->nonce()); // Unspecified value defaults to 0 EXPECT_EQ(tx->gas_limit(), uint256_t(0)); @@ -278,11 +280,11 @@ TEST(Eip1559TransactionUnitTest, FromTxData) { mojom::TxData1559::New( mojom::TxData::New("", "0x3E8", "", "0x3535353535353535353535353535353535353535", "", - std::vector{1}, false, absl::nullopt), + std::vector{1}, false, std::nullopt), "0x15BE", "", "", nullptr), false); ASSERT_TRUE(tx); - // Empty nonce will be absl::nullopt + // Empty nonce will be std::nullopt EXPECT_FALSE(tx->nonce()); // Unspecified value defaults to 0 EXPECT_EQ(tx->gas_limit(), uint256_t(0)); @@ -301,7 +303,7 @@ TEST(Eip1559TransactionUnitTest, FromTxData) { tx = Eip1559Transaction::FromTxData(mojom::TxData1559::New( mojom::TxData::New("0x01", "0x3E8", "0x989680", "0x3535353535353535353535353535353535353535", "0x2A", - std::vector{1}, false, absl::nullopt), + std::vector{1}, false, std::nullopt), "0x15BE", "0x7B", "0x1C8", missing_fields_gas_estimation.Clone())); EXPECT_EQ(tx->gas_estimation(), Eip1559Transaction::GasEstimation()); @@ -310,7 +312,7 @@ TEST(Eip1559TransactionUnitTest, FromTxData) { mojom::TxData::New("0x01", "0x3E8", "0x989680", "0x3535353535353535353535353535353535353535", "0x2A", std::vector{1}, false, - absl::nullopt), + std::nullopt), "0x15BE", "0x7B", "0x1C8", missing_fields_gas_estimation.Clone()), false); EXPECT_EQ(tx->gas_estimation(), Eip1559Transaction::GasEstimation()); diff --git a/components/brave_wallet/browser/eip2930_transaction.cc b/components/brave_wallet/browser/eip2930_transaction.cc index 1c1b72d204e..e3b4e644069 100644 --- a/components/brave_wallet/browser/eip2930_transaction.cc +++ b/components/brave_wallet/browser/eip2930_transaction.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/eip2930_transaction.h" +#include #include #include "base/values.h" @@ -48,7 +49,7 @@ bool Eip2930Transaction::AccessListItem::operator!=( } Eip2930Transaction::Eip2930Transaction(const Eip2930Transaction&) = default; -Eip2930Transaction::Eip2930Transaction(absl::optional nonce, +Eip2930Transaction::Eip2930Transaction(std::optional nonce, uint256_t gas_price, uint256_t gas_limit, const EthAddress& to, @@ -71,14 +72,14 @@ bool Eip2930Transaction::operator==(const Eip2930Transaction& tx) const { } // static -absl::optional Eip2930Transaction::FromTxData( +std::optional Eip2930Transaction::FromTxData( const mojom::TxDataPtr& tx_data, uint256_t chain_id, bool strict) { - absl::optional legacy_tx = + std::optional legacy_tx = EthTransaction::FromTxData(tx_data, strict); if (!legacy_tx) { - return absl::nullopt; + return std::nullopt; } return Eip2930Transaction(legacy_tx->nonce(), legacy_tx->gas_price(), legacy_tx->gas_limit(), legacy_tx->to(), @@ -86,19 +87,19 @@ absl::optional Eip2930Transaction::FromTxData( } // static -absl::optional Eip2930Transaction::FromValue( +std::optional Eip2930Transaction::FromValue( const base::Value::Dict& value) { - absl::optional legacy_tx = EthTransaction::FromValue(value); + std::optional legacy_tx = EthTransaction::FromValue(value); if (!legacy_tx) { - return absl::nullopt; + return std::nullopt; } const std::string* tx_chain_id = value.FindString("chain_id"); if (!tx_chain_id) { - return absl::nullopt; + return std::nullopt; } uint256_t chain_id; if (!HexValueToUint256(*tx_chain_id, &chain_id)) { - return absl::nullopt; + return std::nullopt; } Eip2930Transaction tx(legacy_tx->nonce(), legacy_tx->gas_price(), @@ -110,12 +111,12 @@ absl::optional Eip2930Transaction::FromValue( const base::Value::List* access_list = value.FindList("access_list"); if (!access_list) { - return absl::nullopt; + return std::nullopt; } - absl::optional access_list_from_value = + std::optional access_list_from_value = ValueToAccessList(*access_list); if (!access_list_from_value) { - return absl::nullopt; + return std::nullopt; } tx.access_list_ = *access_list_from_value; @@ -141,7 +142,7 @@ base::Value::List Eip2930Transaction::AccessListToValue( } // static -absl::optional +std::optional Eip2930Transaction::ValueToAccessList(const base::Value::List& value) { AccessList access_list; for (const auto& item_value : value) { diff --git a/components/brave_wallet/browser/eip2930_transaction.h b/components/brave_wallet/browser/eip2930_transaction.h index 338d4f9f1e7..e02fadb5998 100644 --- a/components/brave_wallet/browser/eip2930_transaction.h +++ b/components/brave_wallet/browser/eip2930_transaction.h @@ -7,11 +7,11 @@ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_EIP2930_TRANSACTION_H_ #include +#include #include #include #include "brave/components/brave_wallet/browser/eth_transaction.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_wallet { @@ -37,14 +37,14 @@ class Eip2930Transaction : public EthTransaction { ~Eip2930Transaction() override; bool operator==(const Eip2930Transaction&) const; - static absl::optional FromTxData(const mojom::TxDataPtr&, - uint256_t chain_id, - bool strict = true); - static absl::optional FromValue( + static std::optional FromTxData(const mojom::TxDataPtr&, + uint256_t chain_id, + bool strict = true); + static std::optional FromValue( const base::Value::Dict& value); static base::Value::List AccessListToValue(const AccessList&); - static absl::optional ValueToAccessList(const base::Value::List&); + static std::optional ValueToAccessList(const base::Value::List&); uint256_t chain_id() const { return chain_id_; } const AccessList* access_list() const { return &access_list_; } @@ -74,7 +74,7 @@ class Eip2930Transaction : public EthTransaction { uint256_t GetDataFee() const override; protected: - Eip2930Transaction(absl::optional nonce, + Eip2930Transaction(std::optional nonce, uint256_t gas_price, uint256_t gas_limit, const EthAddress& to, diff --git a/components/brave_wallet/browser/eip2930_transaction_unittest.cc b/components/brave_wallet/browser/eip2930_transaction_unittest.cc index 7f110d6a1a9..a7a18700007 100644 --- a/components/brave_wallet/browser/eip2930_transaction_unittest.cc +++ b/components/brave_wallet/browser/eip2930_transaction_unittest.cc @@ -3,13 +3,15 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include "brave/components/brave_wallet/browser/eip2930_transaction.h" + #include +#include #include #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/values.h" -#include "brave/components/brave_wallet/browser/eip2930_transaction.h" #include "brave/components/brave_wallet/browser/internal/hd_key.h" #include "testing/gtest/include/gtest/gtest.h" @@ -68,7 +70,7 @@ TEST(Eip2930TransactionUnitTest, AccessListAndValue) { base::Value(Eip2930Transaction::AccessListToValue(access_list)); auto access_list_from_value = Eip2930Transaction::ValueToAccessList(access_list_value.GetList()); - ASSERT_NE(access_list_from_value, absl::nullopt); + ASSERT_NE(access_list_from_value, std::nullopt); EXPECT_EQ(*access_list_from_value, access_list); } @@ -78,7 +80,7 @@ TEST(Eip2930TransactionUnitTest, GetMessageToSign) { Eip2930Transaction tx = *Eip2930Transaction::FromTxData( mojom::TxData::New("0x00", "0x00", "0x00", "0x0101010101010101010101010101010101010101", "0x00", - data, false, absl::nullopt), + data, false, std::nullopt), 0x01); ASSERT_EQ(tx.type(), 1); auto* access_list = tx.access_list(); @@ -99,7 +101,7 @@ TEST(Eip2930TransactionUnitTest, GetSignedTransactionAndHash) { Eip2930Transaction tx = *Eip2930Transaction::FromTxData( mojom::TxData::New("0x00", "0x3b9aca00", "0x62d4", "0xdf0a88b2b68c673713a8ec826003676f272e3573", "0x01", - std::vector(), false, absl::nullopt), + std::vector(), false, std::nullopt), 0x796f6c6f763378); ASSERT_EQ(tx.type(), 1); auto* access_list = tx.access_list(); @@ -152,7 +154,7 @@ TEST(Eip2930TransactionUnitTest, Serialization) { mojom::TxData::New("0x09", "0x4a817c800", "0x5208", "0x3535353535353535353535353535353535353535", "0x0de0b6b3a7640000", std::vector(), false, - absl::nullopt), + std::nullopt), 0x15BE); auto* access_list = tx.access_list(); Eip2930Transaction::AccessListItem item_a; @@ -164,7 +166,7 @@ TEST(Eip2930TransactionUnitTest, Serialization) { base::Value::Dict tx_value = tx.ToValue(); auto tx_from_value = Eip2930Transaction::FromValue(tx_value); - ASSERT_NE(tx_from_value, absl::nullopt); + ASSERT_NE(tx_from_value, std::nullopt); EXPECT_EQ(tx_from_value, tx); } @@ -174,7 +176,7 @@ TEST(Eip2930TransactionUnitTest, GetBaseFee) { Eip2930Transaction tx = *Eip2930Transaction::FromTxData( mojom::TxData::New("0x0", "0x0", "0x0", "0x3535353535353535353535353535353535353535", "0x0", - data, false, absl::nullopt), + data, false, std::nullopt), 0x15BE); auto* access_list = tx.access_list(); @@ -192,7 +194,7 @@ TEST(Eip2930TransactionUnitTest, GetBaseFee) { Eip2930Transaction tx2 = *Eip2930Transaction::FromTxData( mojom::TxData::New("0x0", "0x0", "0x0", "", "0x0", data, false, - absl::nullopt), + std::nullopt), 0x15BE); *tx2.access_list() = *tx.access_list(); // Plus contract creation @@ -203,7 +205,7 @@ TEST(Eip2930TransactionUnitTest, GetBaseFee) { Eip2930Transaction tx3 = *Eip2930Transaction::FromTxData( mojom::TxData::New("0x0", "0x0", "0x0", "0x3535353535353535353535353535353535353535", "0x0", - std::vector(), false, absl::nullopt), + std::vector(), false, std::nullopt), 0x15BE); auto* access_list3 = tx3.access_list(); @@ -220,7 +222,7 @@ TEST(Eip2930TransactionUnitTest, FromTxData) { auto tx = Eip2930Transaction::FromTxData( mojom::TxData::New("0x01", "0x3E8", "0x989680", "0x3535353535353535353535353535353535353535", "0x2A", - std::vector{1}, false, absl::nullopt), + std::vector{1}, false, std::nullopt), 1); ASSERT_TRUE(tx); EXPECT_EQ(tx->nonce(), uint256_t(1)); @@ -236,7 +238,7 @@ TEST(Eip2930TransactionUnitTest, FromTxData) { tx = Eip2930Transaction::FromTxData( mojom::TxData::New("", "0x3E8", "0x989680", "0x3535353535353535353535353535353535353535", "0x2A", - std::vector{1}, false, absl::nullopt), + std::vector{1}, false, std::nullopt), 0); ASSERT_TRUE(tx); EXPECT_FALSE(tx->nonce()); @@ -246,14 +248,14 @@ TEST(Eip2930TransactionUnitTest, FromTxData) { EXPECT_FALSE(Eip2930Transaction::FromTxData( mojom::TxData::New("0x1", "0x3E8", "", "0x3535353535353535353535353535353535353535", "0x2A", - std::vector{1}, false, absl::nullopt), + std::vector{1}, false, std::nullopt), 0)); // But missing data is allowed when strict is false tx = Eip2930Transaction::FromTxData( mojom::TxData::New("", "0x3E8", "", "0x3535353535353535353535353535353535353535", "", - std::vector{1}, false, absl::nullopt), + std::vector{1}, false, std::nullopt), 1, false); ASSERT_TRUE(tx); // Empty nonce should be nullopt diff --git a/components/brave_wallet/browser/ens_resolver_task.cc b/components/brave_wallet/browser/ens_resolver_task.cc index 1b91191fa5b..bebb1ab34d2 100644 --- a/components/brave_wallet/browser/ens_resolver_task.cc +++ b/components/brave_wallet/browser/ens_resolver_task.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_wallet/browser/ens_resolver_task.h" #include +#include #include #include "base/containers/contains.h" @@ -33,19 +34,19 @@ namespace brave_wallet { namespace { -absl::optional> ExtractGatewayResult( +std::optional> ExtractGatewayResult( const base::Value& json_value) { if (!json_value.is_dict()) { - return absl::nullopt; + return std::nullopt; } auto* data = json_value.GetDict().FindString("data"); if (!data) { - return absl::nullopt; + return std::nullopt; } std::vector result; if (!PrefixedHexStringToBytes(*data, &result)) { - return absl::nullopt; + return std::nullopt; } return result; } @@ -133,26 +134,26 @@ OffchainLookupData& OffchainLookupData::operator=(OffchainLookupData&&) = default; OffchainLookupData::~OffchainLookupData() = default; -absl::optional OffchainLookupData::ExtractFromJson( +std::optional OffchainLookupData::ExtractFromJson( const base::Value& json_value) { if (!json_value.is_dict()) { - return absl::nullopt; + return std::nullopt; } auto* error_data = json_value.GetDict().FindStringByDottedPath("error.data"); if (!error_data) { - return absl::nullopt; + return std::nullopt; } auto bytes = PrefixedHexStringToBytes(*error_data); if (!bytes) { - return absl::nullopt; + return std::nullopt; } return ExtractFromEthAbiPayload(*bytes); } -absl::optional OffchainLookupData::ExtractFromEthAbiPayload( +std::optional OffchainLookupData::ExtractFromEthAbiPayload( eth_abi::Span bytes) { auto [selector, args] = eth_abi::ExtractFunctionSelectorAndArgsFromCall(bytes); @@ -160,7 +161,7 @@ absl::optional OffchainLookupData::ExtractFromEthAbiPayload( // error OffchainLookup(address sender, string[] urls, bytes callData, // bytes4 callbackFunction, bytes extraData) if (!base::ranges::equal(selector, kOffchainLookupSelector)) { - return absl::nullopt; + return std::nullopt; } auto sender = eth_abi::ExtractAddressFromTuple(args, 0); auto urls = eth_abi::ExtractStringArrayFromTuple(args, 1); @@ -170,7 +171,7 @@ absl::optional OffchainLookupData::ExtractFromEthAbiPayload( if (!sender.IsValid() || !urls || !call_data || !callback_function || !extra_data) { - return absl::nullopt; + return std::nullopt; } OffchainLookupData result; @@ -189,7 +190,7 @@ EnsResolverTask::EnsResolverTask( std::vector ens_call, const std::string& domain, const GURL& network_url, - absl::optional allow_offchain) + std::optional allow_offchain) : done_callback_(std::move(done_callback)), api_request_helper_(api_request_helper), api_request_helper_ens_offchain_(api_request_helper_ens_offchain), @@ -214,8 +215,8 @@ EnsResolverTask::GetWorkOnTaskForTesting() { } void EnsResolverTask::SetResultForTesting( - absl::optional task_result, - absl::optional task_error) { + std::optional task_result, + std::optional task_error) { task_result_ = std::move(task_result); task_error_ = std::move(task_error); } @@ -232,12 +233,12 @@ void EnsResolverTask::WorkOnTask() { } if (task_result_) { - std::move(done_callback_).Run(this, std::move(task_result_), absl::nullopt); + std::move(done_callback_).Run(this, std::move(task_result_), std::nullopt); // `this` is not valid here return; } if (task_error_) { - std::move(done_callback_).Run(this, absl::nullopt, std::move(task_error_)); + std::move(done_callback_).Run(this, std::nullopt, std::move(task_error_)); // `this` is not valid here. return; } @@ -588,7 +589,7 @@ void EnsResolverTask::OnFetchOffchainCallbackDone( return; } - absl::optional> decoded_resolve_result; + std::optional> decoded_resolve_result; if (supports_ensip_10_.value()) { // Decoding as returned bytes[] per // https://github.com/ensdomains/docs/blob/e4da40003943dd25fdf7d4c5552335330a9ee915/ens-improvement-proposals/ensip-10-wildcard-resolution.md?plain=1#L70 diff --git a/components/brave_wallet/browser/ens_resolver_task.h b/components/brave_wallet/browser/ens_resolver_task.h index 5223bf8e151..13b7a863973 100644 --- a/components/brave_wallet/browser/ens_resolver_task.h +++ b/components/brave_wallet/browser/ens_resolver_task.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_ENS_RESOLVER_TASK_H_ #include +#include #include #include #include @@ -18,7 +19,6 @@ #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" #include "brave/components/brave_wallet/common/eth_abi_utils.h" #include "brave/components/brave_wallet/common/eth_address.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_wallet { @@ -47,9 +47,9 @@ struct OffchainLookupData { OffchainLookupData& operator=(OffchainLookupData&&); ~OffchainLookupData(); - static absl::optional ExtractFromJson( + static std::optional ExtractFromJson( const base::Value& json_value); - static absl::optional ExtractFromEthAbiPayload( + static std::optional ExtractFromEthAbiPayload( eth_abi::Span bytes); EthAddress sender; @@ -92,8 +92,8 @@ class EnsResolverTask { using APIRequestResult = api_request_helper::APIRequestResult; using DoneCallback = base::OnceCallback result, - absl::optional error)>; + std::optional result, + std::optional error)>; using RequestIntermediateCallback = base::OnceCallback; @@ -103,18 +103,18 @@ class EnsResolverTask { std::vector ens_call, const std::string& domain, const GURL& network_url, - absl::optional allow_offchain); + std::optional allow_offchain); EnsResolverTask(const EnsResolverTask&) = delete; EnsResolverTask& operator=(const EnsResolverTask&) = delete; ~EnsResolverTask(); const std::string& domain() const { return domain_; } - const absl::optional& allow_offchain() const { return allow_offchain_; } + const std::optional& allow_offchain() const { return allow_offchain_; } static base::RepeatingCallback& GetWorkOnTaskForTesting(); - void SetResultForTesting(absl::optional task_result, - absl::optional task_error); + void SetResultForTesting(std::optional task_result, + std::optional task_error); private: template @@ -148,19 +148,19 @@ class EnsResolverTask { std::vector ens_call_; std::string domain_; std::string resolver_domain_; - absl::optional> dns_encoded_name_; + std::optional> dns_encoded_name_; GURL network_url_; - absl::optional allow_offchain_; + std::optional allow_offchain_; int offchain_lookup_attemps_left_ = 4; - absl::optional task_result_; - absl::optional task_error_; + std::optional task_result_; + std::optional task_error_; EthAddress resolver_address_; - absl::optional supports_ensip_10_; + std::optional supports_ensip_10_; - absl::optional> offchain_callback_call_; - absl::optional offchain_lookup_data_; + std::optional> offchain_callback_call_; + std::optional offchain_lookup_data_; base::WeakPtrFactory weak_ptr_factory_{this}; }; diff --git a/components/brave_wallet/browser/eth_abi_decoder.cc b/components/brave_wallet/browser/eth_abi_decoder.cc index 67789471b0e..fa009a43e58 100644 --- a/components/brave_wallet/browser/eth_abi_decoder.cc +++ b/components/brave_wallet/browser/eth_abi_decoder.cc @@ -7,6 +7,7 @@ #include #include +#include #include #include "base/strings/strcat.h" @@ -39,10 +40,10 @@ namespace brave_wallet { namespace { // GetArgFromData extracts a 32-byte wide hex string from the calldata at the // specified offset. The parsed value is NOT prefixed by "0x". -absl::optional GetArgFromData(const std::vector& input, - size_t offset) { +std::optional GetArgFromData(const std::vector& input, + size_t offset) { if (offset > input.size() || input.size() - offset < 32) { - return absl::nullopt; + return std::nullopt; } return HexEncodeLower(input.data() + offset, 32); @@ -57,11 +58,10 @@ absl::optional GetArgFromData(const std::vector& input, // https://ethereum-magicians.org/t/increasing-address-size-from-20-to-32-bytes // // The parsed address value is prefixed by "0x". -absl::optional GetAddressFromData( - const std::vector& input, - size_t offset) { +std::optional GetAddressFromData(const std::vector& input, + size_t offset) { if (offset > input.size() || input.size() - offset < 32) { - return absl::nullopt; + return std::nullopt; } return "0x" + HexEncodeLower(input.data() + offset + 12, 20); @@ -73,24 +73,24 @@ absl::optional GetAddressFromData( // Using this function to extract an integer outside the range of M is // considered an error. template -absl::optional GetUintFromData(const std::vector& input, - size_t offset) { +std::optional GetUintFromData(const std::vector& input, + size_t offset) { static_assert(std::is_integral::value, "M must be an integer type"); auto arg = GetArgFromData(input, offset); if (!arg) { - return absl::nullopt; + return std::nullopt; } uint256_t value; if (!HexValueToUint256("0x" + *arg, &value)) { - return absl::nullopt; + return std::nullopt; } // To prevent runtime errors, we make sure the value is within safe // limits of M. if (value > std::numeric_limits::max()) { - return absl::nullopt; + return std::nullopt; } return static_cast(value); @@ -99,12 +99,11 @@ absl::optional GetUintFromData(const std::vector& input, // GetUintHexFromData encodes the return value of GetUintFromData as a compact // hex string (without leading 0s), and prefixed by "0x". template -absl::optional GetUintHexFromData( - const std::vector& input, - size_t offset) { +std::optional GetUintHexFromData(const std::vector& input, + size_t offset) { auto value = GetUintFromData(input, offset); if (!value) { - return absl::nullopt; + return std::nullopt; } return Uint256ValueToHex(*value); @@ -114,11 +113,11 @@ absl::optional GetUintHexFromData( // calldata at the specified offset. // // The parsed bool value is serialized as "true" or "false" strings. -absl::optional GetBoolFromData(const std::vector& input, - size_t offset) { +std::optional GetBoolFromData(const std::vector& input, + size_t offset) { auto value = GetUintFromData(input, offset); if (!value) { - return absl::nullopt; + return std::nullopt; } if (value == static_cast(0)) { @@ -127,7 +126,7 @@ absl::optional GetBoolFromData(const std::vector& input, return "true"; } - return absl::nullopt; + return std::nullopt; } // GetBytesHexFromData extracts a bytes value from the calldata at the @@ -136,21 +135,21 @@ absl::optional GetBoolFromData(const std::vector& input, // followed by the actual content. // // The parsed bytearray is serialized as a hex string prefixed by "0x". -absl::optional GetBytesHexFromData( +std::optional GetBytesHexFromData( const std::vector& input, size_t offset) { auto pointer = GetUintFromData(input, offset); if (!pointer) { - return absl::nullopt; + return std::nullopt; } auto bytes_len = GetUintFromData(input, *pointer); if (!bytes_len) { - return absl::nullopt; + return std::nullopt; } if (input.size() < static_cast(*pointer) + 32 + *bytes_len) { - return absl::nullopt; + return std::nullopt; } return "0x" + HexEncodeLower(input.data() + *pointer + 32, *bytes_len); } @@ -161,17 +160,17 @@ absl::optional GetBytesHexFromData( // representing the number of elements in the array, followed by each element. // // The parsed data is joined together into a hex string prefixed by "0x". -absl::optional GetAddressArrayFromData( +std::optional GetAddressArrayFromData( const std::vector& input, size_t offset) { auto pointer = GetUintFromData(input, offset); if (!pointer) { - return absl::nullopt; + return std::nullopt; } auto array_len = GetUintFromData(input, *pointer); if (!array_len) { - return absl::nullopt; + return std::nullopt; } size_t array_offset = *pointer + 32; @@ -179,7 +178,7 @@ absl::optional GetAddressArrayFromData( for (size_t i = 0; i < *array_len; i++) { auto value = GetAddressFromData(input, array_offset); if (!value) { - return absl::nullopt; + return std::nullopt; } base::StrAppend(&arg, {value->substr(2)}); array_offset += 32; @@ -204,11 +203,11 @@ absl::optional GetAddressArrayFromData( // │ │ │ │ ... │ // │ 20 bytes │ 3 bytes │ 20 bytes │ │ // └──────────┴──────────┴──────────┴─────┘ -absl::optional> UniswapEncodedPathDecode( +std::optional> UniswapEncodedPathDecode( const std::string& encoded_path) { std::vector data; if (!PrefixedHexStringToBytes(encoded_path, &data)) { - return absl::nullopt; + return std::nullopt; } size_t offset = 0; std::vector path; @@ -216,7 +215,7 @@ absl::optional> UniswapEncodedPathDecode( // The path should be long enough to encode a single-hop swap. // 43 = 20(address) + 3(fee) + 20(address) if (data.size() < 43) { - return absl::nullopt; + return std::nullopt; } // Parse first hop address. @@ -230,14 +229,14 @@ absl::optional> UniswapEncodedPathDecode( // Parse the pool fee, and ignore. if (data.size() - offset < 3) { - return absl::nullopt; + return std::nullopt; } offset += 3; // Parse next hop. if (data.size() - offset < 20) { - return absl::nullopt; + return std::nullopt; } path.push_back("0x" + HexEncodeLower(data.data() + offset, 20)); offset += 20; @@ -245,14 +244,14 @@ absl::optional> UniswapEncodedPathDecode( // Require a minimum of 2 addresses for a single-hop swap. if (path.size() < 2) { - return absl::nullopt; + return std::nullopt; } return path; } -absl::optional, // params - std::vector>> // args +std::optional, // params + std::vector>> // args ABIDecode(const std::vector& types, const std::vector& data) { size_t offset = 0; @@ -261,7 +260,7 @@ ABIDecode(const std::vector& types, std::vector args; for (const auto& type : types) { - absl::optional value; + std::optional value; if (type == "address") { value = GetAddressFromData(data, offset); } else if (type == "uint8") { // Handle all unsigned integers of M bits, @@ -290,7 +289,7 @@ ABIDecode(const std::vector& types, } if (!value) { - return absl::nullopt; + return std::nullopt; } // On encountering a dynamic type, we extract the reference to the start @@ -299,7 +298,7 @@ ABIDecode(const std::vector& types, calldata_tail == 0) { auto pointer = GetUintFromData(data, offset); if (!pointer) { - return absl::nullopt; + return std::nullopt; } calldata_tail = *pointer; diff --git a/components/brave_wallet/browser/eth_abi_decoder.h b/components/brave_wallet/browser/eth_abi_decoder.h index f0176b8b8a3..86e321cb1d6 100644 --- a/components/brave_wallet/browser/eth_abi_decoder.h +++ b/components/brave_wallet/browser/eth_abi_decoder.h @@ -6,18 +6,20 @@ #ifndef BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_ETH_ABI_DECODER_H_ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_ETH_ABI_DECODER_H_ +#include #include #include #include + #include "base/values.h" namespace brave_wallet { -absl::optional> UniswapEncodedPathDecode( +std::optional> UniswapEncodedPathDecode( const std::string& encoded_path); -absl::optional, // tx_params - std::vector>> // tx_args +std::optional, // tx_params + std::vector>> // tx_args ABIDecode(const std::vector& types, const std::vector& data); diff --git a/components/brave_wallet/browser/eth_abi_decoder_unittest.cc b/components/brave_wallet/browser/eth_abi_decoder_unittest.cc index 5c81f0b98b1..4e1c1247c7b 100644 --- a/components/brave_wallet/browser/eth_abi_decoder_unittest.cc +++ b/components/brave_wallet/browser/eth_abi_decoder_unittest.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/eth_abi_decoder.h" +#include #include #include @@ -23,7 +24,7 @@ TEST(EthABIDecoderTest, ABIDecodeAddress) { "0x000000000000000000000000BFb30a082f650C2A15D0632f0e87bE4F8e64460f", &data)); auto decoded = ABIDecode({"address"}, data); - ASSERT_NE(decoded, absl::nullopt); + ASSERT_NE(decoded, std::nullopt); std::tie(tx_params, tx_args) = *decoded; ASSERT_EQ(tx_params.size(), 1UL); @@ -46,7 +47,7 @@ TEST(EthABIDecoderTest, ABIDecodeUint8) { "0x00000000000000000000000000000000000000000000000000000000000000ff", &data)); auto decoded = ABIDecode({"uint8"}, data); - ASSERT_NE(decoded, absl::nullopt); + ASSERT_NE(decoded, std::nullopt); std::tie(tx_params, tx_args) = *decoded; ASSERT_EQ(tx_params.size(), 1UL); EXPECT_EQ(tx_params[0], "uint8"); @@ -58,7 +59,7 @@ TEST(EthABIDecoderTest, ABIDecodeUint8) { "ff", &data)); decoded = ABIDecode({"uint8"}, data); - ASSERT_NE(decoded, absl::nullopt); + ASSERT_NE(decoded, std::nullopt); std::tie(tx_params, tx_args) = *decoded; ASSERT_EQ(tx_params.size(), 1UL); EXPECT_EQ(tx_params[0], "uint8"); @@ -85,7 +86,7 @@ TEST(EthABIDecoderTest, ABIDecodeUint16) { "0x0000000000000000000000000000000000000000000000000000000000000fff", &data)); auto decoded = ABIDecode({"uint16"}, data); - ASSERT_NE(decoded, absl::nullopt); + ASSERT_NE(decoded, std::nullopt); std::tie(tx_params, tx_args) = *decoded; ASSERT_EQ(tx_params.size(), 1UL); EXPECT_EQ(tx_params[0], "uint16"); @@ -97,7 +98,7 @@ TEST(EthABIDecoderTest, ABIDecodeUint16) { "ff", &data)); decoded = ABIDecode({"uint16"}, data); - ASSERT_NE(decoded, absl::nullopt); + ASSERT_NE(decoded, std::nullopt); std::tie(tx_params, tx_args) = *decoded; ASSERT_EQ(tx_params.size(), 1UL); EXPECT_EQ(tx_params[0], "uint16"); @@ -124,7 +125,7 @@ TEST(EthABIDecoderTest, ABIDecodeUint32) { "0x00000000000000000000000000000000000000000000000000000000ffffffff", &data)); auto decoded = ABIDecode({"uint32"}, data); - ASSERT_NE(decoded, absl::nullopt); + ASSERT_NE(decoded, std::nullopt); std::tie(tx_params, tx_args) = *decoded; ASSERT_EQ(tx_params.size(), 1UL); EXPECT_EQ(tx_params[0], "uint32"); @@ -136,7 +137,7 @@ TEST(EthABIDecoderTest, ABIDecodeUint32) { "ff", &data)); decoded = ABIDecode({"uint32"}, data); - ASSERT_NE(decoded, absl::nullopt); + ASSERT_NE(decoded, std::nullopt); std::tie(tx_params, tx_args) = *decoded; ASSERT_EQ(tx_params.size(), 1UL); EXPECT_EQ(tx_params[0], "uint32"); @@ -163,7 +164,7 @@ TEST(EthABIDecoderTest, ABIDecodeUint64) { "0x000000000000000000000000000000000000000000000000ffffffffffffffff", &data)); auto decoded = ABIDecode({"uint64"}, data); - ASSERT_NE(decoded, absl::nullopt); + ASSERT_NE(decoded, std::nullopt); std::tie(tx_params, tx_args) = *decoded; ASSERT_EQ(tx_params.size(), 1UL); EXPECT_EQ(tx_params[0], "uint64"); @@ -175,7 +176,7 @@ TEST(EthABIDecoderTest, ABIDecodeUint64) { "ff", &data)); decoded = ABIDecode({"uint64"}, data); - ASSERT_NE(decoded, absl::nullopt); + ASSERT_NE(decoded, std::nullopt); std::tie(tx_params, tx_args) = *decoded; ASSERT_EQ(tx_params.size(), 1UL); EXPECT_EQ(tx_params[0], "uint64"); @@ -202,7 +203,7 @@ TEST(EthABIDecoderTest, ABIDecodeUint128) { "0x00000000000000000000000000000000ffffffffffffffffffffffffffffffff", &data)); auto decoded = ABIDecode({"uint128"}, data); - ASSERT_NE(decoded, absl::nullopt); + ASSERT_NE(decoded, std::nullopt); std::tie(tx_params, tx_args) = *decoded; ASSERT_EQ(tx_params.size(), 1UL); EXPECT_EQ(tx_params[0], "uint128"); @@ -214,7 +215,7 @@ TEST(EthABIDecoderTest, ABIDecodeUint128) { "ff", &data)); decoded = ABIDecode({"uint128"}, data); - ASSERT_NE(decoded, absl::nullopt); + ASSERT_NE(decoded, std::nullopt); std::tie(tx_params, tx_args) = *decoded; ASSERT_EQ(tx_params.size(), 1UL); EXPECT_EQ(tx_params[0], "uint128"); @@ -241,7 +242,7 @@ TEST(EthABIDecoderTest, ABIDecodeUint256) { "0x00000000000000000000000000000000000000000000000000000000000000ff", &data)); auto decoded = ABIDecode({"uint256"}, data); - ASSERT_NE(decoded, absl::nullopt); + ASSERT_NE(decoded, std::nullopt); std::tie(tx_params, tx_args) = *decoded; ASSERT_EQ(tx_params.size(), 1UL); EXPECT_EQ(tx_params[0], "uint256"); @@ -257,7 +258,7 @@ TEST(EthABIDecoderTest, ABIDecodeUint256) { "ff", &data)); decoded = ABIDecode({"uint256"}, data); - ASSERT_NE(decoded, absl::nullopt); + ASSERT_NE(decoded, std::nullopt); std::tie(tx_params, tx_args) = *decoded; ASSERT_EQ(tx_params.size(), 1UL); EXPECT_EQ(tx_params[0], "uint256"); @@ -274,7 +275,7 @@ TEST(EthABIDecoderTest, ABIDecodeBool) { "0x0000000000000000000000000000000000000000000000000000000000000000", &data)); auto decoded = ABIDecode({"bool"}, data); - ASSERT_NE(decoded, absl::nullopt); + ASSERT_NE(decoded, std::nullopt); std::tie(tx_params, tx_args) = *decoded; ASSERT_EQ(tx_params.size(), 1UL); EXPECT_EQ(tx_params[0], "bool"); @@ -285,7 +286,7 @@ TEST(EthABIDecoderTest, ABIDecodeBool) { "0x0000000000000000000000000000000000000000000000000000000000000001", &data)); decoded = ABIDecode({"bool"}, data); - ASSERT_NE(decoded, absl::nullopt); + ASSERT_NE(decoded, std::nullopt); std::tie(tx_params, tx_args) = *decoded; ASSERT_EQ(tx_params.size(), 1UL); EXPECT_EQ(tx_params[0], "bool"); @@ -301,7 +302,7 @@ TEST(EthABIDecoderTest, ABIDecodeBool) { "00", &data)); decoded = ABIDecode({"bool"}, data); - ASSERT_NE(decoded, absl::nullopt); + ASSERT_NE(decoded, std::nullopt); std::tie(tx_params, tx_args) = *decoded; ASSERT_EQ(tx_params.size(), 1UL); EXPECT_EQ(tx_params[0], "bool"); @@ -320,7 +321,7 @@ TEST(EthABIDecoderTest, ABIDecodeAddressArray) { "0000000000000000000000000000000000000000000000000000000000000fff", &data)); auto decoded = ABIDecode({"address[]"}, data); - ASSERT_NE(decoded, absl::nullopt); + ASSERT_NE(decoded, std::nullopt); std::tie(tx_params, tx_args) = *decoded; ASSERT_EQ(tx_params.size(), 1UL); @@ -335,7 +336,7 @@ TEST(EthABIDecoderTest, ABIDecodeAddressArray) { "0000000000000000000000000000000000000000000000000000000000000000", &data)); decoded = ABIDecode({"address[]"}, data); - ASSERT_NE(decoded, absl::nullopt); + ASSERT_NE(decoded, std::nullopt); std::tie(tx_params, tx_args) = *decoded; ASSERT_EQ(tx_params.size(), 1UL); @@ -351,7 +352,7 @@ TEST(EthABIDecoderTest, ABIDecodeAddressArray) { "ffff", &data)); decoded = ABIDecode({"address[]"}, data); - ASSERT_NE(decoded, absl::nullopt); + ASSERT_NE(decoded, std::nullopt); std::tie(tx_params, tx_args) = *decoded; ASSERT_EQ(tx_params.size(), 1UL); @@ -408,7 +409,7 @@ TEST(EthABIDecoderTest, ABIDecodeBytes) { "ffff", &data)); auto decoded = ABIDecode({"bytes"}, data); - ASSERT_NE(decoded, absl::nullopt); + ASSERT_NE(decoded, std::nullopt); std::tie(tx_params, tx_args) = *decoded; ASSERT_EQ(tx_params.size(), 1UL); @@ -423,7 +424,7 @@ TEST(EthABIDecoderTest, ABIDecodeBytes) { "ffffff", // extraneous tail data, &data)); decoded = ABIDecode({"bytes"}, data); - ASSERT_NE(decoded, absl::nullopt); + ASSERT_NE(decoded, std::nullopt); std::tie(tx_params, tx_args) = *decoded; ASSERT_EQ(tx_params.size(), 1UL); @@ -436,7 +437,7 @@ TEST(EthABIDecoderTest, ABIDecodeBytes) { "0000000000000000000000000000000000000000000000000000000000000000", &data)); decoded = ABIDecode({"bytes"}, data); - ASSERT_NE(decoded, absl::nullopt); + ASSERT_NE(decoded, std::nullopt); std::tie(tx_params, tx_args) = *decoded; ASSERT_EQ(tx_params.size(), 1UL); @@ -481,7 +482,7 @@ TEST(EthABIDecoderTest, ABIDecodeUnknownType) { "0x00000000000000000000000000000000000000000000000000000000000000ff", &data)); auto decoded = ABIDecode({"supertype"}, data); - ASSERT_NE(decoded, absl::nullopt); + ASSERT_NE(decoded, std::nullopt); std::tie(tx_params, tx_args) = *decoded; ASSERT_EQ(tx_params.size(), 1UL); @@ -492,12 +493,12 @@ TEST(EthABIDecoderTest, ABIDecodeUnknownType) { TEST(EthABIDecoderTest, UniswapEncodedPathDecodeValid) { // Single-hop swap: WETH → STG - absl::optional> path; + std::optional> path; path = UniswapEncodedPathDecode( "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2" // WETH "002710" // POOL FEE (10000) "af5191b0de278c7286d6c7cc6ab6bb8a73ba2cd6"); // STG - ASSERT_NE(path, absl::nullopt); + ASSERT_NE(path, std::nullopt); ASSERT_EQ(path->size(), 2UL); ASSERT_EQ(path->at(0), "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2"); ASSERT_EQ(path->at(1), "0xaf5191b0de278c7286d6c7cc6ab6bb8a73ba2cd6"); @@ -509,7 +510,7 @@ TEST(EthABIDecoderTest, UniswapEncodedPathDecodeValid) { "a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48" // USDC "0001f4" // POOL FEE (500) "c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2"); // WETH - ASSERT_NE(path, absl::nullopt); + ASSERT_NE(path, std::nullopt); ASSERT_EQ(path->size(), 3UL); ASSERT_EQ(path->at(0), "0xc98d64da73a6616c42117b582e832812e7b8d57f"); ASSERT_EQ(path->at(1), "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48"); diff --git a/components/brave_wallet/browser/eth_data_builder.cc b/components/brave_wallet/browser/eth_data_builder.cc index 34c00fe2165..13cf1478e89 100644 --- a/components/brave_wallet/browser/eth_data_builder.cc +++ b/components/brave_wallet/browser/eth_data_builder.cc @@ -7,6 +7,7 @@ #include #include +#include #include "base/check.h" #include "base/logging.h" @@ -31,8 +32,8 @@ bool IsValidHostLabelCharacter(char c, bool is_first_char) { (c >= '0' && c <= '9') || (!is_first_char && c == '-') || c == '_'; } -absl::optional ChainIdToVersion(const std::string& symbol, - const std::string chain_id) { +std::optional ChainIdToVersion(const std::string& symbol, + const std::string chain_id) { static base::NoDestructor> mapping({ {"0x1", "ERC20"}, {"0x38", "BEP20"}, @@ -55,7 +56,7 @@ absl::optional ChainIdToVersion(const std::string& symbol, if (it != mapping->end()) { return it->second; } - return absl::nullopt; + return std::nullopt; } } // namespace @@ -64,9 +65,9 @@ namespace filforwarder { constexpr uint8_t kFilForwarderSelector[] = {0xd9, 0x48, 0xd4, 0x68}; -absl::optional> Forward(const FilAddress& fil_address) { +std::optional> Forward(const FilAddress& fil_address) { if (fil_address.IsEmpty()) { - return absl::nullopt; + return std::nullopt; } return eth_abi::TupleEncoder() @@ -309,28 +310,28 @@ std::vector SupportsInterface(eth_abi::Span4 interface) { namespace unstoppable_domains { -absl::optional GetMany(const std::vector& keys, - const std::string& domain) { +std::optional GetMany(const std::vector& keys, + const std::string& domain) { const std::string function_hash = GetFunctionHash("getMany(string[],uint256)"); std::string offset_for_array; if (!PadHexEncodedParameter(Uint256ValueToHex(64), &offset_for_array)) { - return absl::nullopt; + return std::nullopt; } std::string tokenID = ToHex(Namehash(domain)); std::string encoded_keys; if (!EncodeStringArray(keys, &encoded_keys)) { - return absl::nullopt; + return std::nullopt; } std::string data; std::vector hex_strings = {function_hash, offset_for_array, tokenID, encoded_keys}; if (!ConcatHexStrings(hex_strings, &data)) { - return absl::nullopt; + return std::nullopt; } return data; @@ -429,7 +430,7 @@ std::string Resolver(const std::string& domain) { // https://docs.ens.domains/ens-improvement-proposals/ensip-10-wildcard-resolution#specification // Similar to chromium's `DNSDomainFromDot` but without length limitation and // support of terminal dot. -absl::optional> DnsEncode(const std::string& dotted_name) { +std::optional> DnsEncode(const std::string& dotted_name) { std::vector result; result.resize(dotted_name.size() + 2); result.front() = '.'; // Placeholder for first label length. @@ -441,12 +442,12 @@ absl::optional> DnsEncode(const std::string& dotted_name) { if (result[i] == '.') { size_t label_len = i - last_dot_pos - 1; if (label_len == 0 || label_len > 63) { - return absl::nullopt; + return std::nullopt; } result[last_dot_pos] = static_cast(label_len); last_dot_pos = i; } else if (!IsValidHostLabelCharacter(result[i], i - last_dot_pos == 1)) { - return absl::nullopt; + return std::nullopt; } } DCHECK_EQ(last_dot_pos, result.size() - 1); @@ -458,28 +459,28 @@ absl::optional> DnsEncode(const std::string& dotted_name) { namespace balance_scanner { -absl::optional TokensBalance( +std::optional TokensBalance( const std::string& owner_address, const std::vector& contract_addresses) { const std::string function_hash = GetFunctionHash("tokensBalance(address,address[])"); std::string padded_address; if (!brave_wallet::PadHexEncodedParameter(owner_address, &padded_address)) { - return absl::nullopt; + return std::nullopt; } // Indicate the next value that encodes the length of the address[] is 64 // bytes std::string offset_for_array; if (!PadHexEncodedParameter(Uint256ValueToHex(64), &offset_for_array)) { - return absl::nullopt; + return std::nullopt; } // Encode the length of the address[] as 64 bytes std::string array_length; if (!PadHexEncodedParameter(Uint256ValueToHex(contract_addresses.size()), &array_length)) { - return absl::nullopt; + return std::nullopt; } std::string data; @@ -492,13 +493,13 @@ absl::optional TokensBalance( std::string padded_contract_address; if (!brave_wallet::PadHexEncodedParameter(contract_address, &padded_contract_address)) { - return absl::nullopt; + return std::nullopt; } hex_strings.push_back(padded_contract_address); } if (!ConcatHexStrings(hex_strings, &data)) { - return absl::nullopt; + return std::nullopt; } return data; diff --git a/components/brave_wallet/browser/eth_data_builder.h b/components/brave_wallet/browser/eth_data_builder.h index 3c2389d09cf..bf40ed404b0 100644 --- a/components/brave_wallet/browser/eth_data_builder.h +++ b/components/brave_wallet/browser/eth_data_builder.h @@ -6,14 +6,15 @@ #ifndef BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_ETH_DATA_BUILDER_H_ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_ETH_DATA_BUILDER_H_ +#include #include #include + #include "base/values.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" #include "brave/components/brave_wallet/common/brave_wallet_types.h" #include "brave/components/brave_wallet/common/eth_abi_utils.h" #include "brave/components/brave_wallet/common/fil_address.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_wallet { @@ -21,7 +22,7 @@ namespace filforwarder { // Allows to forward funds from FEVM account fo FVM account // https://github.com/lotus-web3/FilForwarder/blob/main/contracts/FilForwarder.sol -absl::optional> Forward(const FilAddress& fil_address); +std::optional> Forward(const FilAddress& fil_address); } // namespace filforwarder @@ -95,8 +96,8 @@ namespace unstoppable_domains { inline constexpr uint8_t kGetManySelector[] = {0x1b, 0xd8, 0xcc, 0x1a}; // Get mutiple record values mapped with keys of the target domain. -absl::optional GetMany(const std::vector& keys, - const std::string& domain); +std::optional GetMany(const std::vector& keys, + const std::string& domain); std::vector MakeEthLookupKeyList(const std::string& symbol, const std::string& chain_id); @@ -114,13 +115,13 @@ namespace ens { std::string Resolver(const std::string& domain); -absl::optional> DnsEncode(const std::string& dotted_name); +std::optional> DnsEncode(const std::string& dotted_name); } // namespace ens namespace balance_scanner { -absl::optional TokensBalance( +std::optional TokensBalance( const std::string& owner_address, const std::vector& contract_addresses); diff --git a/components/brave_wallet/browser/eth_data_builder_unittest.cc b/components/brave_wallet/browser/eth_data_builder_unittest.cc index 8862b43e423..afa50144f39 100644 --- a/components/brave_wallet/browser/eth_data_builder_unittest.cc +++ b/components/brave_wallet/browser/eth_data_builder_unittest.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_wallet/browser/eth_data_builder.h" +#include + #include "base/ranges/algorithm.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" #include "brave/components/brave_wallet/common/eth_abi_utils.h" @@ -519,7 +521,7 @@ TEST(EthCallDataBuilderTest, TokensBalance) { TokensBalance("0x08A8fDBddc160A7d5b957256b903dCAb1aE512C5", {"invalid"})); // Single token contract address supplied - absl::optional data; + std::optional data; data = TokensBalance("0xB4B2802129071b2B9eBb8cBB01EA1E4D14B34961", {"0x0D8775F648430679A709E98d2b0Cb6250d2887EF"}); ASSERT_TRUE(data); diff --git a/components/brave_wallet/browser/eth_data_parser.cc b/components/brave_wallet/browser/eth_data_parser.cc index 83bbe3b2e9e..84fa8da0d95 100644 --- a/components/brave_wallet/browser/eth_data_parser.cc +++ b/components/brave_wallet/browser/eth_data_parser.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_wallet/browser/eth_data_parser.h" #include +#include #include #include "base/strings/strcat.h" @@ -41,9 +42,9 @@ constexpr char kCowOrderSellEthSelector[] = "0x322bba21"; } // namespace -absl::optional, // tx_params - std::vector>> // tx_args +std::optional, // tx_params + std::vector>> // tx_args GetTransactionInfoFromData(const std::vector& data) { if (data.empty() || data == std::vector{0x0}) { return std::make_tuple(mojom::TransactionType::ETHSend, @@ -62,11 +63,11 @@ GetTransactionInfoFromData(const std::vector& data) { if (selector == kFilForwarderTransferSelector) { auto decoded = ABIDecode({"bytes"}, calldata); if (!decoded) { - return absl::nullopt; + return std::nullopt; } const auto& tx_args = std::get<1>(*decoded); if (tx_args.empty()) { - return absl::nullopt; + return std::nullopt; } return std::make_tuple(mojom::TransactionType::ETHFilForwarderTransfer, std::vector{"bytes"}, // recipient @@ -75,7 +76,7 @@ GetTransactionInfoFromData(const std::vector& data) { } else if (selector == kERC20TransferSelector) { auto decoded = ABIDecode({"address", "uint256"}, calldata); if (!decoded) { - return absl::nullopt; + return std::nullopt; } return std::tuple_cat( @@ -83,7 +84,7 @@ GetTransactionInfoFromData(const std::vector& data) { } else if (selector == kERC20ApproveSelector) { auto decoded = ABIDecode({"address", "uint256"}, calldata); if (!decoded) { - return absl::nullopt; + return std::nullopt; } return std::tuple_cat(std::make_tuple(mojom::TransactionType::ERC20Approve), @@ -91,7 +92,7 @@ GetTransactionInfoFromData(const std::vector& data) { } else if (selector == kERC721TransferFromSelector) { auto decoded = ABIDecode({"address", "address", "uint256"}, calldata); if (!decoded) { - return absl::nullopt; + return std::nullopt; } return std::tuple_cat( @@ -99,7 +100,7 @@ GetTransactionInfoFromData(const std::vector& data) { } else if (selector == kERC721SafeTransferFromSelector) { auto decoded = ABIDecode({"address", "address", "uint256"}, calldata); if (!decoded) { - return absl::nullopt; + return std::nullopt; } return std::tuple_cat( @@ -116,13 +117,13 @@ GetTransactionInfoFromData(const std::vector& data) { auto decoded_calldata = ABIDecode({"bytes", "uint256", "address"}, calldata); if (!decoded_calldata) { - return absl::nullopt; + return std::nullopt; } const auto& tx_args = std::get<1>(*decoded_calldata); auto decoded_path = UniswapEncodedPathDecode(tx_args.at(0)); if (!decoded_path) { - return absl::nullopt; + return std::nullopt; } std::string fill_path = "0x"; @@ -161,13 +162,13 @@ GetTransactionInfoFromData(const std::vector& data) { auto decoded_calldata = ABIDecode({"bytes", "uint256", "uint256", "address"}, calldata); if (!decoded_calldata) { - return absl::nullopt; + return std::nullopt; } const auto& tx_args = std::get<1>(*decoded_calldata); auto decoded_path = UniswapEncodedPathDecode(tx_args.at(0)); if (!decoded_path) { - return absl::nullopt; + return std::nullopt; } std::string fill_path = "0x"; for (const auto& path : *decoded_path) { @@ -192,7 +193,7 @@ GetTransactionInfoFromData(const std::vector& data) { auto decoded_calldata = ABIDecode({"address[]", "uint256", "uint256", "bool"}, calldata); if (!decoded_calldata) { - return absl::nullopt; + return std::nullopt; } const auto& tx_args = std::get<1>(*decoded_calldata); @@ -216,7 +217,7 @@ GetTransactionInfoFromData(const std::vector& data) { {"address", "address", "uint256", "uint256", "(uint32,bytes)[]"}, calldata); if (!decoded_calldata) { - return absl::nullopt; + return std::nullopt; } const auto& tx_args = std::get<1>(*decoded_calldata); @@ -307,7 +308,7 @@ GetTransactionInfoFromData(const std::vector& data) { }, calldata); if (!decoded_calldata) { - return absl::nullopt; + return std::nullopt; } const auto& raw_args = std::get<1>(*decoded_calldata); @@ -379,7 +380,7 @@ GetTransactionInfoFromData(const std::vector& data) { }, calldata); if (!decoded_calldata) { - return absl::nullopt; + return std::nullopt; } const auto& tx_args = std::get<1>(*decoded_calldata); @@ -395,7 +396,7 @@ GetTransactionInfoFromData(const std::vector& data) { auto decoded = ABIDecode( {"address", "address", "uint256", "uint256", "bytes"}, calldata); if (!decoded) { - return absl::nullopt; + return std::nullopt; } return std::tuple_cat( diff --git a/components/brave_wallet/browser/eth_data_parser.h b/components/brave_wallet/browser/eth_data_parser.h index 15b03da0289..cdceae68dcd 100644 --- a/components/brave_wallet/browser/eth_data_parser.h +++ b/components/brave_wallet/browser/eth_data_parser.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_ETH_DATA_PARSER_H_ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_ETH_DATA_PARSER_H_ +#include #include #include #include @@ -14,9 +15,9 @@ namespace brave_wallet { -absl::optional, // tx_params - std::vector>> // tx_args +std::optional, // tx_params + std::vector>> // tx_args GetTransactionInfoFromData(const std::vector& data); } // namespace brave_wallet diff --git a/components/brave_wallet/browser/eth_data_parser_unittest.cc b/components/brave_wallet/browser/eth_data_parser_unittest.cc index cb175fda525..0f533a1bb19 100644 --- a/components/brave_wallet/browser/eth_data_parser_unittest.cc +++ b/components/brave_wallet/browser/eth_data_parser_unittest.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/eth_data_parser.h" +#include #include #include @@ -24,7 +25,7 @@ void TestGetTransactionInfoFromData(const std::vector& data, std::vector tx_args; auto result = GetTransactionInfoFromData(data); - ASSERT_NE(result, absl::nullopt); + ASSERT_NE(result, std::nullopt); std::tie(tx_type, tx_params, tx_args) = *result; ASSERT_EQ(tx_type, expected_tx_type); ASSERT_EQ(tx_params.size(), expected_tx_params.size()); @@ -53,7 +54,7 @@ TEST(EthDataParser, GetTransactionInfoFromDataTransfer) { "0000000000000000000000000000000000000000000000003fffffffffffffff", &data)); auto tx_info = GetTransactionInfoFromData(data); - ASSERT_NE(tx_info, absl::nullopt); + ASSERT_NE(tx_info, std::nullopt); std::tie(tx_type, tx_params, tx_args) = *tx_info; ASSERT_EQ(tx_type, mojom::TransactionType::ERC20Transfer); ASSERT_EQ(tx_params.size(), 2UL); @@ -90,7 +91,7 @@ TEST(EthDataParser, GetTransactionInfoFromDataTransfer) { "00", &data)); tx_info = GetTransactionInfoFromData(data); - ASSERT_NE(tx_info, absl::nullopt); + ASSERT_NE(tx_info, std::nullopt); std::tie(tx_type, tx_params, tx_args) = *tx_info; ASSERT_EQ(tx_type, mojom::TransactionType::ERC20Transfer); ASSERT_EQ(tx_params.size(), 2UL); @@ -114,7 +115,7 @@ TEST(EthDataParser, GetTransactionInfoFromDataApprove) { "0000000000000000000000000000000000000000000000003fffffffffffffff", &data)); auto tx_info = GetTransactionInfoFromData(data); - ASSERT_NE(tx_info, absl::nullopt); + ASSERT_NE(tx_info, std::nullopt); std::tie(tx_type, tx_params, tx_args) = *tx_info; ASSERT_EQ(tx_type, mojom::TransactionType::ERC20Approve); ASSERT_EQ(tx_params.size(), 2UL); @@ -131,7 +132,7 @@ TEST(EthDataParser, GetTransactionInfoFromDataApprove) { "0000000000000000000000000000000000000000000000003fffffffffffffff", &data)); tx_info = GetTransactionInfoFromData(data); - ASSERT_NE(tx_info, absl::nullopt); + ASSERT_NE(tx_info, std::nullopt); std::tie(tx_type, tx_params, tx_args) = *tx_info; ASSERT_EQ(tx_type, mojom::TransactionType::ERC20Approve); ASSERT_EQ(tx_params.size(), 2UL); @@ -168,7 +169,7 @@ TEST(EthDataParser, GetTransactionInfoFromDataApprove) { "00", &data)); tx_info = GetTransactionInfoFromData(data); - ASSERT_NE(tx_info, absl::nullopt); + ASSERT_NE(tx_info, std::nullopt); std::tie(tx_type, tx_params, tx_args) = *tx_info; ASSERT_EQ(tx_type, mojom::TransactionType::ERC20Approve); ASSERT_EQ(tx_params.size(), 2UL); @@ -187,7 +188,7 @@ TEST(EthDataParser, GetTransactionInfoFromDataETHSend) { std::vector data; ASSERT_TRUE(PrefixedHexStringToBytes("0x0", &data)); auto tx_info = GetTransactionInfoFromData(data); - ASSERT_NE(tx_info, absl::nullopt); + ASSERT_NE(tx_info, std::nullopt); std::tie(tx_type, tx_params, tx_args) = *tx_info; EXPECT_EQ(tx_type, mojom::TransactionType::ETHSend); @@ -195,7 +196,7 @@ TEST(EthDataParser, GetTransactionInfoFromDataETHSend) { ASSERT_EQ(tx_args.size(), 0UL); tx_info = GetTransactionInfoFromData({}); - ASSERT_NE(tx_info, absl::nullopt); + ASSERT_NE(tx_info, std::nullopt); std::tie(tx_type, tx_params, tx_args) = *tx_info; EXPECT_EQ(tx_type, mojom::TransactionType::ETHSend); ASSERT_EQ(tx_params.size(), 0UL); @@ -216,7 +217,7 @@ TEST(EthDataParser, GetTransactionInfoFromDataERC721TransferFrom) { "000000000000000000000000000000000000000000000000000000000000000f", &data)); auto tx_info = GetTransactionInfoFromData(data); - ASSERT_NE(tx_info, absl::nullopt); + ASSERT_NE(tx_info, std::nullopt); std::tie(tx_type, tx_params, tx_args) = *tx_info; ASSERT_EQ(tx_type, mojom::TransactionType::ERC721TransferFrom); ASSERT_EQ(tx_params.size(), 3UL); @@ -236,7 +237,7 @@ TEST(EthDataParser, GetTransactionInfoFromDataERC721TransferFrom) { "000000000000000000000000000000000000000000000000000000000000000f", &data)); tx_info = GetTransactionInfoFromData(data); - ASSERT_NE(tx_info, absl::nullopt); + ASSERT_NE(tx_info, std::nullopt); std::tie(tx_type, tx_params, tx_args) = *tx_info; ASSERT_EQ(tx_type, mojom::TransactionType::ERC721SafeTransferFrom); ASSERT_EQ(tx_params.size(), 3UL); @@ -278,7 +279,7 @@ TEST(EthDataParser, GetTransactionInfoFromDataERC721TransferFrom) { "00", &data)); tx_info = GetTransactionInfoFromData(data); - ASSERT_NE(tx_info, absl::nullopt); + ASSERT_NE(tx_info, std::nullopt); std::tie(tx_type, tx_params, tx_args) = *tx_info; ASSERT_EQ(tx_type, mojom::TransactionType::ERC721TransferFrom); ASSERT_EQ(tx_params.size(), 3UL); @@ -418,7 +419,7 @@ TEST(EthDataParser, GetTransactionInfoFromDataOther) { // No function hash auto tx_info = GetTransactionInfoFromData(std::vector{0x1}); - ASSERT_NE(tx_info, absl::nullopt); + ASSERT_NE(tx_info, std::nullopt); std::tie(tx_type, tx_params, tx_args) = *tx_info; EXPECT_EQ(tx_type, mojom::TransactionType::Other); @@ -427,7 +428,7 @@ TEST(EthDataParser, GetTransactionInfoFromDataOther) { "000000000000000000000000BFb30a082f650C2A15D0632f0e87bE4F8e64460f", &data)); tx_info = GetTransactionInfoFromData(data); - ASSERT_NE(tx_info, absl::nullopt); + ASSERT_NE(tx_info, std::nullopt); std::tie(tx_type, tx_params, tx_args) = *tx_info; EXPECT_EQ(tx_type, mojom::TransactionType::Other); } @@ -463,7 +464,7 @@ TEST(EthDataParser, GetTransactionInfoFromDataSellEthForTokenToUniswapV3) { "623f4f93", &data)); auto tx_info = GetTransactionInfoFromData(data); - ASSERT_NE(tx_info, absl::nullopt); + ASSERT_NE(tx_info, std::nullopt); std::tie(tx_type, tx_params, tx_args) = *tx_info; EXPECT_EQ(tx_type, mojom::TransactionType::ETHSwap); @@ -516,7 +517,7 @@ TEST(EthDataParser, GetTransactionInfoFromDataSellTokenForEthToUniswapV3) { "eafe", &data)); auto tx_info = GetTransactionInfoFromData(data); - ASSERT_NE(tx_info, absl::nullopt); + ASSERT_NE(tx_info, std::nullopt); std::tie(tx_type, tx_params, tx_args) = *tx_info; EXPECT_EQ(tx_type, mojom::TransactionType::ETHSwap); @@ -570,7 +571,7 @@ TEST(EthDataParser, GetTransactionInfoFromDataSellTokenForTokenToUniswapV3) { "0000000000000000000000000000000000495d35e8bf6247f2f1", &data)); auto tx_info = GetTransactionInfoFromData(data); - ASSERT_NE(tx_info, absl::nullopt); + ASSERT_NE(tx_info, std::nullopt); std::tie(tx_type, tx_params, tx_args) = *tx_info; EXPECT_EQ(tx_type, mojom::TransactionType::ETHSwap); @@ -623,7 +624,7 @@ TEST(EthDataParser, GetTransactionInfoFromDataSellToUniswap) { "4a716a", &data)); auto tx_info = GetTransactionInfoFromData(data); - ASSERT_NE(tx_info, absl::nullopt); + ASSERT_NE(tx_info, std::nullopt); std::tie(tx_type, tx_params, tx_args) = *tx_info; EXPECT_EQ(tx_type, mojom::TransactionType::ETHSwap); @@ -671,7 +672,7 @@ TEST(EthDataParser, GetTransactionInfoFromDataTransformERC20) { "0000000000000000000000000000000000000000000000000000000000000480", &data)); auto tx_info = GetTransactionInfoFromData(data); - ASSERT_NE(tx_info, absl::nullopt); + ASSERT_NE(tx_info, std::nullopt); std::tie(tx_type, tx_params, tx_args) = *tx_info; EXPECT_EQ(tx_type, mojom::TransactionType::ETHSwap); @@ -753,7 +754,7 @@ TEST(EthDataParser, GetTransactionInfoFromDataFillOtcOrderForETH) { &data)); auto tx_info = GetTransactionInfoFromData(data); - ASSERT_NE(tx_info, absl::nullopt); + ASSERT_NE(tx_info, std::nullopt); std::tie(tx_type, tx_params, tx_args) = *tx_info; EXPECT_EQ(tx_type, mojom::TransactionType::ETHSwap); @@ -830,7 +831,7 @@ TEST(EthDataParser, GetTransactionInfoFromDataFillOtcOrderWithETH) { &data)); auto tx_info = GetTransactionInfoFromData(data); - ASSERT_NE(tx_info, absl::nullopt); + ASSERT_NE(tx_info, std::nullopt); std::tie(tx_type, tx_params, tx_args) = *tx_info; EXPECT_EQ(tx_type, mojom::TransactionType::ETHSwap); @@ -912,7 +913,7 @@ TEST(EthDataParser, GetTransactionInfoFromDataFillOtcOrder) { &data)); auto tx_info = GetTransactionInfoFromData(data); - ASSERT_NE(tx_info, absl::nullopt); + ASSERT_NE(tx_info, std::nullopt); std::tie(tx_type, tx_params, tx_args) = *tx_info; EXPECT_EQ(tx_type, mojom::TransactionType::ETHSwap); @@ -974,7 +975,7 @@ TEST(EthDataParser, GetTransactionInfoFromDataCowOrderSellEth) { &data)); auto tx_info = GetTransactionInfoFromData(data); - ASSERT_NE(tx_info, absl::nullopt); + ASSERT_NE(tx_info, std::nullopt); std::tie(tx_type, tx_params, tx_args) = *tx_info; EXPECT_EQ(tx_type, mojom::TransactionType::ETHSwap); @@ -1008,7 +1009,7 @@ TEST(EthDataParser, GetTransactionInfoFromFilForward) { "00000000000000000", // bytes content &data)); auto tx_info = GetTransactionInfoFromData(data); - ASSERT_NE(tx_info, absl::nullopt); + ASSERT_NE(tx_info, std::nullopt); std::tie(tx_type, tx_params, tx_args) = *tx_info; EXPECT_EQ(tx_type, mojom::TransactionType::ETHFilForwarderTransfer); diff --git a/components/brave_wallet/browser/eth_gas_utils.cc b/components/brave_wallet/browser/eth_gas_utils.cc index 3734a90f2d0..4b7516e47b4 100644 --- a/components/brave_wallet/browser/eth_gas_utils.cc +++ b/components/brave_wallet/browser/eth_gas_utils.cc @@ -7,6 +7,7 @@ #include #include +#include #include "base/check.h" #include "base/logging.h" @@ -27,16 +28,16 @@ namespace eth { // Note that base fee is not part of the RLP. Any excees base fee is refunded, // so the user will not be charged more than the base fee of the block that // includes the transaction. -absl::optional ScaleBaseFeePerGas(const std::string& value) { +std::optional ScaleBaseFeePerGas(const std::string& value) { uint256_t value_uint256; if (!HexValueToUint256(value, &value_uint256)) { - return absl::nullopt; + return std::nullopt; } // We use "double" math and this is unlikely to get hit, so return - // absl::nullopt if the value is too big. + // std::nullopt if the value is too big. if (value_uint256 > kMaxSafeIntegerUint64) { - return absl::nullopt; + return std::nullopt; } // Compiler crashes without these 2 casts :( diff --git a/components/brave_wallet/browser/eth_gas_utils.h b/components/brave_wallet/browser/eth_gas_utils.h index d6d7631e037..b7e37620d89 100644 --- a/components/brave_wallet/browser/eth_gas_utils.h +++ b/components/brave_wallet/browser/eth_gas_utils.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_ETH_GAS_UTILS_H_ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_ETH_GAS_UTILS_H_ +#include #include #include @@ -15,7 +16,7 @@ namespace brave_wallet { namespace eth { -absl::optional ScaleBaseFeePerGas(const std::string& value); +std::optional ScaleBaseFeePerGas(const std::string& value); bool GetSuggested1559Fees(const std::vector& base_fee_per_gas, const std::vector& gas_used_ratio, diff --git a/components/brave_wallet/browser/eth_pending_tx_tracker.cc b/components/brave_wallet/browser/eth_pending_tx_tracker.cc index 4c021d2951f..6a4bce3c48b 100644 --- a/components/brave_wallet/browser/eth_pending_tx_tracker.cc +++ b/components/brave_wallet/browser/eth_pending_tx_tracker.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_wallet/browser/eth_pending_tx_tracker.h" #include +#include #include #include "base/containers/contains.h" @@ -15,7 +16,6 @@ #include "brave/components/brave_wallet/browser/json_rpc_service.h" #include "brave/components/brave_wallet/browser/tx_meta.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_wallet { @@ -29,13 +29,13 @@ EthPendingTxTracker::EthPendingTxTracker(EthTxStateManager* tx_state_manager, EthPendingTxTracker::~EthPendingTxTracker() = default; bool EthPendingTxTracker::UpdatePendingTransactions( - const absl::optional& chain_id, + const std::optional& chain_id, std::set* pending_chain_ids) { CHECK(pending_chain_ids); auto pending_transactions = tx_state_manager_->GetTransactionsByStatus( - chain_id, mojom::TransactionStatus::Submitted, absl::nullopt); + chain_id, mojom::TransactionStatus::Submitted, std::nullopt); auto signed_transactions = tx_state_manager_->GetTransactionsByStatus( - chain_id, mojom::TransactionStatus::Signed, absl::nullopt); + chain_id, mojom::TransactionStatus::Signed, std::nullopt); pending_transactions.insert( pending_transactions.end(), std::make_move_iterator(signed_transactions.begin()), @@ -105,7 +105,7 @@ void EthPendingTxTracker::OnSendRawTransaction( bool EthPendingTxTracker::IsNonceTaken(const EthTxMeta& meta) { auto confirmed_transactions = tx_state_manager_->GetTransactionsByStatus( - meta.chain_id(), mojom::TransactionStatus::Confirmed, absl::nullopt); + meta.chain_id(), mojom::TransactionStatus::Confirmed, std::nullopt); for (const auto& confirmed_transaction : confirmed_transactions) { auto* eth_confirmed_transaction = static_cast(confirmed_transaction.get()); diff --git a/components/brave_wallet/browser/eth_pending_tx_tracker.h b/components/brave_wallet/browser/eth_pending_tx_tracker.h index ee99b42948b..f2b0e143ee1 100644 --- a/components/brave_wallet/browser/eth_pending_tx_tracker.h +++ b/components/brave_wallet/browser/eth_pending_tx_tracker.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_ETH_PENDING_TX_TRACKER_H_ #include +#include #include #include @@ -33,7 +34,7 @@ class EthPendingTxTracker { EthPendingTxTracker(const EthPendingTxTracker&) = delete; EthPendingTxTracker operator=(const EthPendingTxTracker&) = delete; - bool UpdatePendingTransactions(const absl::optional& chain_id, + bool UpdatePendingTransactions(const std::optional& chain_id, std::set* pending_chain_ids); void Reset(); diff --git a/components/brave_wallet/browser/eth_response_parser.cc b/components/brave_wallet/browser/eth_response_parser.cc index 0411ced3de2..019ce6067c5 100644 --- a/components/brave_wallet/browser/eth_response_parser.cc +++ b/components/brave_wallet/browser/eth_response_parser.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/eth_response_parser.h" +#include #include #include @@ -213,68 +214,68 @@ bool ParseEthGetTransactionReceipt(const base::Value& json_value, return true; } -absl::optional ParseEthSendRawTransaction( +std::optional ParseEthSendRawTransaction( const base::Value& json_value) { return ParseSingleStringResult(json_value); } -absl::optional ParseEthCall(const base::Value& json_value) { +std::optional ParseEthCall(const base::Value& json_value) { return ParseSingleStringResult(json_value); } -absl::optional> DecodeEthCallResponse( +std::optional> DecodeEthCallResponse( const std::string& data, const std::vector& abi_types) { std::vector response_bytes; if (!PrefixedHexStringToBytes(data, &response_bytes)) { - return absl::nullopt; + return std::nullopt; } auto decoded = ABIDecode(abi_types, response_bytes); - if (decoded == absl::nullopt) { - return absl::nullopt; + if (decoded == std::nullopt) { + return std::nullopt; } const auto& args = std::get<1>(*decoded); if (args.size() != abi_types.size()) { - return absl::nullopt; + return std::nullopt; } return args; } -absl::optional>> +std::optional>> DecodeGetERC20TokenBalancesEthCallResponse(const std::string& data) { std::vector response_bytes; if (!PrefixedHexStringToBytes(data, &response_bytes)) { - return absl::nullopt; + return std::nullopt; } auto decoded = eth_abi::ExtractBoolBytesArrayFromTuple(response_bytes, 0); - if (decoded == absl::nullopt) { - return absl::nullopt; + if (decoded == std::nullopt) { + return std::nullopt; } // Loop through the decoded values, and add the balance // if successful, otherwise null optional - std::vector> balances; + std::vector> balances; for (const auto& tuple : *decoded) { if (tuple.first) { // Convert bytes to hex balances.push_back(ToHex(tuple.second)); } else { - balances.push_back(absl::nullopt); + balances.push_back(std::nullopt); } } return balances; } -absl::optional ParseEthEstimateGas(const base::Value& json_value) { +std::optional ParseEthEstimateGas(const base::Value& json_value) { return ParseSingleStringResult(json_value); } -absl::optional ParseEthGasPrice(const base::Value& json_value) { +std::optional ParseEthGasPrice(const base::Value& json_value) { return ParseSingleStringResult(json_value); } @@ -326,21 +327,21 @@ bool ParseEthGetLogs(const base::Value& json_value, std::vector* logs) { return true; } -absl::optional> +std::optional> ParseUnstoppableDomainsProxyReaderGetMany(const base::Value& json_value) { auto bytes_result = ParseDecodedBytesResult(json_value); if (!bytes_result) { - return absl::nullopt; + return std::nullopt; } return eth_abi::ExtractStringArrayFromTuple(*bytes_result, 0); } -absl::optional ParseUnstoppableDomainsProxyReaderGet( +std::optional ParseUnstoppableDomainsProxyReaderGet( const base::Value& json_value) { std::string value; if (!ParseStringResult(json_value, &value)) { - return absl::nullopt; + return std::nullopt; } return value; diff --git a/components/brave_wallet/browser/eth_response_parser.h b/components/brave_wallet/browser/eth_response_parser.h index 0fe606bd20d..4599de76090 100644 --- a/components/brave_wallet/browser/eth_response_parser.h +++ b/components/brave_wallet/browser/eth_response_parser.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_ETH_RESPONSE_PARSER_H_ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_ETH_RESPONSE_PARSER_H_ +#include #include #include @@ -13,7 +14,7 @@ #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" #include "brave/components/brave_wallet/common/brave_wallet_types.h" -// TODO(apaymyshev): refactor utility methods to return absl::optional instead +// TODO(apaymyshev): refactor utility methods to return std::optional instead // of bool + out-parameter. namespace brave_wallet { @@ -36,22 +37,22 @@ bool ParseEthGetTransactionCount(const base::Value& json_value, uint256_t* count); bool ParseEthGetTransactionReceipt(const base::Value& json_value, TransactionReceipt* receipt); -absl::optional ParseEthSendRawTransaction( +std::optional ParseEthSendRawTransaction( const base::Value& json_value); -absl::optional ParseEthCall(const base::Value& json_value); -absl::optional> DecodeEthCallResponse( +std::optional ParseEthCall(const base::Value& json_value); +std::optional> DecodeEthCallResponse( const std::string& data, const std::vector& abi_types); -absl::optional>> +std::optional>> DecodeGetERC20TokenBalancesEthCallResponse(const std::string& data); -absl::optional ParseEthEstimateGas(const base::Value& json_value); -absl::optional ParseEthGasPrice(const base::Value& json_value); +std::optional ParseEthEstimateGas(const base::Value& json_value); +std::optional ParseEthGasPrice(const base::Value& json_value); bool ParseEthGetLogs(const base::Value& json_value, std::vector* logs); -absl::optional> +std::optional> ParseUnstoppableDomainsProxyReaderGetMany(const base::Value& json_value); -absl::optional ParseUnstoppableDomainsProxyReaderGet( +std::optional ParseUnstoppableDomainsProxyReaderGet( const base::Value& json_value); // Get the JSON included in a data URI with a mime type application/json diff --git a/components/brave_wallet/browser/eth_response_parser_unittest.cc b/components/brave_wallet/browser/eth_response_parser_unittest.cc index 5a17a2d23e3..f084d672239 100644 --- a/components/brave_wallet/browser/eth_response_parser_unittest.cc +++ b/components/brave_wallet/browser/eth_response_parser_unittest.cc @@ -3,12 +3,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include "brave/components/brave_wallet/browser/eth_response_parser.h" + #include +#include #include #include #include "base/test/values_test_util.h" -#include "brave/components/brave_wallet/browser/eth_response_parser.h" #include "brave/components/ipfs/ipfs_utils.h" #include "components/grit/brave_components_strings.h" #include "testing/gtest/include/gtest/gtest.h" @@ -77,7 +79,7 @@ TEST(EthResponseParserUnitTest, DecodeEthCallResponse) { std::string result = "0x00000000000000000000000000000000000000000000000166e12cfce39a0000"; auto args = DecodeEthCallResponse(result, {"uint256"}); - ASSERT_NE(args, absl::nullopt); + ASSERT_NE(args, std::nullopt); ASSERT_EQ(args->size(), 1UL); ASSERT_EQ(args->at(0), "0x166e12cfce39a0000"); @@ -87,15 +89,15 @@ TEST(EthResponseParserUnitTest, DecodeEthCallResponse) { "000000000000000000000000000000000000000000000000000000000000000000000000" "00000000000000000000000000000000000000000000000000"; args = DecodeEthCallResponse(result, {"uint256"}); - ASSERT_NE(args, absl::nullopt); + ASSERT_NE(args, std::nullopt); ASSERT_EQ(args->size(), 1UL); ASSERT_EQ(args->at(0), "0x45d12"); // KO: insufficient length of response - ASSERT_EQ(DecodeEthCallResponse("0x0", {"uint256"}), absl::nullopt); + ASSERT_EQ(DecodeEthCallResponse("0x0", {"uint256"}), std::nullopt); // KO: invalid response - ASSERT_EQ(DecodeEthCallResponse("foobarbaz", {"uint256"}), absl::nullopt); + ASSERT_EQ(DecodeEthCallResponse("foobarbaz", {"uint256"}), std::nullopt); } TEST(EthResponseParserUnitTest, ParseEthGetTransactionReceipt) { @@ -694,7 +696,7 @@ TEST(EthResponseParserUnitTest, ParseStringResult) { } TEST(EthResponseParserUnitTest, DecodeGetERC20TokenBalancesEthCallResponse) { - absl::optional>> result; + std::optional>> result; // Empty string returns null result = eth::DecodeGetERC20TokenBalancesEthCallResponse(""); diff --git a/components/brave_wallet/browser/eth_transaction.cc b/components/brave_wallet/browser/eth_transaction.cc index 3ad12ac068a..cf8bdc700ab 100644 --- a/components/brave_wallet/browser/eth_transaction.cc +++ b/components/brave_wallet/browser/eth_transaction.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/eth_transaction.h" +#include #include #include "base/base64.h" @@ -28,7 +29,7 @@ constexpr uint256_t kTxDataCostPerByte = 16; EthTransaction::EthTransaction() : gas_price_(0), gas_limit_(0), value_(0) {} EthTransaction::EthTransaction(const EthTransaction&) = default; -EthTransaction::EthTransaction(absl::optional nonce, +EthTransaction::EthTransaction(std::optional nonce, uint256_t gas_price, uint256_t gas_limit, const EthAddress& to, @@ -51,7 +52,7 @@ bool EthTransaction::operator==(const EthTransaction& tx) const { } // static -absl::optional EthTransaction::FromTxData( +std::optional EthTransaction::FromTxData( const mojom::TxDataPtr& tx_data, bool strict) { EthTransaction tx; @@ -60,110 +61,110 @@ absl::optional EthTransaction::FromTxData( if (HexValueToUint256(tx_data->nonce, &nonce_uint)) { tx.nonce_ = nonce_uint; } else if (strict) { - return absl::nullopt; + return std::nullopt; } } if (!HexValueToUint256(tx_data->gas_price, &tx.gas_price_) && strict) { - return absl::nullopt; + return std::nullopt; } if (!HexValueToUint256(tx_data->gas_limit, &tx.gas_limit_) && strict) { - return absl::nullopt; + return std::nullopt; } tx.to_ = EthAddress::FromHex(tx_data->to); if (!HexValueToUint256(tx_data->value, &tx.value_) && strict) { - return absl::nullopt; + return std::nullopt; } tx.data_ = tx_data->data; return tx; } // static -absl::optional EthTransaction::FromValue( +std::optional EthTransaction::FromValue( const base::Value::Dict& value) { EthTransaction tx; const std::string* nonce = value.FindString("nonce"); if (!nonce) { - return absl::nullopt; + return std::nullopt; } if (!nonce->empty()) { uint256_t nonce_uint; if (!HexValueToUint256(*nonce, &nonce_uint)) { - return absl::nullopt; + return std::nullopt; } tx.nonce_ = nonce_uint; } const std::string* gas_price = value.FindString("gas_price"); if (!gas_price) { - return absl::nullopt; + return std::nullopt; } if (!HexValueToUint256(*gas_price, &tx.gas_price_)) { - return absl::nullopt; + return std::nullopt; } const std::string* gas_limit = value.FindString("gas_limit"); if (!gas_limit) { - return absl::nullopt; + return std::nullopt; } if (!HexValueToUint256(*gas_limit, &tx.gas_limit_)) { - return absl::nullopt; + return std::nullopt; } const std::string* to = value.FindString("to"); if (!to) { - return absl::nullopt; + return std::nullopt; } tx.to_ = EthAddress::FromHex(*to); const std::string* tx_value = value.FindString("value"); if (!tx_value) { - return absl::nullopt; + return std::nullopt; } if (!HexValueToUint256(*tx_value, &tx.value_)) { - return absl::nullopt; + return std::nullopt; } const std::string* data = value.FindString("data"); if (!data) { - return absl::nullopt; + return std::nullopt; } std::string data_decoded; if (!base::Base64Decode(*data, &data_decoded)) { - return absl::nullopt; + return std::nullopt; } tx.data_ = std::vector(data_decoded.begin(), data_decoded.end()); - absl::optional v = value.FindInt("v"); + std::optional v = value.FindInt("v"); if (!v) { - return absl::nullopt; + return std::nullopt; } tx.v_ = (uint8_t)*v; const std::string* r = value.FindString("r"); if (!r) { - return absl::nullopt; + return std::nullopt; } std::string r_decoded; if (!base::Base64Decode(*r, &r_decoded)) { - return absl::nullopt; + return std::nullopt; } tx.r_ = std::vector(r_decoded.begin(), r_decoded.end()); const std::string* s = value.FindString("s"); if (!s) { - return absl::nullopt; + return std::nullopt; } std::string s_decoded; if (!base::Base64Decode(*s, &s_decoded)) { - return absl::nullopt; + return std::nullopt; } tx.s_ = std::vector(s_decoded.begin(), s_decoded.end()); - absl::optional type = value.FindInt("type"); + std::optional type = value.FindInt("type"); if (!type) { - return absl::nullopt; + return std::nullopt; } tx.type_ = (uint8_t)*type; diff --git a/components/brave_wallet/browser/eth_transaction.h b/components/brave_wallet/browser/eth_transaction.h index 1734ab94362..59aa9f68933 100644 --- a/components/brave_wallet/browser/eth_transaction.h +++ b/components/brave_wallet/browser/eth_transaction.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_ETH_TRANSACTION_H_ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_ETH_TRANSACTION_H_ +#include #include #include @@ -13,7 +14,6 @@ #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" #include "brave/components/brave_wallet/common/brave_wallet_types.h" #include "brave/components/brave_wallet/common/eth_address.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace base { class Value; @@ -31,15 +31,15 @@ class EthTransaction { virtual ~EthTransaction(); bool operator==(const EthTransaction&) const; - static absl::optional FromTxData( + static std::optional FromTxData( const mojom::TxDataPtr& tx_data, bool strict = true); - static absl::optional FromValue( + static std::optional FromValue( const base::Value::Dict& value); uint8_t type() const { return type_; } - absl::optional nonce() const { return nonce_; } + std::optional nonce() const { return nonce_; } uint256_t gas_price() const { return gas_price_; } uint256_t gas_limit() const { return gas_limit_; } EthAddress to() const { return to_; } @@ -51,7 +51,7 @@ class EthTransaction { void set_to(EthAddress to) { to_ = to; } void set_value(uint256_t value) { value_ = value; } - void set_nonce(absl::optional nonce) { nonce_ = nonce; } + void set_nonce(std::optional nonce) { nonce_ = nonce; } void set_data(const std::vector& data) { data_ = data; } void set_gas_price(uint256_t gas_price) { gas_price_ = gas_price; } void set_gas_limit(uint256_t gas_limit) { gas_limit_ = gas_limit; } @@ -97,7 +97,7 @@ class EthTransaction { // type 0 would be LegacyTransaction uint8_t type_ = 0; - absl::optional nonce_; + std::optional nonce_; uint256_t gas_price_; uint256_t gas_limit_; EthAddress to_; @@ -109,7 +109,7 @@ class EthTransaction { std::vector s_; protected: - EthTransaction(absl::optional nonce, + EthTransaction(std::optional nonce, uint256_t gas_price, uint256_t gas_limit, const EthAddress& to, diff --git a/components/brave_wallet/browser/eth_transaction_unittest.cc b/components/brave_wallet/browser/eth_transaction_unittest.cc index 3682e263994..4db0b1ad888 100644 --- a/components/brave_wallet/browser/eth_transaction_unittest.cc +++ b/components/brave_wallet/browser/eth_transaction_unittest.cc @@ -3,14 +3,16 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include "brave/components/brave_wallet/browser/eth_transaction.h" + #include +#include #include #include #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/values.h" -#include "brave/components/brave_wallet/browser/eth_transaction.h" #include "brave/components/brave_wallet/browser/internal/hd_key.h" #include "testing/gtest/include/gtest/gtest.h" @@ -35,7 +37,7 @@ TEST(EthTransactionUnitTest, GetMessageToSign) { EthTransaction tx1 = *EthTransaction::FromTxData( mojom::TxData::New("0x06", "0x09184e72a000", "0x0974", "0xbe862ad9abfe6f22bcb087716c7d89a26051f74c", - "0x016345785d8a0000", data, false, absl::nullopt)); + "0x016345785d8a0000", data, false, std::nullopt)); EXPECT_EQ(base::ToLowerASCII(base::HexEncode(tx1.GetMessageToSign(0))), "61e1ec33764304dddb55348e7883d4437426f44ab3ef65e6da1e025734c03ff0"); @@ -47,7 +49,7 @@ TEST(EthTransactionUnitTest, GetMessageToSign) { EthTransaction tx2 = *EthTransaction::FromTxData( mojom::TxData::New("0x0b", "0x051f4d5c00", "0x5208", "0x656e929d6fc0cac52d3d9526d288fe02dcd56fbd", - "0x2386f26fc10000", data, false, absl::nullopt)); + "0x2386f26fc10000", data, false, std::nullopt)); // with chain id (mainnet) EXPECT_EQ(base::ToLowerASCII(base::HexEncode(tx2.GetMessageToSign(1))), @@ -102,7 +104,7 @@ TEST(EthTransactionUnitTest, GetMessageToSign) { for (const auto& entry : cases) { EthTransaction tx = *EthTransaction::FromTxData(mojom::TxData::New( entry.nonce, entry.gas_price, entry.gas_limit, entry.to, entry.value, - std::vector(), false, absl::nullopt)); + std::vector(), false, std::nullopt)); // with chain id (mainnet) EXPECT_EQ(base::ToLowerASCII(base::HexEncode(tx.GetMessageToSign(1))), entry.hash); @@ -120,7 +122,7 @@ TEST(EthTransactionUnitTest, GetSignedTransactionAndHash) { EthTransaction tx = *EthTransaction::FromTxData(mojom::TxData::New( "0x09", "0x4a817c800", "0x5208", "0x3535353535353535353535353535353535353535", "0x0de0b6b3a7640000", - std::vector(), false, absl::nullopt)); + std::vector(), false, std::nullopt)); const std::vector message = tx.GetMessageToSign(1); EXPECT_EQ(base::ToLowerASCII(base::HexEncode(message)), @@ -189,10 +191,10 @@ TEST(EthTransactionUnitTest, TransactionAndValue) { EthTransaction tx = *EthTransaction::FromTxData(mojom::TxData::New( "0x09", "0x4a817c800", "0x5208", "0x3535353535353535353535353535353535353535", "0x0de0b6b3a7640000", - std::vector(), false, absl::nullopt)); + std::vector(), false, std::nullopt)); base::Value::Dict tx_value = tx.ToValue(); auto tx_from_value = EthTransaction::FromValue(tx_value); - ASSERT_NE(tx_from_value, absl::nullopt); + ASSERT_NE(tx_from_value, std::nullopt); EXPECT_EQ(tx_from_value, tx); } @@ -222,21 +224,21 @@ TEST(EthTransactionUnitTest, GetDataFee) { EthTransaction tx2 = *EthTransaction::FromTxData( mojom::TxData::New("0x06", "0x09184e72a000", "0x0974", "0xbe862ad9abfe6f22bcb087716c7d89a26051f74c", - "0x016345785d8a0000", data, false, absl::nullopt)); + "0x016345785d8a0000", data, false, std::nullopt)); EXPECT_EQ(tx2.GetDataFee(), uint256_t(1716)); } TEST(EthTransactionUnitTest, GetUpFrontCost) { EthTransaction tx = *EthTransaction::FromTxData(mojom::TxData::New( "0x00", "0x3E8", "0x989680", "0x3535353535353535353535353535353535353535", - "0x2A", std::vector(), false, absl::nullopt)); + "0x2A", std::vector(), false, std::nullopt)); EXPECT_EQ(tx.GetUpfrontCost(), uint256_t(10000000042)); } TEST(EthTransactionUnitTest, FromTxData) { auto tx = EthTransaction::FromTxData(mojom::TxData::New( "0x01", "0x3E8", "0x989680", "0x3535353535353535353535353535353535353535", - "0x2A", std::vector{1}, false, absl::nullopt)); + "0x2A", std::vector{1}, false, std::nullopt)); ASSERT_TRUE(tx); EXPECT_EQ(tx->nonce(), uint256_t(1)); EXPECT_EQ(tx->gas_price(), uint256_t(1000)); @@ -249,29 +251,29 @@ TEST(EthTransactionUnitTest, FromTxData) { // Empty nonce tx = EthTransaction::FromTxData(mojom::TxData::New( "", "0x3E8", "0x989680", "0x3535353535353535353535353535353535353535", - "0x2A", std::vector{1}, false, absl::nullopt)); + "0x2A", std::vector{1}, false, std::nullopt)); ASSERT_TRUE(tx); EXPECT_FALSE(tx->nonce()); // Missing values should not parse correctly EXPECT_FALSE(EthTransaction::FromTxData(mojom::TxData::New( "0x01", "", "0x989680", "0x3535353535353535353535353535353535353535", - "0x2A", std::vector{1}, false, absl::nullopt))); + "0x2A", std::vector{1}, false, std::nullopt))); EXPECT_FALSE(EthTransaction::FromTxData(mojom::TxData::New( "0x01", "0x3E8", "", "0x3535353535353535353535353535353535353535", "0x2A", - std::vector{1}, false, absl::nullopt))); + std::vector{1}, false, std::nullopt))); EXPECT_FALSE(EthTransaction::FromTxData(mojom::TxData::New( "0x01", "0x3E8", "0x989680", "0x3535353535353535353535353535353535353535", - "", std::vector{1}, false, absl::nullopt))); + "", std::vector{1}, false, std::nullopt))); // But missing data is allowed when strict is false tx = EthTransaction::FromTxData( mojom::TxData::New("", "0x3E8", "", "0x3535353535353535353535353535353535353535", "", - std::vector{1}, false, absl::nullopt), + std::vector{1}, false, std::nullopt), false); ASSERT_TRUE(tx); - // Empty nonce should be absl::nullopt + // Empty nonce should be std::nullopt EXPECT_FALSE(tx->nonce()); // Unspecified value defaults to 0 EXPECT_EQ(tx->gas_limit(), uint256_t(0)); @@ -283,7 +285,7 @@ TEST(EthTransactionUnitTest, FromTxData) { tx = EthTransaction::FromTxData( mojom::TxData::New("0x1", "", "0x989680", "0x3535353535353535353535353535353535353535", "0x2A", - std::vector{1}, false, absl::nullopt), + std::vector{1}, false, std::nullopt), false); ASSERT_TRUE(tx); // Unspecified value defaults to 0 diff --git a/components/brave_wallet/browser/eth_tx_manager.cc b/components/brave_wallet/browser/eth_tx_manager.cc index 6583e7a8bef..2044e2a95eb 100644 --- a/components/brave_wallet/browser/eth_tx_manager.cc +++ b/components/brave_wallet/browser/eth_tx_manager.cc @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -140,7 +141,7 @@ void EthTxManager::AddUnapprovedTransaction( const std::string& chain_id, mojom::TxDataUnionPtr tx_data_union, const mojom::AccountIdPtr& from, - const absl::optional& origin, + const std::optional& origin, AddUnapprovedTransactionCallback callback) { DCHECK(tx_data_union->is_eth_tx_data() || tx_data_union->is_eth_tx_data_1559()); @@ -246,7 +247,7 @@ void EthTxManager::OnGetGasPrice(const std::string& chain_id, void EthTxManager::ContinueAddUnapprovedTransaction( const std::string& chain_id, const mojom::AccountIdPtr& from, - const absl::optional& origin, + const std::optional& origin, std::unique_ptr tx, AddUnapprovedTransactionCallback callback, bool sign_only, @@ -393,7 +394,7 @@ void EthTxManager::GetNonceForHardwareTransaction( GetEthTxStateManager()->GetEthTx(chain_id, tx_meta_id); if (!meta) { LOG(ERROR) << "No transaction found"; - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(std::nullopt); return; } if (!meta->tx()->nonce()) { @@ -445,12 +446,12 @@ void EthTxManager::OnGetNextNonceForHardware( tx_state_manager_->AddOrUpdateTx(*meta); VLOG(1) << __FUNCTION__ << "GetNextNonce failed for tx with meta:" << meta->id(); - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(std::nullopt); return; } meta->tx()->set_nonce(nonce); if (!tx_state_manager_->AddOrUpdateTx(*meta)) { - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(std::nullopt); return; } std::move(callback).Run(Uint256ValueToHex(nonce)); @@ -668,8 +669,7 @@ void EthTxManager::OnPublishTransaction(const std::string& chain_id, void EthTxManager::MakeFilForwarderTransferData( const FilAddress& fil_address, MakeFilForwarderDataCallback callback) { - absl::optional> data = - filforwarder::Forward(fil_address); + std::optional> data = filforwarder::Forward(fil_address); if (!data) { LOG(ERROR) << "Could not make transfer data"; @@ -764,7 +764,7 @@ void EthTxManager::MakeERC721TransferFromData( } const std::string chain_id = - json_rpc_service_->GetChainIdSync(mojom::CoinType::ETH, absl::nullopt); + json_rpc_service_->GetChainIdSync(mojom::CoinType::ETH, std::nullopt); // Check if safeTransferFrom is supported first. json_rpc_service_->GetSupportsInterface( contract_address, kERC721InterfaceId, chain_id, @@ -966,7 +966,7 @@ void EthTxManager::SetNonceForUnapprovedTransaction( } if (nonce.empty()) { - tx_meta->tx()->set_nonce(absl::nullopt); + tx_meta->tx()->set_nonce(std::nullopt); } else { uint256_t nonce_uint; if (!HexValueToUint256(nonce, &nonce_uint)) { @@ -995,7 +995,7 @@ void EthTxManager::OnNewBlock(const std::string& chain_id, } void EthTxManager::UpdatePendingTransactions( - const absl::optional& chain_id) { + const std::optional& chain_id) { std::set pending_chain_ids; if (pending_tx_tracker_->UpdatePendingTransactions(chain_id, &pending_chain_ids)) { @@ -1062,7 +1062,7 @@ void EthTxManager::SpeedupOrCancelTransaction( void EthTxManager::ContinueSpeedupOrCancelTransaction( const std::string& chain_id, const mojom::AccountIdPtr& from, - const absl::optional& origin, + const std::optional& origin, const std::string& gas_limit, std::unique_ptr tx, SpeedupOrCancelTransactionCallback callback, @@ -1103,7 +1103,7 @@ void EthTxManager::ContinueSpeedupOrCancelTransaction( void EthTxManager::ContinueSpeedupOrCancel1559Transaction( const std::string& chain_id, const mojom::AccountIdPtr& from, - const absl::optional& origin, + const std::optional& origin, const std::string& gas_limit, std::unique_ptr tx, SpeedupOrCancelTransactionCallback callback, diff --git a/components/brave_wallet/browser/eth_tx_manager.h b/components/brave_wallet/browser/eth_tx_manager.h index acca8ef2023..0a04cc295c6 100644 --- a/components/brave_wallet/browser/eth_tx_manager.h +++ b/components/brave_wallet/browser/eth_tx_manager.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_ETH_TX_MANAGER_H_ #include +#include #include #include @@ -48,7 +49,7 @@ class EthTxManager : public TxManager, public EthBlockTracker::Observer { void AddUnapprovedTransaction(const std::string& chain_id, mojom::TxDataUnionPtr tx_data_union, const mojom::AccountIdPtr& from, - const absl::optional& origin, + const std::optional& origin, AddUnapprovedTransactionCallback) override; void ApproveTransaction(const std::string& chain_id, const std::string& tx_meta_id, @@ -219,7 +220,7 @@ class EthTxManager : public TxManager, public EthBlockTracker::Observer { void ContinueAddUnapprovedTransaction( const std::string& chain_id, const mojom::AccountIdPtr& from, - const absl::optional& origin, + const std::optional& origin, std::unique_ptr tx, AddUnapprovedTransactionCallback callback, bool sign_only, @@ -248,12 +249,12 @@ class EthTxManager : public TxManager, public EthBlockTracker::Observer { bool sign_only, mojom::GasEstimation1559Ptr gas_estimation); void UpdatePendingTransactions( - const absl::optional& chain_id) override; + const std::optional& chain_id) override; void ContinueSpeedupOrCancelTransaction( const std::string& chain_id, const mojom::AccountIdPtr& from, - const absl::optional& origin, + const std::optional& origin, const std::string& gas_limit, std::unique_ptr tx, SpeedupOrCancelTransactionCallback callback, @@ -263,7 +264,7 @@ class EthTxManager : public TxManager, public EthBlockTracker::Observer { void ContinueSpeedupOrCancel1559Transaction( const std::string& chain_id, const mojom::AccountIdPtr& from, - const absl::optional& origin, + const std::optional& origin, const std::string& gas_limit, std::unique_ptr tx, SpeedupOrCancelTransactionCallback callback, diff --git a/components/brave_wallet/browser/eth_tx_manager_unittest.cc b/components/brave_wallet/browser/eth_tx_manager_unittest.cc index b3e8d68e402..c0323ee8617 100644 --- a/components/brave_wallet/browser/eth_tx_manager_unittest.cc +++ b/components/brave_wallet/browser/eth_tx_manager_unittest.cc @@ -7,6 +7,7 @@ #include #include +#include #include #include #include @@ -101,7 +102,7 @@ void MakeERC721TransferFromDataCallback(base::RunLoop* run_loop, std::vector tx_params; std::vector tx_args; auto tx_info = GetTransactionInfoFromData(data); - ASSERT_NE(tx_info, absl::nullopt); + ASSERT_NE(tx_info, std::nullopt); std::tie(tx_type, tx_params, tx_args) = *tx_info; EXPECT_EQ(expected_type, tx_type); } @@ -323,7 +324,7 @@ class EthTxManagerUnitTest : public testing::Test { auto tx_data = mojom::TxData::New(nonce, gas_price, "0x0974", "0xbe862ad9abfe6f22bcb087716c7d89a26051f74c", - "0x016345785d8a0000", data, false, absl::nullopt); + "0x016345785d8a0000", data, false, std::nullopt); auto tx = EthTransaction::FromTxData(tx_data, false); ASSERT_TRUE(tx); @@ -355,7 +356,7 @@ class EthTxManagerUnitTest : public testing::Test { auto tx_data1559 = mojom::TxData1559::New( mojom::TxData::New(nonce, "", "0x0974", "0xbe862ad9abfe6f22bcb087716c7d89a26051f74c", - "0x016345785d8a0000", data, false, absl::nullopt), + "0x016345785d8a0000", data, false, std::nullopt), "0x539", max_priority_fee_per_gas, max_fee_per_gas, nullptr); @@ -393,7 +394,7 @@ class EthTxManagerUnitTest : public testing::Test { const std::string& chain_id, mojom::TxDataUnionPtr tx_data, const mojom::AccountIdPtr& from, - const absl::optional& origin, + const std::optional& origin, EthTxManager::AddUnapprovedTransactionCallback callback) { eth_tx_manager()->AddUnapprovedTransaction( chain_id, std::move(tx_data), from, origin, std::move(callback)); @@ -437,7 +438,7 @@ class EthTxManagerUnitTest : public testing::Test { std::vector tx_args; auto tx_info = GetTransactionInfoFromData(data); - ASSERT_NE(tx_info, absl::nullopt); + ASSERT_NE(tx_info, std::nullopt); std::tie(tx_type, tx_params, tx_args) = *tx_info; EXPECT_EQ(expected_type, tx_type); @@ -478,7 +479,7 @@ TEST_F(EthTxManagerUnitTest, AddUnapprovedTransactionWithGasPriceAndGasLimit) { auto tx_data = mojom::TxData::New("0x06", gas_price, gas_limit, "0xbe862ad9abfe6f22bcb087716c7d89a26051f74c", - "0x016345785d8a0000", data_, false, absl::nullopt); + "0x016345785d8a0000", data_, false, std::nullopt); bool callback_called = false; std::string tx_meta_id; @@ -505,14 +506,14 @@ TEST_F(EthTxManagerUnitTest, WalletOrigin) { auto tx_data = mojom::TxData::New("0x06", "0x09184e72a000", "0x0974", "0xbe862ad9abfe6f22bcb087716c7d89a26051f74c", - "0x016345785d8a0000", data_, false, absl::nullopt); + "0x016345785d8a0000", data_, false, std::nullopt); bool callback_called = false; std::string tx_meta_id; AddUnapprovedTransaction( mojom::kLocalhostChainId, mojom::TxDataUnion::NewEthTxData(std::move(tx_data)), from(), - absl::nullopt, + std::nullopt, base::BindOnce(&AddUnapprovedTransactionSuccessCallback, &callback_called, &tx_meta_id)); @@ -529,7 +530,7 @@ TEST_F(EthTxManagerUnitTest, SomeSiteOrigin) { auto tx_data = mojom::TxData::New("0x06", "0x09184e72a000", "0x0974", "0xbe862ad9abfe6f22bcb087716c7d89a26051f74c", - "0x016345785d8a0000", data_, false, absl::nullopt); + "0x016345785d8a0000", data_, false, std::nullopt); bool callback_called = false; std::string tx_meta_id; @@ -555,7 +556,7 @@ TEST_F(EthTxManagerUnitTest, AddUnapprovedTransactionWithoutGasLimit) { auto tx_data = mojom::TxData::New("0x06", gas_price, "" /* gas_limit */, "0xbe862ad9abfe6f22bcb087716c7d89a26051f74c", - "0x016345785d8a0000", data_, false, absl::nullopt); + "0x016345785d8a0000", data_, false, std::nullopt); bool callback_called = false; std::string tx_meta_id; @@ -606,7 +607,7 @@ TEST_F(EthTxManagerUnitTest, AddUnapprovedTransactionWithoutGasLimit) { tx_data = mojom::TxData::New("0x06", gas_price, "" /* gas_limit */, "0xbe862ad9abfe6f22bcb087716c7d89a26051f74c", "0x016345785d8a0000", data_decoded, false, - absl::nullopt); + std::nullopt); SetErrorInterceptor(); callback_called = false; @@ -631,7 +632,7 @@ TEST_F(EthTxManagerUnitTest, AddUnapprovedTransactionWithoutGasPrice) { auto tx_data = mojom::TxData::New("0x06", "" /* gas_price */, gas_limit, "0xbe862ad9abfe6f22bcb087716c7d89a26051f74c", - "0x016345785d8a0000", data_, false, absl::nullopt); + "0x016345785d8a0000", data_, false, std::nullopt); bool callback_called = false; std::string tx_meta_id; @@ -669,7 +670,7 @@ TEST_F(EthTxManagerUnitTest, auto tx_data = mojom::TxData::New("0x06", "" /* gas_price */, "" /* gas_limit */, "0xbe862ad9abfe6f22bcb087716c7d89a26051f74c", - "0x016345785d8a0000", data_, false, absl::nullopt); + "0x016345785d8a0000", data_, false, std::nullopt); bool callback_called = false; std::string tx_meta_id; @@ -706,7 +707,7 @@ TEST_F(EthTxManagerUnitTest, auto tx_data = mojom::TxData::New( "0x06", "" /* gas_price*/, "" /* gas_limit */, "0xbe862ad9abfe6f22bcb087716c7d89a26051f74c", "0x016345785d8a0000", - std::vector(), false, absl::nullopt); + std::vector(), false, std::nullopt); bool callback_called = false; std::string tx_meta_id; @@ -733,7 +734,7 @@ TEST_F(EthTxManagerUnitTest, SetGasPriceAndLimitForUnapprovedTransaction) { auto tx_data = mojom::TxData::New( "0x06", "" /* gas_price*/, "" /* gas_limit */, "0xbe862ad9abfe6f22bcb087716c7d89a26051f74c", "0x016345785d8a0000", - std::vector(), false, absl::nullopt); + std::vector(), false, std::nullopt); bool callback_called = false; std::string tx_meta_id; @@ -829,7 +830,7 @@ TEST_F(EthTxManagerUnitTest, SetDataForUnapprovedTransaction) { auto tx_data = mojom::TxData::New( "0x06", "0x11" /* gas_price*/, "0x22" /* gas_limit */, "0xbe862ad9abfe6f22bcb087716c7d89a26051f74c", "0x016345785d8a0000", - initial_data, false, absl::nullopt); + initial_data, false, std::nullopt); bool callback_called = false; std::string tx_meta_id; AddUnapprovedTransaction( @@ -884,7 +885,7 @@ TEST_F(EthTxManagerUnitTest, SetNonceForUnapprovedTransaction) { auto tx_data = mojom::TxData::New( "0x06", "0x11" /* gas_price*/, "0x22" /* gas_limit */, "0xbe862ad9abfe6f22bcb087716c7d89a26051f74c", "0x016345785d8a0000", - std::vector(), false, absl::nullopt); + std::vector(), false, std::nullopt); bool callback_called = false; std::string tx_meta_id; AddUnapprovedTransaction( @@ -962,7 +963,7 @@ TEST_F(EthTxManagerUnitTest, SetNonceForUnapprovedTransaction) { tx_meta = eth_tx_manager()->GetTxForTesting(mojom::kLocalhostChainId, tx_meta_id); EXPECT_TRUE(tx_meta); - EXPECT_EQ(tx_meta->tx()->nonce(), absl::nullopt); + EXPECT_EQ(tx_meta->tx()->nonce(), std::nullopt); } TEST_F(EthTxManagerUnitTest, ValidateTxData) { @@ -971,7 +972,7 @@ TEST_F(EthTxManagerUnitTest, ValidateTxData) { mojom::TxData::New("0x06", "0x09184e72a000", "0x0974", "0xbe862ad9abfe6f22bcb087716c7d89a26051f74c", "0x016345785d8a0000", std::vector(), false, - absl::nullopt), + std::nullopt), &error_message)); // Make sure if params are specified that they are valid hex strings @@ -979,42 +980,42 @@ TEST_F(EthTxManagerUnitTest, ValidateTxData) { mojom::TxData::New("hello", "0x09184e72a000", "0x0974", "0xbe862ad9abfe6f22bcb087716c7d89a26051f74c", "0x016345785d8a0000", std::vector(), false, - absl::nullopt), + std::nullopt), &error_message)); EXPECT_FALSE(EthTxManager::ValidateTxData( mojom::TxData::New("0x06", "hello", "0x0974", "0xbe862ad9abfe6f22bcb087716c7d89a26051f74c", "0x016345785d8a0000", std::vector(), false, - absl::nullopt), + std::nullopt), &error_message)); EXPECT_FALSE(EthTxManager::ValidateTxData( mojom::TxData::New("0x06", "0x09184e72a000", "hello", "0xbe862ad9abfe6f22bcb087716c7d89a26051f74c", "0x016345785d8a0000", std::vector(), false, - absl::nullopt), + std::nullopt), &error_message)); EXPECT_FALSE(EthTxManager::ValidateTxData( mojom::TxData::New("0x06", "0x09184e72a000", "0x0974", "hello", "0x016345785d8a0000", std::vector(), false, - absl::nullopt), + std::nullopt), &error_message)); EXPECT_FALSE(EthTxManager::ValidateTxData( mojom::TxData::New("0x06", "0x09184e72a000", "0x0974", "0xbe862ad9abfe6f22bcb087716c7d89a26051f74c", "hello", - std::vector(), false, absl::nullopt), + std::vector(), false, std::nullopt), &error_message)); // to must not only be a valid hex string but also an address EXPECT_FALSE(EthTxManager::ValidateTxData( mojom::TxData::New("0x06", "0x09184e72a000", "0x0974", "0xbe", // Invalid address - "hello", std::vector(), false, absl::nullopt), + "hello", std::vector(), false, std::nullopt), &error_message)); // To can't be missing if Data is missing EXPECT_FALSE(EthTxManager::ValidateTxData( mojom::TxData::New("0x06", "0x09184e72a000", "0x0974", "", "0x016345785d8a0000", std::vector(), false, - absl::nullopt), + std::nullopt), &error_message)); } @@ -1024,7 +1025,7 @@ TEST_F(EthTxManagerUnitTest, ValidateTxData1559) { mojom::TxData1559::New( mojom::TxData::New( "0x00", "", "0x00", "0x0101010101010101010101010101010101010101", - "0x00", std::vector(), false, absl::nullopt), + "0x00", std::vector(), false, std::nullopt), "0x04", "0x0", "0x1", nullptr), &error_message)); @@ -1034,7 +1035,7 @@ TEST_F(EthTxManagerUnitTest, ValidateTxData1559) { mojom::TxData::New("0x00", "0x1", "0x00", "0x0101010101010101010101010101010101010101", "0x00", std::vector(), false, - absl::nullopt), + std::nullopt), "0x04", "0x0", "0x1", nullptr), &error_message)); @@ -1044,7 +1045,7 @@ TEST_F(EthTxManagerUnitTest, ProcessHardwareSignature) { auto tx_data = mojom::TxData::New("0x06", "" /* gas_price */, "" /* gas_limit */, "0xbe862ad9abfe6f22bcb087716c7d89a26051f74c", - "0x016345785d8a0000", data_, false, absl::nullopt); + "0x016345785d8a0000", data_, false, std::nullopt); bool callback_called = false; std::string tx_meta_id; @@ -1087,7 +1088,7 @@ TEST_F(EthTxManagerUnitTest, ProcessHardwareSignatureFail) { auto tx_data = mojom::TxData::New("0x06", "" /* gas_price */, "" /* gas_limit */, "0xbe862ad9abfe6f22bcb087716c7d89a26051f74c", - "0x016345785d8a0000", data_, false, absl::nullopt); + "0x016345785d8a0000", data_, false, std::nullopt); bool callback_called = false; std::string tx_meta_id; @@ -1145,7 +1146,7 @@ TEST_F(EthTxManagerUnitTest, GetNonceForHardwareTransaction) { auto tx_data = mojom::TxData::New("", "" /* gas_price */, "" /* gas_limit */, "0xbe862ad9abfe6f22bcb087716c7d89a26051f74c", - "0x016345785d8a0000", data_, false, absl::nullopt); + "0x016345785d8a0000", data_, false, std::nullopt); bool callback_called = false; std::string tx_meta_id; @@ -1162,7 +1163,7 @@ TEST_F(EthTxManagerUnitTest, GetNonceForHardwareTransaction) { callback_called = false; eth_tx_manager()->GetNonceForHardwareTransaction( mojom::kLocalhostChainId, tx_meta_id, - base::BindLambdaForTesting([&](const absl::optional& nonce) { + base::BindLambdaForTesting([&](const std::optional& nonce) { EXPECT_TRUE(nonce); EXPECT_FALSE(nonce->empty()); auto tx_meta = eth_tx_manager()->GetTxForTesting( @@ -1180,7 +1181,7 @@ TEST_F(EthTxManagerUnitTest, GetNonceForHardwareTransaction) { mojom::kLocalhostChainId, tx_meta_id, base::BindLambdaForTesting([&](mojom::MessageToSignUnionPtr message) { ASSERT_TRUE(message->is_message_str()); - absl::optional message_str = message->get_message_str(); + std::optional message_str = message->get_message_str(); EXPECT_EQ( message_str, "0xf873018517fcf1832182960494be862ad9abfe6f22bcb087716c7d89a260" @@ -1198,7 +1199,7 @@ TEST_F(EthTxManagerUnitTest, GetNonceForHardwareTransaction1559) { auto tx_data = mojom::TxData1559::New( mojom::TxData::New("0x00", "", "0x01", "0x0101010101010101010101010101010101010101", "0x00", - std::vector(), false, absl::nullopt), + std::vector(), false, std::nullopt), "0x04", "0x1", "0x1", nullptr); bool callback_called = false; @@ -1217,7 +1218,7 @@ TEST_F(EthTxManagerUnitTest, GetNonceForHardwareTransaction1559) { callback_called = false; eth_tx_manager()->GetNonceForHardwareTransaction( mojom::kLocalhostChainId, tx_meta_id, - base::BindLambdaForTesting([&](const absl::optional& nonce) { + base::BindLambdaForTesting([&](const std::optional& nonce) { EXPECT_TRUE(nonce); EXPECT_FALSE(nonce->empty()); auto tx_meta = eth_tx_manager()->GetTxForTesting( @@ -1235,7 +1236,7 @@ TEST_F(EthTxManagerUnitTest, GetNonceForHardwareTransaction1559) { mojom::kLocalhostChainId, tx_meta_id, base::BindLambdaForTesting([&](mojom::MessageToSignUnionPtr message) { ASSERT_TRUE(message->is_message_str()); - absl::optional message_str = message->get_message_str(); + std::optional message_str = message->get_message_str(); EXPECT_EQ( message_str, "0x02dd04800101019401010101010101010101010101010101010101018080c0"); @@ -1252,7 +1253,7 @@ TEST_F(EthTxManagerUnitTest, GetNonceForHardwareTransactionFail) { tx_service_->AddObserver(observer.GetReceiver()); eth_tx_manager()->GetNonceForHardwareTransaction( mojom::kLocalhostChainId, std::string(), - base::BindLambdaForTesting([&](const absl::optional& nonce) { + base::BindLambdaForTesting([&](const std::optional& nonce) { EXPECT_FALSE(nonce); callback_called = true; })); @@ -1277,7 +1278,7 @@ TEST_F(EthTxManagerUnitTest, AddUnapproved1559TransactionWithGasFeeAndLimit) { auto tx_data = mojom::TxData1559::New( mojom::TxData::New("0x1", "", gas_limit, "0xbe862ad9abfe6f22bcb087716c7d89a26051f74c", - "0x016345785d8a0000", data_, false, absl::nullopt), + "0x016345785d8a0000", data_, false, std::nullopt), "0x04", "0x77359400" /* 2 Gwei */, "0xb2d05e000" /* 48 Gwei */, nullptr); bool callback_called = false; @@ -1307,7 +1308,7 @@ TEST_F(EthTxManagerUnitTest, AddUnapproved1559TransactionWithoutGasLimit) { auto tx_data = mojom::TxData1559::New( mojom::TxData::New("0x1", "", "", "0xbe862ad9abfe6f22bcb087716c7d89a26051f74c", - "0x016345785d8a0000", data_, false, absl::nullopt), + "0x016345785d8a0000", data_, false, std::nullopt), "0x04", "0x77359400" /* 2 Gwei */, "0xb2d05e000" /* 48 Gwei */, nullptr); bool callback_called = false; @@ -1338,7 +1339,7 @@ TEST_F(EthTxManagerUnitTest, AddUnapproved1559TransactionWithoutGasFee) { auto tx_data = mojom::TxData1559::New( mojom::TxData::New("0x1", "", gas_limit, "0xbe862ad9abfe6f22bcb087716c7d89a26051f74c", - "0x016345785d8a0000", data_, false, absl::nullopt), + "0x016345785d8a0000", data_, false, std::nullopt), "0x04", "", "", nullptr); bool callback_called = false; @@ -1371,7 +1372,7 @@ TEST_F(EthTxManagerUnitTest, auto tx_data = mojom::TxData1559::New( mojom::TxData::New("0x1", "", "", "0xbe862ad9abfe6f22bcb087716c7d89a26051f74c", - "0x016345785d8a0000", data_, false, absl::nullopt), + "0x016345785d8a0000", data_, false, std::nullopt), "0x04", "", "", nullptr); bool callback_called = false; @@ -1433,7 +1434,7 @@ TEST_F(EthTxManagerUnitTest, auto tx_data = mojom::TxData1559::New( mojom::TxData::New("0x1", "", gas_limit, "0xbe862ad9abfe6f22bcb087716c7d89a26051f74c", - "0x016345785d8a0000", data_, false, absl::nullopt), + "0x016345785d8a0000", data_, false, std::nullopt), "0x04", "", "", nullptr); bool callback_called = false; @@ -1508,7 +1509,7 @@ TEST_F(EthTxManagerUnitTest, auto tx_data = mojom::TxData1559::New( mojom::TxData::New("0x1", "", "", "0xbe862ad9abfe6f22bcb087716c7d89a26051f74c", - "0x016345785d8a0000", data_, false, absl::nullopt), + "0x016345785d8a0000", data_, false, std::nullopt), "0x04", "", "", nullptr); bool callback_called = false; @@ -1566,7 +1567,7 @@ TEST_F(EthTxManagerUnitTest, AddUnapproved1559TransactionFeeHistoryFailed) { auto tx_data = mojom::TxData1559::New( mojom::TxData::New("0x1", "", "0x9604", "0xbe862ad9abfe6f22bcb087716c7d89a26051f74c", - "0x016345785d8a0000", data_, false, absl::nullopt), + "0x016345785d8a0000", data_, false, std::nullopt), "0x04", "", "", nullptr); bool callback_called = false; @@ -1584,7 +1585,7 @@ TEST_F(EthTxManagerUnitTest, auto tx_data = mojom::TxData1559::New( mojom::TxData::New( "0x1", "", "", "0xbe862ad9abfe6f22bcb087716c7d89a26051f74c", - "0x016345785d8a0000", std::vector(), false, absl::nullopt), + "0x016345785d8a0000", std::vector(), false, std::nullopt), "0x04", "", "", nullptr); bool callback_called = false; @@ -1620,7 +1621,7 @@ TEST_F(EthTxManagerUnitTest, auto tx_data = mojom::TxData1559::New( mojom::TxData::New( "0x1", "", gas_limit, "0xbe862ad9abfe6f22bcb087716c7d89a26051f74c", - "0x016345785d8a0000", std::vector(), false, absl::nullopt), + "0x016345785d8a0000", std::vector(), false, std::nullopt), "0x04", "0x77359400" /* 2 Gwei */, "0xb2d05e000" /* 48 Gwei */, nullptr); bool callback_called = false; @@ -1651,7 +1652,7 @@ TEST_F(EthTxManagerUnitTest, auto tx_data = mojom::TxData1559::New( mojom::TxData::New( "0x1", "", "", "0xbe862ad9abfe6f22bcb087716c7d89a26051f74c", - "0x016345785d8a0000", std::vector(), false, absl::nullopt), + "0x016345785d8a0000", std::vector(), false, std::nullopt), "0x04", "0x77359400" /* 2 Gwei */, "0xb2d05e000" /* 48 Gwei */, nullptr); bool callback_called = false; std::string tx_meta_id; @@ -1682,7 +1683,7 @@ TEST_F(EthTxManagerUnitTest, auto tx_data = mojom::TxData1559::New( mojom::TxData::New( "0x1", "", gas_limit, "0xbe862ad9abfe6f22bcb087716c7d89a26051f74c", - "0x016345785d8a0000", std::vector(), false, absl::nullopt), + "0x016345785d8a0000", std::vector(), false, std::nullopt), "0x04", "", "", nullptr); bool callback_called = false; @@ -1716,7 +1717,7 @@ TEST_F(EthTxManagerUnitTest, SetGasFeeAndLimitForUnapprovedTransaction) { auto tx_data = mojom::TxData1559::New( mojom::TxData::New("0x1", "", "", "0xbe862ad9abfe6f22bcb087716c7d89a26051f74c", - "0x016345785d8a0000", data_, false, absl::nullopt), + "0x016345785d8a0000", data_, false, std::nullopt), "0x04", "", "", nullptr); bool callback_called = false; std::string tx_meta_id; @@ -1837,7 +1838,7 @@ TEST_F(EthTxManagerUnitTest, auto tx_data = mojom::TxData::New("0x06", "0x09184e72a000", "0x0974", "0xbe862ad9abfe6f22bcb087716c7d89a26051f74c", - "0x016345785d8a0000", data_, false, absl::nullopt); + "0x016345785d8a0000", data_, false, std::nullopt); bool callback_called = false; std::string tx_meta_id; @@ -1877,7 +1878,7 @@ TEST_F(EthTxManagerUnitTest, TestSubmittedToConfirmed) { meta.set_status(mojom::TransactionStatus::Submitted); ASSERT_TRUE(eth_tx_manager()->tx_state_manager_->AddOrUpdateTx(meta)); - eth_tx_manager()->UpdatePendingTransactions(absl::nullopt); + eth_tx_manager()->UpdatePendingTransactions(std::nullopt); url_loader_factory_.SetInterceptor(base::BindLambdaForTesting( [this](const network::ResourceRequest& request) { @@ -2176,7 +2177,7 @@ TEST_F(EthTxManagerUnitTest, RetryTransaction) { auto tx_data = mojom::TxData::New("0x07", "0x17fcf18322", "0x0974", "0xbe862ad9abfe6f22bcb087716c7d89a26051f74c", - "0x016345785d8a0000", data_, false, absl::nullopt); + "0x016345785d8a0000", data_, false, std::nullopt); auto tx = EthTransaction::FromTxData(tx_data, false); ASSERT_TRUE(tx); @@ -2206,7 +2207,7 @@ TEST_F(EthTxManagerUnitTest, RetryTransaction) { auto tx_data1559 = mojom::TxData1559::New( mojom::TxData::New("0x08", "", "0x0974", "0xbe862ad9abfe6f22bcb087716c7d89a26051f74c", - "0x016345785d8a0000", data_, false, absl::nullopt), + "0x016345785d8a0000", data_, false, std::nullopt), "0x539", "0x77359400" /* 2 Gwei */, "0xb2d05e000" /* 48 Gwei */, nullptr); auto tx1559 = Eip1559Transaction::FromTxData(tx_data1559, false); @@ -2383,7 +2384,7 @@ TEST_F(EthTxManagerUnitTest, Reset) { meta.set_status(mojom::TransactionStatus::Unapproved); auto tx_data = mojom::TxData::New( "0x1", "0x1", "0x0974", "0xbe862ad9abfe6f22bcb087716c7d89a26051f74c", - "0x016345785d8a0000", std::vector(), false, absl::nullopt); + "0x016345785d8a0000", std::vector(), false, std::nullopt); auto tx = EthTransaction::FromTxData(tx_data, false); meta.set_tx(std::make_unique(*tx)); ASSERT_TRUE(eth_tx_manager()->tx_state_manager_->AddOrUpdateTx(meta)); @@ -2402,7 +2403,7 @@ TEST_F(EthTxManagerUnitTest, Reset) { base::RunLoop run_loop; static_cast(tx_service_->GetDelegateForTesting()) ->store_->Get("transactions", base::BindLambdaForTesting( - [&](absl::optional value) { + [&](std::optional value) { EXPECT_FALSE(value); run_loop.Quit(); })); diff --git a/components/brave_wallet/browser/eth_tx_meta.cc b/components/brave_wallet/browser/eth_tx_meta.cc index fbeb2973704..d8a65d275c9 100644 --- a/components/brave_wallet/browser/eth_tx_meta.cc +++ b/components/brave_wallet/browser/eth_tx_meta.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/eth_tx_meta.h" +#include #include #include @@ -22,18 +23,18 @@ namespace brave_wallet { namespace { -absl::optional GetFinalRecipient( +std::optional GetFinalRecipient( const std::string& chain_id, const std::string& base_to, mojom::TransactionType tx_type, const std::vector& tx_args) { if (tx_type == mojom::TransactionType::ETHFilForwarderTransfer) { if (tx_args.empty()) { - return absl::nullopt; + return std::nullopt; } std::vector bytes; if (!PrefixedHexStringToBytes(tx_args.at(0), &bytes)) { - return absl::nullopt; + return std::nullopt; } std::string fil_chain_id = chain_id == mojom::kFilecoinEthereumMainnetChainId @@ -41,14 +42,14 @@ absl::optional GetFinalRecipient( : mojom::kFilecoinTestnet; auto fil_address = FilAddress::FromBytes(fil_chain_id, bytes); if (fil_address.IsEmpty()) { - return absl::nullopt; + return std::nullopt; } return fil_address.EncodeAsString(); } if (tx_type == mojom::TransactionType::ERC20Transfer) { if (tx_args.empty()) { - return absl::nullopt; + return std::nullopt; } return tx_args.at(0); } @@ -56,7 +57,7 @@ absl::optional GetFinalRecipient( if (tx_type == mojom::TransactionType::ERC721TransferFrom || tx_type == mojom::TransactionType::ERC721SafeTransferFrom) { if (tx_args.size() < 2) { - return absl::nullopt; + return std::nullopt; } // (address owner, address to, uint256 tokenId) return tx_args.at(1); @@ -121,7 +122,7 @@ mojom::TransactionInfoPtr EthTxMeta::ToTransactionInfo() const { } auto tx_info = GetTransactionInfoFromData(data); - absl::optional final_recepient; + std::optional final_recepient; if (!tx_info) { LOG(ERROR) << "Error parsing transaction data: " << ToHex(data); } else { @@ -129,7 +130,7 @@ mojom::TransactionInfoPtr EthTxMeta::ToTransactionInfo() const { final_recepient = GetFinalRecipient(chain_id, tx_->to().ToChecksumAddress(), tx_type, tx_args); } - absl::optional signed_transaction; + std::optional signed_transaction; if (tx_->IsSigned()) { signed_transaction = tx_->GetSignedTransaction(); } diff --git a/components/brave_wallet/browser/eth_tx_meta_unittest.cc b/components/brave_wallet/browser/eth_tx_meta_unittest.cc index 41763114dd1..77ff4638792 100644 --- a/components/brave_wallet/browser/eth_tx_meta_unittest.cc +++ b/components/brave_wallet/browser/eth_tx_meta_unittest.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/eth_tx_meta.h" +#include #include #include @@ -30,7 +31,7 @@ TEST(EthTxMetaUnitTest, ToTransactionInfo) { *EthTransaction::FromTxData(mojom::TxData::New( "0x09", "0x4a817c800", "0x5208", "0x3535353535353535353535353535353535353535", "0x0de0b6b3a7640000", - std::vector(), false, absl::nullopt))); + std::vector(), false, std::nullopt))); EthTxMeta meta(eth_account_id, std::move(tx)); base::Time::Exploded x{1981, 3, 0, 1, 2}; base::Time confirmed_time = meta.confirmed_time(); @@ -76,7 +77,7 @@ TEST(EthTxMetaUnitTest, ToTransactionInfo) { mojom::TxData::New("0x09", "0x4a817c800", "0x5208", "0x3535353535353535353535353535353535353535", "0x0de0b6b3a7640000", std::vector(), - false, absl::nullopt), + false, std::nullopt), 0x3)); auto* access_list = tx1->access_list(); Eip2930Transaction::AccessListItem item_a; @@ -121,7 +122,7 @@ TEST(EthTxMetaUnitTest, ToTransactionInfo) { mojom::TxData::New("0x09", "0x4a817c800", "0x5208", "0x3535353535353535353535353535353535353535", "0x0de0b6b3a7640000", std::vector(), - false, absl::nullopt), + false, std::nullopt), "0x3", "0x1E", "0x32", mojom::GasEstimation1559::New( "0x3b9aca00" /* Hex of 1 * 1e9 */, @@ -205,7 +206,7 @@ TEST(EthTxMetaUnitTest, ToTransactionInfo_FinalRecipientTest) { mojom::TxData::New("0x09", "0x4a817c800", "0x5208", "0x3535353535353535353535353535353535353535", "0x0de0b6b3a7640000", data, false, - absl::nullopt), + std::nullopt), mojom::kFilecoinEthereumMainnetChainId, "0x1E", "0x32", mojom::GasEstimation1559::New( "0x3b9aca00" /* Hex of 1 * 1e9 */, @@ -235,7 +236,7 @@ TEST(EthTxMetaUnitTest, ToTransactionInfo_FinalRecipientTest) { mojom::TxData::New("0x09", "0x4a817c800", "0x5208", "0x3535353535353535353535353535353535353535", "0x0de0b6b3a7640000", encoded_data, false, - absl::nullopt), + std::nullopt), mojom::kGoerliChainId, "0x1E", "0x32", mojom::GasEstimation1559::New( "0x3b9aca00" /* Hex of 1 * 1e9 */, @@ -266,7 +267,7 @@ TEST(EthTxMetaUnitTest, ToTransactionInfo_FinalRecipientTest) { mojom::TxData::New("0x09", "0x4a817c800", "0x5208", "0x3535353535353535353535353535353535353535", "0x0de0b6b3a7640000", encoded_data, false, - absl::nullopt), + std::nullopt), mojom::kGoerliChainId, "0x1E", "0x32", mojom::GasEstimation1559::New( "0x3b9aca00" /* Hex of 1 * 1e9 */, @@ -297,7 +298,7 @@ TEST(EthTxMetaUnitTest, ToTransactionInfo_FinalRecipientTest) { mojom::TxData::New("0x09", "0x4a817c800", "0x5208", "0x3535353535353535353535353535353535353535", "0x0de0b6b3a7640000", encoded_data, false, - absl::nullopt), + std::nullopt), mojom::kGoerliChainId, "0x1E", "0x32", mojom::GasEstimation1559::New( "0x3b9aca00" /* Hex of 1 * 1e9 */, @@ -321,7 +322,7 @@ TEST(EthTxMetaUnitTest, ToTransactionInfo_FinalRecipientTest) { mojom::TxData::New("0x09", "0x4a817c800", "0x5208", "0x3535353535353535353535353535353535353535", "0x0de0b6b3a7640000", std::vector(), - false, absl::nullopt), + false, std::nullopt), mojom::kGoerliChainId, "0x1E", "0x32", mojom::GasEstimation1559::New( "0x3b9aca00" /* Hex of 1 * 1e9 */, diff --git a/components/brave_wallet/browser/eth_tx_state_manager.cc b/components/brave_wallet/browser/eth_tx_state_manager.cc index bb2c1e8cb46..ba4162350bc 100644 --- a/components/brave_wallet/browser/eth_tx_state_manager.cc +++ b/components/brave_wallet/browser/eth_tx_state_manager.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/eth_tx_state_manager.h" +#include #include #include "base/logging.h" @@ -57,7 +58,7 @@ std::unique_ptr EthTxStateManager::ValueToTxMeta( if (!tx_receipt) { return nullptr; } - absl::optional tx_receipt_from_value = + std::optional tx_receipt_from_value = ValueToTransactionReceipt(*tx_receipt); if (!tx_receipt_from_value) { return nullptr; @@ -69,19 +70,19 @@ std::unique_ptr EthTxStateManager::ValueToTxMeta( return nullptr; } - absl::optional sign_only = value.FindBool("sign_only"); + std::optional sign_only = value.FindBool("sign_only"); if (sign_only) { meta->set_sign_only(*sign_only); } - absl::optional type = tx->FindInt("type"); + std::optional type = tx->FindInt("type"); if (!type) { return nullptr; } switch (static_cast(*type)) { case 0: { - absl::optional tx_from_value = + std::optional tx_from_value = EthTransaction::FromValue(*tx); if (!tx_from_value) { return nullptr; @@ -90,7 +91,7 @@ std::unique_ptr EthTxStateManager::ValueToTxMeta( break; } case 1: { - absl::optional tx_from_value = + std::optional tx_from_value = Eip2930Transaction::FromValue(*tx); if (!tx_from_value) { return nullptr; @@ -99,7 +100,7 @@ std::unique_ptr EthTxStateManager::ValueToTxMeta( break; } case 2: { - absl::optional tx_from_value = + std::optional tx_from_value = Eip1559Transaction::FromValue(*tx); if (!tx_from_value) { return nullptr; @@ -116,7 +117,7 @@ std::unique_ptr EthTxStateManager::ValueToTxMeta( } std::string EthTxStateManager::GetTxPrefPathPrefix( - const absl::optional& chain_id) { + const std::optional& chain_id) { if (chain_id.has_value()) { return base::StrCat( {kEthereumPrefKey, ".", diff --git a/components/brave_wallet/browser/eth_tx_state_manager.h b/components/brave_wallet/browser/eth_tx_state_manager.h index ff7f94bb315..bffacb34ead 100644 --- a/components/brave_wallet/browser/eth_tx_state_manager.h +++ b/components/brave_wallet/browser/eth_tx_state_manager.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_ETH_TX_STATE_MANAGER_H_ #include +#include #include #include #include @@ -15,7 +16,6 @@ #include "brave/components/brave_wallet/browser/tx_state_manager.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" #include "brave/components/brave_wallet/common/eth_address.h" -#include "third_party/abseil-cpp/absl/types/optional.h" class PrefService; @@ -50,7 +50,7 @@ class EthTxStateManager : public TxStateManager { std::unique_ptr ValueToTxMeta( const base::Value::Dict& value) override; std::string GetTxPrefPathPrefix( - const absl::optional& chain_id) override; + const std::optional& chain_id) override; }; } // namespace brave_wallet diff --git a/components/brave_wallet/browser/eth_tx_state_manager_unittest.cc b/components/brave_wallet/browser/eth_tx_state_manager_unittest.cc index 639e9988294..0121c15517b 100644 --- a/components/brave_wallet/browser/eth_tx_state_manager_unittest.cc +++ b/components/brave_wallet/browser/eth_tx_state_manager_unittest.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_wallet/browser/eth_tx_state_manager.h" #include +#include #include #include "base/files/scoped_temp_dir.h" @@ -72,7 +73,7 @@ TEST_F(EthTxStateManagerUnitTest, TxMetaAndValue) { *EthTransaction::FromTxData(mojom::TxData::New( "0x09", "0x4a817c800", "0x5208", "0x3535353535353535353535353535353535353535", "0x0de0b6b3a7640000", - std::vector(), false, absl::nullopt))); + std::vector(), false, std::nullopt))); EthTxMeta meta(eth_account_id, std::move(tx)); meta.set_id(TxMeta::GenerateMetaID()); meta.set_status(mojom::TransactionStatus::Submitted); @@ -128,7 +129,7 @@ TEST_F(EthTxStateManagerUnitTest, TxMetaAndValue) { mojom::TxData::New("0x09", "0x4a817c800", "0x5208", "0x3535353535353535353535353535353535353535", "0x0de0b6b3a7640000", std::vector(), - false, absl::nullopt), + false, std::nullopt), 0x3)); auto* access_list = tx1->access_list(); Eip2930Transaction::AccessListItem item_a; @@ -154,7 +155,7 @@ TEST_F(EthTxStateManagerUnitTest, TxMetaAndValue) { mojom::TxData::New("0x09", "0x4a817c800", "0x5208", "0x3535353535353535353535353535353535353535", "0x0de0b6b3a7640000", std::vector(), - false, absl::nullopt), + false, std::nullopt), "0x3", "0x1E", "0x32", mojom::GasEstimation1559::New( "0x3b9aca00" /* Hex of 1 * 1e9 */, @@ -178,7 +179,7 @@ TEST_F(EthTxStateManagerUnitTest, TxMetaAndValue) { *EthTransaction::FromTxData(mojom::TxData::New( "0x09", "0x4a817c800", "0x5208", "0x3535353535353535353535353535353535353535", "0x0de0b6b3a7640000", - std::vector(), false, absl::nullopt))); + std::vector(), false, std::nullopt))); EthTxMeta meta3(eth_account_id, std::move(tx3)); meta3.set_sign_only(true); base::Value::Dict meta_value3 = meta3.ToValue(); @@ -203,7 +204,7 @@ TEST_F(EthTxStateManagerUnitTest, GetTxPrefPathPrefix) { "ethereum.http://localhost:7545/", eth_tx_state_manager_->GetTxPrefPathPrefix(mojom::kLocalhostChainId)); EXPECT_EQ("ethereum", - eth_tx_state_manager_->GetTxPrefPathPrefix(absl::nullopt)); + eth_tx_state_manager_->GetTxPrefPathPrefix(std::nullopt)); } } // namespace brave_wallet diff --git a/components/brave_wallet/browser/ethereum_keyring.cc b/components/brave_wallet/browser/ethereum_keyring.cc index 21a0be5bb5c..05b6b94af19 100644 --- a/components/brave_wallet/browser/ethereum_keyring.cc +++ b/components/brave_wallet/browser/ethereum_keyring.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_wallet/browser/ethereum_keyring.h" +#include + #include "base/base64.h" #include "base/strings/string_number_conversions.h" #include "brave/components/brave_wallet/browser/eth_transaction.h" @@ -150,7 +152,7 @@ bool EthereumKeyring::GetPublicKeyFromX25519_XSalsa20_Poly1305( return true; } -absl::optional> +std::optional> EthereumKeyring::DecryptCipherFromX25519_XSalsa20_Poly1305( const std::string& version, const std::vector& nonce, @@ -159,7 +161,7 @@ EthereumKeyring::DecryptCipherFromX25519_XSalsa20_Poly1305( const std::string& address) { HDKey* hd_key = static_cast(GetHDKeyFromAddress(address)); if (!hd_key) { - return absl::nullopt; + return std::nullopt; } return hd_key->DecryptCipherFromX25519_XSalsa20_Poly1305( version, nonce, ephemeral_public_key, ciphertext); diff --git a/components/brave_wallet/browser/ethereum_keyring.h b/components/brave_wallet/browser/ethereum_keyring.h index 0087952793a..ac397e3d4e6 100644 --- a/components/brave_wallet/browser/ethereum_keyring.h +++ b/components/brave_wallet/browser/ethereum_keyring.h @@ -7,12 +7,12 @@ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_ETHEREUM_KEYRING_H_ #include +#include #include #include #include "brave/components/brave_wallet/browser/hd_keyring.h" #include "brave/components/brave_wallet/common/brave_wallet_types.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_wallet { @@ -44,8 +44,7 @@ class EthereumKeyring : public HDKeyring { bool GetPublicKeyFromX25519_XSalsa20_Poly1305(const std::string& address, std::string* key); - absl::optional> - DecryptCipherFromX25519_XSalsa20_Poly1305( + std::optional> DecryptCipherFromX25519_XSalsa20_Poly1305( const std::string& version, const std::vector& nonce, const std::vector& ephemeral_public_key, diff --git a/components/brave_wallet/browser/ethereum_keyring_unittest.cc b/components/brave_wallet/browser/ethereum_keyring_unittest.cc index 9c2355d9ce1..9c7e4553bf1 100644 --- a/components/brave_wallet/browser/ethereum_keyring_unittest.cc +++ b/components/brave_wallet/browser/ethereum_keyring_unittest.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_wallet/browser/ethereum_keyring.h" #include +#include #include #include "base/base64.h" @@ -90,7 +91,7 @@ TEST(EthereumKeyringUnitTest, SignTransaction) { EthTransaction tx = *EthTransaction::FromTxData(mojom::TxData::New( "0x09", "0x4a817c800", "0x5208", "0x3535353535353535353535353535353535353535", "0x0de0b6b3a7640000", - std::vector(), false, absl::nullopt)); + std::vector(), false, std::nullopt)); keyring.SignTransaction("0xDEADBEEFdeadbeefdeadbeefdeadbeefDEADBEEF", &tx, 0); EXPECT_FALSE(tx.IsSigned()); @@ -213,7 +214,7 @@ TEST(EthereumKeyringUnitTest, ImportedAccounts) { EthTransaction tx = *EthTransaction::FromTxData(mojom::TxData::New( "0x09", "0x4a817c800", "0x5208", "0x3535353535353535353535353535353535353535", "0x0de0b6b3a7640000", - std::vector(), false, absl::nullopt)); + std::vector(), false, std::nullopt)); keyring.SignTransaction("0xbE93f9BacBcFFC8ee6663f2647917ed7A20a57BB", &tx, 0); EXPECT_FALSE(tx.IsSigned()); @@ -288,7 +289,7 @@ TEST(EthereumKeyringUnitTest, DecryptCipherFromX25519_XSalsa20_Poly1305) { std::vector ephemeral_public_key(ephemeral_public_key_str.begin(), ephemeral_public_key_str.end()); - absl::optional> message_bytes; + std::optional> message_bytes; message_bytes = keyring.DecryptCipherFromX25519_XSalsa20_Poly1305( "x25519-xsalsa20-poly1305", nonce, ephemeral_public_key, ciphertext, keyring.GetAddress(0)); @@ -323,25 +324,25 @@ TEST(EthereumKeyringUnitTest, DecryptCipherFromX25519_XSalsa20_Poly1305) { EXPECT_EQ(keyring.DecryptCipherFromX25519_XSalsa20_Poly1305( "x25519-xsalsa20-poly1306", nonce, ephemeral_public_key, ciphertext, keyring.GetAddress(0)), - absl::nullopt); + std::nullopt); // Empty nonce EXPECT_EQ(keyring.DecryptCipherFromX25519_XSalsa20_Poly1305( "x25519-xsalsa20-poly1305", std::vector(), ephemeral_public_key, ciphertext, keyring.GetAddress(0)), - absl::nullopt); + std::nullopt); // Empty public key EXPECT_EQ(keyring.DecryptCipherFromX25519_XSalsa20_Poly1305( "x25519-xsalsa20-poly1305", nonce, std::vector(), ciphertext, keyring.GetAddress(0)), - absl::nullopt); + std::nullopt); // Empty ciphertext EXPECT_EQ(keyring.DecryptCipherFromX25519_XSalsa20_Poly1305( "x25519-xsalsa20-poly1305", nonce, ephemeral_public_key, std::vector(), keyring.GetAddress(0)), - absl::nullopt); + std::nullopt); // Wrong nonce std::vector bad_nonce = nonce; @@ -349,7 +350,7 @@ TEST(EthereumKeyringUnitTest, DecryptCipherFromX25519_XSalsa20_Poly1305) { EXPECT_EQ(keyring.DecryptCipherFromX25519_XSalsa20_Poly1305( "x25519-xsalsa20-poly1305", bad_nonce, ephemeral_public_key, ciphertext, keyring.GetAddress(0)), - absl::nullopt); + std::nullopt); // Wrong public key std::vector bad_ephemeral_public_key = ephemeral_public_key; @@ -357,7 +358,7 @@ TEST(EthereumKeyringUnitTest, DecryptCipherFromX25519_XSalsa20_Poly1305) { EXPECT_EQ(keyring.DecryptCipherFromX25519_XSalsa20_Poly1305( "x25519-xsalsa20-poly1305", nonce, bad_ephemeral_public_key, ciphertext, keyring.GetAddress(0)), - absl::nullopt); + std::nullopt); // Wrong ciphertext std::vector bad_ciphertext = ciphertext; @@ -365,7 +366,7 @@ TEST(EthereumKeyringUnitTest, DecryptCipherFromX25519_XSalsa20_Poly1305) { EXPECT_EQ(keyring.DecryptCipherFromX25519_XSalsa20_Poly1305( "x25519-xsalsa20-poly1305", nonce, ephemeral_public_key, bad_ciphertext, keyring.GetAddress(0)), - absl::nullopt); + std::nullopt); } } // namespace brave_wallet diff --git a/components/brave_wallet/browser/ethereum_provider_impl.cc b/components/brave_wallet/browser/ethereum_provider_impl.cc index 588f60996b6..91bf321dbd0 100644 --- a/components/brave_wallet/browser/ethereum_provider_impl.cc +++ b/components/brave_wallet/browser/ethereum_provider_impl.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/ethereum_provider_impl.h" +#include #include #include #include @@ -404,7 +405,7 @@ void EthereumProviderImpl::SignMessage(const std::string& address, IDS_BRAVE_WALLET_SIGN_MESSAGE_MISMATCH_ERR, l10n_util::GetStringUTF16(IDS_BRAVE_WALLET_ACCOUNT), base::ASCIIToUTF16(siwe_message->address)), - absl::nullopt)); + std::nullopt)); delegate_->ShowPanel(); return RejectMismatchError( std::move(id), @@ -427,7 +428,7 @@ void EthereumProviderImpl::SignMessage(const std::string& address, IDS_BRAVE_WALLET_SIGN_MESSAGE_MISMATCH_ERR, l10n_util::GetStringUTF16(IDS_BRAVE_WALLET_DOMAIN), base::ASCIIToUTF16(err_domain)), - absl::nullopt)); + std::nullopt)); delegate_->ShowPanel(); return RejectMismatchError( std::move(id), @@ -489,11 +490,10 @@ void EthereumProviderImpl::RecoverAddress(const std::string& message, false); } -void EthereumProviderImpl::EthSubscribe( - const std::string& event_type, - absl::optional filter, - RequestCallback callback, - base::Value id) { +void EthereumProviderImpl::EthSubscribe(const std::string& event_type, + std::optional filter, + RequestCallback callback, + base::Value id) { const auto generateHexBytes = [](std::vector& subscriptions) { std::vector bytes(16); crypto::RandBytes(&bytes.front(), bytes.size()); @@ -629,7 +629,7 @@ void EthereumProviderImpl::ContinueDecryptWithSanitizedJson( return; } - absl::optional> unsafe_message_bytes = + std::optional> unsafe_message_bytes = keyring_service_ ->DecryptCipherFromX25519_XSalsa20_Poly1305ByDefaultKeyring( account_id, version, nonce, ephemeral_public_key, ciphertext); @@ -738,7 +738,7 @@ void EthereumProviderImpl::OnSignMessageRequestProcessed( bool is_eip712, bool approved, mojom::ByteArrayStringUnionPtr signature, - const absl::optional& error) { + const std::optional& error) { bool reject = false; if (error && !error->empty()) { base::Value formed_response = GetProviderErrorDictionary( @@ -1116,7 +1116,7 @@ void EthereumProviderImpl::RequestEthereumPermissions( } OnRequestEthereumPermissions(std::move(callback), std::move(id), method, origin, RequestPermissionsError::kInternal, - absl::nullopt); + std::nullopt); return; } @@ -1124,7 +1124,7 @@ void EthereumProviderImpl::RequestEthereumPermissions( if (pending_request_ethereum_permissions_callback_) { OnRequestEthereumPermissions( std::move(callback), std::move(id), method, origin, - RequestPermissionsError::kRequestInProgress, absl::nullopt); + RequestPermissionsError::kRequestInProgress, std::nullopt); return; } pending_request_ethereum_permissions_callback_ = std::move(callback); @@ -1143,7 +1143,7 @@ void EthereumProviderImpl::RequestEthereumPermissions( if (!success) { OnRequestEthereumPermissions(std::move(callback), std::move(id), method, origin, RequestPermissionsError::kInternal, - absl::nullopt); + std::nullopt); return; } @@ -1180,7 +1180,7 @@ void EthereumProviderImpl::OnRequestEthereumPermissions( const std::string& method, const url::Origin& origin, RequestPermissionsError error, - const absl::optional>& allowed_accounts) { + const std::optional>& allowed_accounts) { base::Value formed_response; bool success = error == RequestPermissionsError::kNone; @@ -1230,7 +1230,7 @@ void EthereumProviderImpl::OnRequestEthereumPermissions( first_allowed_account, true); } -absl::optional> +std::optional> EthereumProviderImpl::GetAllowedAccounts(bool include_accounts_when_locked) { std::vector addresses; for (const auto& account_info : keyring_service_->GetAllAccountInfos()) { @@ -1247,7 +1247,7 @@ EthereumProviderImpl::GetAllowedAccounts(bool include_accounts_when_locked) { delegate_->GetAllowedAccounts(mojom::CoinType::ETH, addresses); if (!allowed_accounts) { - return absl::nullopt; + return std::nullopt; } std::vector filtered_accounts; @@ -1370,7 +1370,7 @@ void EthereumProviderImpl::Init( void EthereumProviderImpl::ChainChangedEvent( const std::string& chain_id, mojom::CoinType coin, - const absl::optional& origin) { + const std::optional& origin) { if (!events_listener_.is_bound() || coin != mojom::CoinType::ETH) { return; } diff --git a/components/brave_wallet/browser/ethereum_provider_impl.h b/components/brave_wallet/browser/ethereum_provider_impl.h index 112d6adfe58..ea3ef9a0eb2 100644 --- a/components/brave_wallet/browser/ethereum_provider_impl.h +++ b/components/brave_wallet/browser/ethereum_provider_impl.h @@ -8,6 +8,7 @@ #include #include +#include #include #include @@ -63,7 +64,7 @@ class EthereumProviderImpl final : public mojom::EthereumProvider, RequestCallback callback, base::Value id); void Web3ClientVersion(RequestCallback callback, base::Value id); - absl::optional> GetAllowedAccounts( + std::optional> GetAllowedAccounts( bool include_accounts_when_locked); void AddEthereumChain(const std::string& json_payload, RequestCallback callback, @@ -85,7 +86,7 @@ class EthereumProviderImpl final : public mojom::EthereumProvider, base::Value id); void EthSubscribe(const std::string& event_type, - absl::optional filter, + std::optional filter, RequestCallback callback, base::Value id); void EthUnsubscribe(const std::string& subscription_id, @@ -183,7 +184,7 @@ class EthereumProviderImpl final : public mojom::EthereumProvider, // mojom::JsonRpcServiceObserver void ChainChangedEvent(const std::string& chain_id, mojom::CoinType coin, - const absl::optional& origin) override; + const std::optional& origin) override; void OnAddEthereumChainRequestCompleted(const std::string& chain_id, const std::string& error) override; void OnIsEip1559Changed(const std::string& chain_id, @@ -246,7 +247,7 @@ class EthereumProviderImpl final : public mojom::EthereumProvider, bool is_eip712, bool approved, mojom::ByteArrayStringUnionPtr signature, - const absl::optional& error); + const std::optional& error); // KeyringServiceObserverBase: void Locked() override; @@ -268,7 +269,7 @@ class EthereumProviderImpl final : public mojom::EthereumProvider, const std::string& method, const url::Origin& origin, RequestPermissionsError error, - const absl::optional>& allowed_accounts); + const std::optional>& allowed_accounts); void OnSendRawTransaction(RequestCallback callback, base::Value id, const std::string& tx_hash, diff --git a/components/brave_wallet/browser/fil_requests.cc b/components/brave_wallet/browser/fil_requests.cc index bd00f148a09..587865c9ddc 100644 --- a/components/brave_wallet/browser/fil_requests.cc +++ b/components/brave_wallet/browser/fil_requests.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/fil_requests.h" +#include #include #include "base/json/json_reader.h" @@ -100,11 +101,11 @@ std::string getStateSearchMsgLimited(const std::string& cid, uint64_t period) { return result; } -absl::optional getSendTransaction(const std::string& signed_tx) { +std::optional getSendTransaction(const std::string& signed_tx) { base::Value::List params; auto signed_tx_value = FilTransaction::DeserializeSignedTx(signed_tx); if (!signed_tx_value || !signed_tx_value->is_dict()) { - return absl::nullopt; + return std::nullopt; } params.Append(std::move(signed_tx_value.value())); diff --git a/components/brave_wallet/browser/fil_requests.h b/components/brave_wallet/browser/fil_requests.h index 9431f5018b1..69f0f211ad7 100644 --- a/components/brave_wallet/browser/fil_requests.h +++ b/components/brave_wallet/browser/fil_requests.h @@ -6,10 +6,10 @@ #ifndef BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_FIL_REQUESTS_H_ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_FIL_REQUESTS_H_ +#include #include #include "base/values.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_wallet { @@ -34,7 +34,7 @@ std::string getChainHead(); // Returns Filecoin.StateSearchMsgLimited request. std::string getStateSearchMsgLimited(const std::string& cid, uint64_t period); // Returns Filecoin.MPoolPush request. -absl::optional getSendTransaction(const std::string& signed_tx); +std::optional getSendTransaction(const std::string& signed_tx); } // namespace fil diff --git a/components/brave_wallet/browser/fil_response_parser.cc b/components/brave_wallet/browser/fil_response_parser.cc index c773f668f76..ea78eb3c4e7 100644 --- a/components/brave_wallet/browser/fil_response_parser.cc +++ b/components/brave_wallet/browser/fil_response_parser.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_wallet/browser/fil_response_parser.h" #include +#include #include #include "base/strings/string_number_conversions.h" @@ -14,27 +15,27 @@ namespace brave_wallet { -absl::optional ParseFilGetBalance(const base::Value& json_value) { +std::optional ParseFilGetBalance(const base::Value& json_value) { return ParseSingleStringResult(json_value); } -absl::optional ParseFilGetTransactionCount( +std::optional ParseFilGetTransactionCount( const base::Value& json_value) { if (json_value.is_none()) { - return absl::nullopt; + return std::nullopt; } auto count_string = ParseSingleStringResult(json_value); if (!count_string) { - return absl::nullopt; + return std::nullopt; } if (count_string->empty()) { - return absl::nullopt; + return std::nullopt; } uint64_t count = 0; if (!base::StringToUint64(*count_string, &count)) { - return absl::nullopt; + return std::nullopt; } return count; } diff --git a/components/brave_wallet/browser/fil_response_parser.h b/components/brave_wallet/browser/fil_response_parser.h index a5f549a1171..216a2a1a1aa 100644 --- a/components/brave_wallet/browser/fil_response_parser.h +++ b/components/brave_wallet/browser/fil_response_parser.h @@ -6,21 +6,22 @@ #ifndef BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_FIL_RESPONSE_PARSER_H_ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_FIL_RESPONSE_PARSER_H_ +#include #include #include #include "base/values.h" #include "brave/components/brave_wallet/common/brave_wallet_types.h" -// TODO(apaymyshev): refactor utility methods to return absl::optional instead +// TODO(apaymyshev): refactor utility methods to return std::optional instead // of bool + out-parameter. namespace brave_wallet { // Returns the balance of the account of given address. -absl::optional ParseFilGetBalance(const base::Value& json_value); +std::optional ParseFilGetBalance(const base::Value& json_value); // Returns the transaction count of given address. -absl::optional ParseFilGetTransactionCount( +std::optional ParseFilGetTransactionCount( const base::Value& json_value); // Returns Gas estimation values. bool ParseFilEstimateGas(const base::Value& json_value, diff --git a/components/brave_wallet/browser/fil_transaction.cc b/components/brave_wallet/browser/fil_transaction.cc index d0e32fa041a..d5b38c90c58 100644 --- a/components/brave_wallet/browser/fil_transaction.cc +++ b/components/brave_wallet/browser/fil_transaction.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_wallet/browser/fil_transaction.h" #include +#include #include #include @@ -34,7 +35,7 @@ bool IsNumericString(const std::string& value) { FilTransaction::FilTransaction() = default; FilTransaction::FilTransaction(const FilTransaction&) = default; -FilTransaction::FilTransaction(absl::optional nonce, +FilTransaction::FilTransaction(std::optional nonce, const std::string& gas_premium, const std::string& gas_fee_cap, int64_t gas_limit, @@ -66,7 +67,7 @@ bool FilTransaction::operator!=(const FilTransaction& other) const { } // static -absl::optional FilTransaction::FromTxData( +std::optional FilTransaction::FromTxData( bool is_mainnet, const mojom::FilTxDataPtr& tx_data) { FilTransaction tx; @@ -79,35 +80,35 @@ absl::optional FilTransaction::FromTxData( if (address.IsEmpty()) { address = FilAddress::FromFEVMAddress(is_mainnet, tx_data->to); if (address.IsEmpty()) { - return absl::nullopt; + return std::nullopt; } } tx.to_ = address; if (tx_data->value.empty() || !IsNumericString(tx_data->value)) { - return absl::nullopt; + return std::nullopt; } tx.set_value(tx_data->value); if (!IsNumericString(tx_data->gas_fee_cap)) { - return absl::nullopt; + return std::nullopt; } tx.set_fee_cap(tx_data->gas_fee_cap); if (!IsNumericString(tx_data->gas_premium)) { - return absl::nullopt; + return std::nullopt; } tx.set_gas_premium(tx_data->gas_premium); if (!IsNumericString(tx_data->max_fee)) { - return absl::nullopt; + return std::nullopt; } tx.set_max_fee(tx_data->max_fee); int64_t gas_limit = 0; if (!tx_data->gas_limit.empty()) { if (!base::StringToInt64(tx_data->gas_limit, &gas_limit)) { - return absl::nullopt; + return std::nullopt; } } tx.set_gas_limit(gas_limit); @@ -128,54 +129,54 @@ base::Value::Dict FilTransaction::ToValue() const { } // static -absl::optional FilTransaction::FromValue( +std::optional FilTransaction::FromValue( const base::Value::Dict& value) { FilTransaction tx; const std::string* nonce_value = value.FindString("Nonce"); if (!nonce_value) { - return absl::nullopt; + return std::nullopt; } if (!nonce_value->empty()) { uint64_t nonce = 0; if (!base::StringToUint64(*nonce_value, &nonce)) { - return absl::nullopt; + return std::nullopt; } tx.nonce_ = nonce; } const std::string* gas_premium = value.FindString("GasPremium"); if (!gas_premium) { - return absl::nullopt; + return std::nullopt; } tx.gas_premium_ = *gas_premium; const std::string* gas_fee_cap = value.FindString("GasFeeCap"); if (!gas_fee_cap) { - return absl::nullopt; + return std::nullopt; } tx.gas_fee_cap_ = *gas_fee_cap; const std::string* max_fee = value.FindString("MaxFee"); if (!max_fee) { - return absl::nullopt; + return std::nullopt; } tx.max_fee_ = *max_fee; const std::string* gas_limit = value.FindString("GasLimit"); if (!gas_limit || !base::StringToInt64(*gas_limit, &tx.gas_limit_)) { - return absl::nullopt; + return std::nullopt; } const std::string* to = value.FindString("To"); if (!to) { - return absl::nullopt; + return std::nullopt; } tx.to_ = FilAddress::FromAddress(*to); const std::string* tx_value = value.FindString("Value"); if (!tx_value) { - return absl::nullopt; + return std::nullopt; } tx.value_ = *tx_value; return tx; @@ -204,18 +205,18 @@ base::Value FilTransaction::GetMessageToSign(const FilAddress& from) const { return base::Value(std::move(value)); } -absl::optional FilTransaction::GetMessageToSignJson( +std::optional FilTransaction::GetMessageToSignJson( const FilAddress& from) const { std::string json; if (!base::JSONWriter::Write(GetMessageToSign(from), &json)) { - return absl::nullopt; + return std::nullopt; } return ConvertMesssageStringFieldsToInt64("", json); } // static -absl::optional FilTransaction::ConvertMesssageStringFieldsToInt64( +std::optional FilTransaction::ConvertMesssageStringFieldsToInt64( const std::string& path, const std::string& json) { std::string converted_json = @@ -228,20 +229,20 @@ absl::optional FilTransaction::ConvertMesssageStringFieldsToInt64( path + "/Method", converted_json.c_str(), true) .c_str(); if (converted_json.empty()) { - return absl::nullopt; + return std::nullopt; } return converted_json; } // static -absl::optional FilTransaction::ConvertSignedTxStringFieldsToInt64( +std::optional FilTransaction::ConvertSignedTxStringFieldsToInt64( const std::string& path, const std::string& json) { return ConvertMesssageStringFieldsToInt64(path + "/Message", json); } // static -absl::optional FilTransaction::DeserializeSignedTx( +std::optional FilTransaction::DeserializeSignedTx( const std::string& signed_tx) { std::string json = json::convert_int64_value_to_string("/Message/GasLimit", signed_tx, true) @@ -254,7 +255,7 @@ absl::optional FilTransaction::DeserializeSignedTx( } // https://spec.filecoin.io/algorithms/crypto/signatures/#section-algorithms.crypto.signatures -absl::optional FilTransaction::GetSignedTransaction( +std::optional FilTransaction::GetSignedTransaction( const FilAddress& from, const std::vector& private_key) const { DCHECK(!from.IsEmpty()); @@ -262,7 +263,7 @@ absl::optional FilTransaction::GetSignedTransaction( auto message = GetMessageToSign(from); auto message_json = GetMessageToSignJson(from); if (!message_json) { - return absl::nullopt; + return std::nullopt; } base::Value::Dict signature; { @@ -270,7 +271,7 @@ absl::optional FilTransaction::GetSignedTransaction( from.network() == mojom::kFilecoinMainnet, *message_json, rust::Slice{private_key.data(), private_key.size()})); if (data.empty()) { - return absl::nullopt; + return std::nullopt; } signature.Set("Data", data); } @@ -285,7 +286,7 @@ absl::optional FilTransaction::GetSignedTransaction( dict.Set("Signature", std::move(signature)); std::string json; if (!base::JSONWriter::Write(dict, &json)) { - return absl::nullopt; + return std::nullopt; } return ConvertMesssageStringFieldsToInt64("/Message", json); } diff --git a/components/brave_wallet/browser/fil_transaction.h b/components/brave_wallet/browser/fil_transaction.h index ef89c48a633..55985ff6732 100644 --- a/components/brave_wallet/browser/fil_transaction.h +++ b/components/brave_wallet/browser/fil_transaction.h @@ -6,13 +6,13 @@ #ifndef BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_FIL_TRANSACTION_H_ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_FIL_TRANSACTION_H_ +#include #include #include #include "base/values.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" #include "brave/components/brave_wallet/common/fil_address.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_wallet { @@ -24,12 +24,12 @@ class FilTransaction { bool operator==(const FilTransaction&) const; bool operator!=(const FilTransaction&) const; - static absl::optional FromTxData( + static std::optional FromTxData( bool is_mainnet, const mojom::FilTxDataPtr& tx_data); // https://github.com/filecoin-project/lotus/blob/master/chain/types/message.go - absl::optional nonce() const { return nonce_; } + std::optional nonce() const { return nonce_; } std::string gas_premium() const { return gas_premium_; } std::string gas_fee_cap() const { return gas_fee_cap_; } int64_t gas_limit() const { return gas_limit_; } @@ -39,7 +39,7 @@ class FilTransaction { void set_to(const FilAddress& to) { to_ = to; } void set_value(const std::string& value) { value_ = value; } - void set_nonce(absl::optional nonce) { nonce_ = nonce; } + void set_nonce(std::optional nonce) { nonce_ = nonce; } void set_gas_premium(const std::string& gas_premium) { gas_premium_ = gas_premium; } @@ -49,35 +49,34 @@ class FilTransaction { void set_gas_limit(int64_t gas_limit) { gas_limit_ = gas_limit; } void set_max_fee(const std::string& max_fee) { max_fee_ = max_fee; } - absl::optional GetMessageToSignJson( - const FilAddress& from) const; + std::optional GetMessageToSignJson(const FilAddress& from) const; base::Value GetMessageToSign(const FilAddress& from) const; base::Value::Dict ToValue() const; mojom::FilTxDataPtr ToFilTxData() const; - absl::optional GetSignedTransaction( + std::optional GetSignedTransaction( const FilAddress& from, const std::vector& private_key) const; - static absl::optional FromValue( + static std::optional FromValue( const base::Value::Dict& value); // Deserializes JSON which contains value, provided by SignTransaction // Wraps uint64_t fields to string - static absl::optional DeserializeSignedTx( + static std::optional DeserializeSignedTx( const std::string& signed_tx); // Finds signed tx JSON by path and converts some string fields to uint64 form - static absl::optional ConvertMesssageStringFieldsToInt64( + static std::optional ConvertMesssageStringFieldsToInt64( const std::string& path, const std::string& json); // Finds signed tx JSON by path and converts some string fields to uint64 form - static absl::optional ConvertSignedTxStringFieldsToInt64( + static std::optional ConvertSignedTxStringFieldsToInt64( const std::string& path, const std::string& json); private: bool IsEqual(const FilTransaction& tx) const; - absl::optional nonce_; + std::optional nonce_; std::string gas_premium_; std::string gas_fee_cap_; int64_t gas_limit_ = 0; @@ -88,7 +87,7 @@ class FilTransaction { std::string signature_; private: - FilTransaction(absl::optional nonce, + FilTransaction(std::optional nonce, const std::string& gas_premium, const std::string& gas_fee_cap, int64_t gas_limit, diff --git a/components/brave_wallet/browser/fil_tx_manager.cc b/components/brave_wallet/browser/fil_tx_manager.cc index 71325dfcf2a..b5856ed41fe 100644 --- a/components/brave_wallet/browser/fil_tx_manager.cc +++ b/components/brave_wallet/browser/fil_tx_manager.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_wallet/browser/fil_tx_manager.h" #include +#include #include #include #include @@ -52,7 +53,7 @@ FilTxManager::~FilTxManager() { void FilTxManager::GetEstimatedGas(const std::string& chain_id, const mojom::AccountIdPtr& from, - const absl::optional& origin, + const std::optional& origin, std::unique_ptr tx, AddUnapprovedTransactionCallback callback) { const std::string gas_premium = tx->gas_premium(); @@ -73,7 +74,7 @@ void FilTxManager::GetEstimatedGas(const std::string& chain_id, void FilTxManager::ContinueAddUnapprovedTransaction( const std::string& chain_id, const mojom::AccountIdPtr& from, - const absl::optional& origin, + const std::optional& origin, std::unique_ptr tx, AddUnapprovedTransactionCallback callback, const std::string& gas_premium, @@ -109,7 +110,7 @@ void FilTxManager::AddUnapprovedTransaction( const std::string& chain_id, mojom::TxDataUnionPtr tx_data_union, const mojom::AccountIdPtr& from, - const absl::optional& origin, + const std::optional& origin, AddUnapprovedTransactionCallback callback) { DCHECK(tx_data_union->is_fil_tx_data()); const bool is_mainnet = chain_id == mojom::kFilecoinMainnet; @@ -358,9 +359,9 @@ FilTxStateManager* FilTxManager::GetFilTxStateManager() { } void FilTxManager::UpdatePendingTransactions( - const absl::optional& chain_id) { + const std::optional& chain_id) { auto pending_transactions = tx_state_manager_->GetTransactionsByStatus( - chain_id, mojom::TransactionStatus::Submitted, absl::nullopt); + chain_id, mojom::TransactionStatus::Submitted, std::nullopt); std::set pending_chain_ids; for (const auto& pending_transaction : pending_transactions) { auto cid = pending_transaction->tx_hash(); diff --git a/components/brave_wallet/browser/fil_tx_manager.h b/components/brave_wallet/browser/fil_tx_manager.h index 99dac366726..952a350888b 100644 --- a/components/brave_wallet/browser/fil_tx_manager.h +++ b/components/brave_wallet/browser/fil_tx_manager.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_FIL_TX_MANAGER_H_ #include +#include #include #include "brave/components/brave_wallet/browser/fil_block_tracker.h" @@ -44,7 +45,7 @@ class FilTxManager : public TxManager, public FilBlockTracker::Observer { void AddUnapprovedTransaction(const std::string& chain_id, mojom::TxDataUnionPtr tx_data_union, const mojom::AccountIdPtr& from, - const absl::optional& origin, + const std::optional& origin, AddUnapprovedTransactionCallback) override; void ApproveTransaction(const std::string& chain_id, const std::string& tx_meta_id, @@ -73,7 +74,7 @@ class FilTxManager : public TxManager, public FilBlockTracker::Observer { void GetEstimatedGas(const std::string& chain_id, const mojom::AccountIdPtr& from_account_id, - const absl::optional& origin, + const std::optional& origin, std::unique_ptr tx, AddUnapprovedTransactionCallback callback); std::unique_ptr GetTxForTesting(const std::string& chain_id, @@ -101,7 +102,7 @@ class FilTxManager : public TxManager, public FilBlockTracker::Observer { void ContinueAddUnapprovedTransaction( const std::string& chain_id, const mojom::AccountIdPtr& from_account_id, - const absl::optional& origin, + const std::optional& origin, std::unique_ptr tx, AddUnapprovedTransactionCallback callback, const std::string& gas_premium, @@ -124,7 +125,7 @@ class FilTxManager : public TxManager, public FilBlockTracker::Observer { // TxManager void UpdatePendingTransactions( - const absl::optional& chain_id) override; + const std::optional& chain_id) override; std::unique_ptr nonce_tracker_; raw_ptr json_rpc_service_ = nullptr; diff --git a/components/brave_wallet/browser/fil_tx_manager_unittest.cc b/components/brave_wallet/browser/fil_tx_manager_unittest.cc index bc87dc8f3ab..1e0bf8feefb 100644 --- a/components/brave_wallet/browser/fil_tx_manager_unittest.cc +++ b/components/brave_wallet/browser/fil_tx_manager_unittest.cc @@ -4,9 +4,10 @@ * You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "brave/components/brave_wallet/browser/fil_tx_manager.h" -#include -#include +#include +#include +#include #include #include "base/files/scoped_temp_dir.h" @@ -32,7 +33,6 @@ #include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h" #include "services/network/test/test_url_loader_factory.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/base/l10n/l10n_util.h" #include "url/origin.h" @@ -132,7 +132,7 @@ class FilTxManagerUnitTest : public testing::Test { void GetTransactionMessageToSign( const std::string& chain_id, const std::string& tx_meta_id, - absl::optional expected_message) { + std::optional expected_message) { base::RunLoop run_loop; fil_tx_manager()->GetTransactionMessageToSign( chain_id, tx_meta_id, @@ -140,8 +140,7 @@ class FilTxManagerUnitTest : public testing::Test { EXPECT_EQ(!!message, expected_message.has_value()); if (expected_message.has_value()) { ASSERT_TRUE(message->is_message_str()); - absl::optional message_str = - message->get_message_str(); + std::optional message_str = message->get_message_str(); EqualJSONs(*message_str, *expected_message); EXPECT_EQ(message_str.has_value(), expected_message.has_value()); } @@ -161,7 +160,7 @@ class FilTxManagerUnitTest : public testing::Test { void AddUnapprovedTransaction(const std::string& chain_id, mojom::FilTxDataPtr tx_data, const mojom::AccountIdPtr& from, - const absl::optional& origin, + const std::optional& origin, std::string* meta_id) { auto tx_data_union = mojom::TxDataUnion::NewFilTxData(std::move(tx_data)); @@ -254,7 +253,7 @@ TEST_F(FilTxManagerUnitTest, SubmitTransactions) { std::string meta_id1; AddUnapprovedTransaction(mojom::kLocalhostChainId, tx_data.Clone(), - from_account, absl::nullopt, &meta_id1); + from_account, std::nullopt, &meta_id1); auto tx_meta1 = fil_tx_manager()->GetTxForTesting(mojom::kLocalhostChainId, meta_id1); @@ -269,7 +268,7 @@ TEST_F(FilTxManagerUnitTest, SubmitTransactions) { std::string meta_id2; AddUnapprovedTransaction(mojom::kLocalhostChainId, tx_data.Clone(), - from_account, absl::nullopt, &meta_id2); + from_account, std::nullopt, &meta_id2); auto tx_meta2 = fil_tx_manager()->GetTxForTesting(mojom::kLocalhostChainId, meta_id2); ASSERT_TRUE(tx_meta2); @@ -327,7 +326,7 @@ TEST_F(FilTxManagerUnitTest, SubmitTransactionError) { std::string meta_id1; AddUnapprovedTransaction(mojom::kLocalhostChainId, tx_data.Clone(), - from_account, absl::nullopt, &meta_id1); + from_account, std::nullopt, &meta_id1); auto tx_meta1 = fil_tx_manager()->GetTxForTesting(mojom::kLocalhostChainId, meta_id1); @@ -379,7 +378,7 @@ TEST_F(FilTxManagerUnitTest, SubmitTransactionConfirmed) { std::string meta_id1; AddUnapprovedTransaction(mojom::kLocalhostChainId, tx_data.Clone(), - from_account, absl::nullopt, &meta_id1); + from_account, std::nullopt, &meta_id1); auto tx_meta1 = fil_tx_manager()->GetTxForTesting(mojom::kLocalhostChainId, meta_id1); @@ -438,7 +437,7 @@ TEST_F(FilTxManagerUnitTest, WalletOrigin) { "" /* max_fee */, to_account, "11"); std::string meta_id; AddUnapprovedTransaction(mojom::kLocalhostChainId, std::move(tx_data), - from_account, absl::nullopt, &meta_id); + from_account, std::nullopt, &meta_id); auto tx_meta = fil_tx_manager()->GetTxForTesting(mojom::kLocalhostChainId, meta_id); @@ -479,7 +478,7 @@ TEST_F(FilTxManagerUnitTest, GetTransactionMessageToSign) { "4" /* gas_limit */, "" /* max_fee */, to_account, "11"); std::string meta_id; AddUnapprovedTransaction(mojom::kLocalhostChainId, std::move(tx_data), - from_account, absl::nullopt, &meta_id); + from_account, std::nullopt, &meta_id); auto tx_meta = fil_tx_manager()->GetTxForTesting(mojom::kLocalhostChainId, meta_id); ASSERT_TRUE(tx_meta); @@ -512,7 +511,7 @@ TEST_F(FilTxManagerUnitTest, GetTransactionMessageToSign) { "4" /* gas_limit */, "" /* max_fee */, to_account, "11"); std::string meta_id; AddUnapprovedTransaction(mojom::kLocalhostChainId, std::move(tx_data), - from_account, absl::nullopt, &meta_id); + from_account, std::nullopt, &meta_id); auto tx_meta = fil_tx_manager()->GetTxForTesting(mojom::kLocalhostChainId, meta_id); ASSERT_TRUE(tx_meta); @@ -536,8 +535,8 @@ TEST_F(FilTxManagerUnitTest, GetTransactionMessageToSign) { } GetTransactionMessageToSign(mojom::kLocalhostChainId, "unknown id", - absl::nullopt); - GetTransactionMessageToSign(mojom::kLocalhostChainId, "", absl::nullopt); + std::nullopt); + GetTransactionMessageToSign(mojom::kLocalhostChainId, "", std::nullopt); } TEST_F(FilTxManagerUnitTest, ProcessHardwareSignature) { @@ -549,7 +548,7 @@ TEST_F(FilTxManagerUnitTest, ProcessHardwareSignature) { "4" /* gas_limit */, "" /* max_fee */, to_account, "11"); std::string meta_id; AddUnapprovedTransaction(mojom::kLocalhostChainId, std::move(tx_data), - from_account, absl::nullopt, &meta_id); + from_account, std::nullopt, &meta_id); auto tx_meta = fil_tx_manager()->GetTxForTesting(mojom::kLocalhostChainId, meta_id); ASSERT_TRUE(tx_meta); @@ -618,7 +617,7 @@ TEST_F(FilTxManagerUnitTest, ProcessHardwareSignatureError) { "4" /* gas_limit */, "" /* max_fee */, to_account, "11"); std::string meta_id; AddUnapprovedTransaction(mojom::kLocalhostChainId, std::move(tx_data), - from_account, absl::nullopt, &meta_id); + from_account, std::nullopt, &meta_id); auto tx_meta = fil_tx_manager()->GetTxForTesting(mojom::kLocalhostChainId, meta_id); ASSERT_TRUE(tx_meta); diff --git a/components/brave_wallet/browser/fil_tx_state_manager.cc b/components/brave_wallet/browser/fil_tx_state_manager.cc index 80ac7e0bdbb..58c125ff8b3 100644 --- a/components/brave_wallet/browser/fil_tx_state_manager.cc +++ b/components/brave_wallet/browser/fil_tx_state_manager.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/fil_tx_state_manager.h" +#include #include #include "base/strings/strcat.h" @@ -14,7 +15,6 @@ #include "brave/components/brave_wallet/browser/fil_tx_meta.h" #include "brave/components/brave_wallet/browser/tx_meta.h" #include "brave/components/brave_wallet/common/fil_address.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_wallet { @@ -34,7 +34,7 @@ std::unique_ptr FilTxStateManager::GetFilTx( } std::string FilTxStateManager::GetTxPrefPathPrefix( - const absl::optional& chain_id) { + const std::optional& chain_id) { if (chain_id.has_value()) { return base::StrCat( {kFilecoinPrefKey, ".", @@ -64,7 +64,7 @@ std::unique_ptr FilTxStateManager::ValueToTxMeta( if (!tx) { return nullptr; } - absl::optional tx_from_value = FilTransaction::FromValue(*tx); + std::optional tx_from_value = FilTransaction::FromValue(*tx); if (!tx_from_value) { return nullptr; } diff --git a/components/brave_wallet/browser/fil_tx_state_manager.h b/components/brave_wallet/browser/fil_tx_state_manager.h index 5995361e28f..acf9e880d7b 100644 --- a/components/brave_wallet/browser/fil_tx_state_manager.h +++ b/components/brave_wallet/browser/fil_tx_state_manager.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_FIL_TX_STATE_MANAGER_H_ #include +#include #include #include @@ -46,7 +47,7 @@ class FilTxStateManager : public TxStateManager { std::unique_ptr ValueToTxMeta( const base::Value::Dict& value) override; std::string GetTxPrefPathPrefix( - const absl::optional& chain_id) override; + const std::optional& chain_id) override; }; } // namespace brave_wallet diff --git a/components/brave_wallet/browser/fil_tx_state_manager_unittest.cc b/components/brave_wallet/browser/fil_tx_state_manager_unittest.cc index d81ebd7cfb2..be75a133865 100644 --- a/components/brave_wallet/browser/fil_tx_state_manager_unittest.cc +++ b/components/brave_wallet/browser/fil_tx_state_manager_unittest.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_wallet/browser/fil_tx_state_manager.h" #include +#include #include #include @@ -95,7 +96,7 @@ TEST_F(FilTxStateManagerUnitTest, GetTxPrefPathPrefix) { "filecoin.http://localhost:1234/rpc/v0", fil_tx_state_manager_->GetTxPrefPathPrefix(mojom::kLocalhostChainId)); EXPECT_EQ("filecoin", - fil_tx_state_manager_->GetTxPrefPathPrefix(absl::nullopt)); + fil_tx_state_manager_->GetTxPrefPathPrefix(std::nullopt)); } } // namespace brave_wallet diff --git a/components/brave_wallet/browser/filecoin_keyring.cc b/components/brave_wallet/browser/filecoin_keyring.cc index 353a1931f01..83941d9381d 100644 --- a/components/brave_wallet/browser/filecoin_keyring.cc +++ b/components/brave_wallet/browser/filecoin_keyring.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/filecoin_keyring.h" +#include #include #include "base/base64.h" @@ -15,7 +16,6 @@ #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" #include "brave/components/brave_wallet/common/fil_address.h" #include "brave/components/filecoin/rs/src/lib.rs.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_wallet { @@ -37,10 +37,10 @@ bool GetBLSPublicKey(const std::vector& private_key, return true; } -absl::optional GetProtocolFromAddress( +std::optional GetProtocolFromAddress( const std::string& address) { if (address.size() < 2) { - return absl::nullopt; + return std::nullopt; } const char protocol_symbol = address[1]; switch (protocol_symbol) { @@ -52,14 +52,14 @@ absl::optional GetProtocolFromAddress( } default: { NOTREACHED() << "Unknown filecoin protocol"; - return absl::nullopt; + return std::nullopt; } } } std::string GetExportEncodedJSON(const std::string& base64_encoded_private_key, const std::string& address) { - absl::optional protocol = + std::optional protocol = GetProtocolFromAddress(address); if (!protocol) { return ""; @@ -94,7 +94,7 @@ bool FilecoinKeyring::DecodeImportPayload( if (!base::HexStringToString(payload_hex, &key_payload)) { return false; } - absl::optional records_v = base::JSONReader::Read( + std::optional records_v = base::JSONReader::Read( key_payload, base::JSON_PARSE_CHROMIUM_EXTENSIONS | base::JSONParserOptions::JSON_PARSE_RFC); if (!records_v || !records_v->is_dict()) { @@ -194,20 +194,20 @@ std::string FilecoinKeyring::GetAddressInternal(HDKeyBase* hd_key_base) const { .EncodeAsString(); } -absl::optional FilecoinKeyring::SignTransaction( +std::optional FilecoinKeyring::SignTransaction( const std::string& address, const FilTransaction* tx) { if (!tx) { - return absl::nullopt; + return std::nullopt; } auto fil_address = FilAddress::FromAddress(address); if (fil_address.IsEmpty()) { - return absl::nullopt; + return std::nullopt; } HDKeyBase* hd_key = GetHDKeyFromAddress(address); if (!hd_key) { - return absl::nullopt; + return std::nullopt; } return tx->GetSignedTransaction(fil_address, hd_key->GetPrivateKeyBytes()); } diff --git a/components/brave_wallet/browser/filecoin_keyring.h b/components/brave_wallet/browser/filecoin_keyring.h index ce0cd77355a..24c86c59df9 100644 --- a/components/brave_wallet/browser/filecoin_keyring.h +++ b/components/brave_wallet/browser/filecoin_keyring.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_FILECOIN_KEYRING_H_ #include +#include #include #include @@ -15,7 +16,6 @@ #include "brave/components/brave_wallet/browser/internal/hd_key.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" #include "brave/components/brave_wallet/common/brave_wallet_types.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_wallet { @@ -34,8 +34,8 @@ class FilecoinKeyring : public HDKeyring { mojom::FilecoinAddressProtocol protocol); void RestoreFilecoinAccount(const std::vector& input_key, const std::string& address); - absl::optional SignTransaction(const std::string& address, - const FilTransaction* tx); + std::optional SignTransaction(const std::string& address, + const FilTransaction* tx); std::string EncodePrivateKeyForExport(const std::string& address) override; private: diff --git a/components/brave_wallet/browser/internal/hd_key.cc b/components/brave_wallet/browser/internal/hd_key.cc index 63d41fd9372..dcefd1c4bbe 100644 --- a/components/brave_wallet/browser/internal/hd_key.cc +++ b/components/brave_wallet/browser/internal/hd_key.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/internal/hd_key.h" +#include #include #include "base/check.h" @@ -463,7 +464,7 @@ std::vector HDKey::GetPublicKeyFromX25519_XSalsa20_Poly1305() const { return public_key; } -absl::optional> +std::optional> HDKey::DecryptCipherFromX25519_XSalsa20_Poly1305( const std::string& version, const std::vector& nonce, @@ -471,18 +472,18 @@ HDKey::DecryptCipherFromX25519_XSalsa20_Poly1305( const std::vector& ciphertext) const { // Only x25519-xsalsa20-poly1305 is supported by MM at the time of writing if (version != "x25519-xsalsa20-poly1305") { - return absl::nullopt; + return std::nullopt; } if (nonce.size() != crypto_box_curve25519xsalsa20poly1305_tweet_NONCEBYTES) { - return absl::nullopt; + return std::nullopt; } if (ephemeral_public_key.size() != crypto_box_curve25519xsalsa20poly1305_tweet_PUBLICKEYBYTES) { - return absl::nullopt; + return std::nullopt; } if (private_key_.size() != crypto_box_curve25519xsalsa20poly1305_tweet_SECRETKEYBYTES) { - return absl::nullopt; + return std::nullopt; } std::vector padded_ciphertext = ciphertext; @@ -493,7 +494,7 @@ HDKey::DecryptCipherFromX25519_XSalsa20_Poly1305( if (crypto_box_open(padded_plaintext.data(), padded_ciphertext.data(), padded_ciphertext.size(), nonce.data(), ephemeral_public_key.data(), private_key_ptr) != 0) { - return absl::nullopt; + return std::nullopt; } std::vector plaintext( padded_plaintext.cbegin() + crypto_box_ZEROBYTES, @@ -706,7 +707,7 @@ std::vector HDKey::SignCompact(const std::vector& msg, } // TODO(apaymyshev): return as base::expected? -absl::optional> HDKey::SignDer( +std::optional> HDKey::SignDer( base::span msg) { unsigned char extra_entropy[32] = {0}; secp256k1_ecdsa_signature ecdsa_sig; @@ -714,7 +715,7 @@ absl::optional> HDKey::SignDer( private_key_.data(), secp256k1_nonce_function_rfc6979, nullptr)) { LOG(ERROR) << __func__ << ": secp256k1_ecdsa_sign failed"; - return absl::nullopt; + return std::nullopt; } auto sig_has_low_r = [](const secp256k1_context* ctx, @@ -735,7 +736,7 @@ absl::optional> HDKey::SignDer( GetSecp256k1Ctx(), &ecdsa_sig, msg.data(), private_key_.data(), secp256k1_nonce_function_rfc6979, extra_entropy)) { LOG(ERROR) << __func__ << ": secp256k1_ecdsa_sign failed"; - return absl::nullopt; + return std::nullopt; } } @@ -743,7 +744,7 @@ absl::optional> HDKey::SignDer( size_t sig_der_length = sig_der.size(); if (!secp256k1_ecdsa_signature_serialize_der( GetSecp256k1Ctx(), sig_der.data(), &sig_der_length, &ecdsa_sig)) { - return absl::nullopt; + return std::nullopt; } sig_der.resize(sig_der_length); diff --git a/components/brave_wallet/browser/internal/hd_key.h b/components/brave_wallet/browser/internal/hd_key.h index de876a8fe78..83e44257716 100644 --- a/components/brave_wallet/browser/internal/hd_key.h +++ b/components/brave_wallet/browser/internal/hd_key.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_INTERNAL_HD_KEY_H_ #include +#include #include #include @@ -15,7 +16,6 @@ #include "base/memory/raw_ptr.h" #include "brave/components/brave_wallet/browser/internal/hd_key_base.h" #include "brave/components/brave_wallet/common/mem_utils.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_wallet { @@ -67,8 +67,7 @@ class HDKey : public HDKeyBase { std::string GetZCashTransparentAddress(bool testnet); std::vector GetUncompressedPublicKey() const; std::vector GetPublicKeyFromX25519_XSalsa20_Poly1305() const; - absl::optional> - DecryptCipherFromX25519_XSalsa20_Poly1305( + std::optional> DecryptCipherFromX25519_XSalsa20_Poly1305( const std::string& version, const std::vector& nonce, const std::vector& ephemeral_public_key, @@ -93,7 +92,7 @@ class HDKey : public HDKeyBase { std::vector SignCompact(const std::vector& msg, int* recid); // Sign the message using private key and return it in DER format. - absl::optional> SignDer( + std::optional> SignDer( base::span msg); // Verify the ECDSA signature using public key. The msg has to be exactly 32 diff --git a/components/brave_wallet/browser/internal/hd_key_unittest.cc b/components/brave_wallet/browser/internal/hd_key_unittest.cc index d07f2a901ff..201dbd42493 100644 --- a/components/brave_wallet/browser/internal/hd_key_unittest.cc +++ b/components/brave_wallet/browser/internal/hd_key_unittest.cc @@ -4,6 +4,9 @@ * You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "brave/components/brave_wallet/browser/internal/hd_key.h" + +#include + #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "brave/components/brave_wallet/browser/brave_wallet_utils.h" @@ -13,7 +16,6 @@ #include "brave/components/brave_wallet/common/hash_utils.h" #include "brave/components/brave_wallet/common/hex_utils.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_wallet { @@ -71,45 +73,45 @@ TEST(HDKeyUnitTest, TestVector1) { const char* path; const char* ext_pub; const char* ext_pri; - absl::optional derive_normal; - absl::optional derive_hardened; + std::optional derive_normal; + std::optional derive_hardened; } cases[] = { {"m", "xpub661MyMwAqRbcFtXgS5sYJABqqG9YLmC4Q1Rdap9gSE8NqtwybGhePY2gZ2" "9ESFjqJoCu1Rupje8YtGqsefD265TMg7usUDFdp6W1EGMcet8", "xprv9s21ZrQH143K3QTDL4LXw2F7HEK3wJUD2nW2nRk4stbPy6cq3jPPqjiChk" "VvvNKmPGJxWUtg6LnF5kejMRNNU3TGtRBeJgk33yuGBxrMPHi", - absl::nullopt, absl::nullopt}, + std::nullopt, std::nullopt}, {"m/0'", "xpub68Gmy5EdvgibQVfPdqkBBCHxA5htiqg55crXYuXoQRKfDBFA1WEjWgP6LH" "hwBZeNK1VTsfTFUHCdrfp1bgwQ9xv5ski8PX9rL2dZXvgGDnw", "xprv9uHRZZhk6KAJC1avXpDAp4MDc3sQKNxDiPvvkX8Br5ngLNv1TxvUxt4cV1" "rGL5hj6KCesnDYUhd7oWgT11eZG7XnxHrnYeSvkzY7d2bhkJ7", - absl::nullopt, 0}, + std::nullopt, 0}, {"m/0'/1", "xpub6ASuArnXKPbfEwhqN6e3mwBcDTgzisQN1wXN9BJcM47sSikHjJf3UFHKkN" "AWbWMiGj7Wf5uMash7SyYq527Hqck2AxYysAA7xmALppuCkwQ", "xprv9wTYmMFdV23N2TdNG573QoEsfRrWKQgWeibmLntzniatZvR9BmLnvSxqu5" "3Kw1UmYPxLgboyZQaXwTCg8MSY3H2EU4pWcQDnRnrVA1xe8fs", - 1, absl::nullopt}, + 1, std::nullopt}, {"m/0'/1/2'", "xpub6D4BDPcP2GT577Vvch3R8wDkScZWzQzMMUm3PWbmWvVJrZwQY4VUNgqFJP" "MM3No2dFDFGTsxxpG5uJh7n7epu4trkrX7x7DogT5Uv6fcLW5", "xprv9z4pot5VBttmtdRTWfWQmoH1taj2axGVzFqSb8C9xaxKymcFzXBDptWmT7" "FwuEzG3ryjH4ktypQSAewRiNMjANTtpgP4mLTj34bhnZX7UiM", - absl::nullopt, 2}, + std::nullopt, 2}, {"m/0'/1/2'/2", "xpub6FHa3pjLCk84BayeJxFW2SP4XRrFd1JYnxeLeU8EqN3vDfZmbqBqaGJAyi" "LjTAwm6ZLRQUMv1ZACTj37sR62cfN7fe5JnJ7dh8zL4fiyLHV", "xprvA2JDeKCSNNZky6uBCviVfJSKyQ1mDYahRjijr5idH2WwLsEd4Hsb2Tyh8R" "fQMuPh7f7RtyzTtdrbdqqsunu5Mm3wDvUAKRHSC34sJ7in334", - 2, absl::nullopt}, + 2, std::nullopt}, {"m/0'/1/2'/2/1000000000", "xpub6H1LXWLaKsWFhvm6RVpEL9P4KfRZSW7abD2ttkWP3SSQvnyA8FSVqNTEcY" "FgJS2UaFcxupHiYkro49S8yGasTvXEYBVPamhGW6cFJodrTHy", "xprvA41z7zogVVwxVSgdKUHDy1SKmdb533PjDz7J6N6mV6uS3ze1ai8FHa8kmH" "ScGpWmj4WggLyQjgPie1rFSruoUihUZREPSL39UNdE3BBDu76", - 1000000000, absl::nullopt}, + 1000000000, std::nullopt}, }; std::vector bytes; @@ -146,45 +148,45 @@ TEST(HDKeyUnitTest, TestVector2) { const char* path; const char* ext_pub; const char* ext_pri; - absl::optional derive_normal; - absl::optional derive_hardened; + std::optional derive_normal; + std::optional derive_hardened; } cases[] = { {"m", "xpub661MyMwAqRbcFW31YEwpkMuc5THy2PSt5bDMsktWQcFF8syAmRUapSCGu8ED9W6oDMS" "gv6Zz8idoc4a6mr8BDzTJY47LJhkJ8UB7WEGuduB", "xprv9s21ZrQH143K31xYSDQpPDxsXRTUcvj2iNHm5NUtrGiGG5e2DtALGdso3pGz6ssrdK4" "PFmM8NSpSBHNqPqm55Qn3LqFtT2emdEXVYsCzC2U", - absl::nullopt, absl::nullopt}, + std::nullopt, std::nullopt}, {"m/0", "xpub69H7F5d8KSRgmmdJg2KhpAK8SR3DjMwAdkxj3ZuxV27CprR9LgpeyGmXUbC6wb7ERfv" "rnKZjXoUmmDznezpbZb7ap6r1D3tgFxHmwMkQTPH", "xprv9vHkqa6EV4sPZHYqZznhT2NPtPCjKuDKGY38FBWLvgaDx45zo9WQRUT3dKYnjwih2yJ" "D9mkrocEZXo1ex8G81dwSM1fwqWpWkeS3v86pgKt", - 0, absl::nullopt}, + 0, std::nullopt}, {"m/0/2147483647'", "xpub6ASAVgeehLbnwdqV6UKMHVzgqAG8Gr6riv3Fxxpj8ksbH9ebxaEyBLZ85ySDhKiLDBr" "QSARLq1uNRts8RuJiHjaDMBU4Zn9h8LZNnBC5y4a", "xprv9wSp6B7kry3Vj9m1zSnLvN3xH8RdsPP1Mh7fAaR7aRLcQMKTR2vidYEeEg2mUCTAwCd" "6vnxVrcjfy2kRgVsFawNzmjuHc2YmYRmagcEPdU9", - absl::nullopt, 2147483647}, + std::nullopt, 2147483647}, {"m/0/2147483647'/1", "xpub6DF8uhdarytz3FWdA8TvFSvvAh8dP3283MY7p2V4SeE2wyWmG5mg5EwVvmdMVCQcoNJ" "xGoWaU9DCWh89LojfZ537wTfunKau47EL2dhHKon", "xprv9zFnWC6h2cLgpmSA46vutJzBcfJ8yaJGg8cX1e5StJh45BBciYTRXSd25UEPVuesF9y" "og62tGAQtHjXajPPdbRCHuWS6T8XA2ECKADdw4Ef", - 1, absl::nullopt}, + 1, std::nullopt}, {"m/0/2147483647'/1/2147483646'", "xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4kox" "b5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL", "xprvA1RpRA33e1JQ7ifknakTFpgNXPmW2YvmhqLQYMmrj4xJXXWYpDPS3xz7iAxn8L39njG" "VyuoseXzU6rcxFLJ8HFsTjSyQbLYnMpCqE2VbFWc", - absl::nullopt, 2147483646}, + std::nullopt, 2147483646}, {"m/0/2147483647'/1/2147483646'/2", "xpub6FnCn6nSzZAw5Tw7cgR9bi15UV96gLZhjDstkXXxvCLsUXBGXPdSnLFbdpq8p9HmGsA" "pME5hQTZ3emM2rnY5agb9rXpVGyy3bdW6EEgAtqt", "xprvA2nrNbFZABcdryreWet9Ea4LvTJcGsqrMzxHx98MMrotbir7yrKCEXw7nadnHM8Dq38" "EGfSh6dqA9QWTyefMLEcBYJUuekgW4BYPJcr9E7j", - 2, absl::nullopt}, + 2, std::nullopt}, }; std::vector bytes; // path: m @@ -223,21 +225,21 @@ TEST(HDKeyUnitTest, TestVector3) { const char* path; const char* ext_pub; const char* ext_pri; - absl::optional derive_normal; - absl::optional derive_hardened; + std::optional derive_normal; + std::optional derive_hardened; } cases[] = { {"m", "xpub661MyMwAqRbcEZVB4dScxMAdx6d4nFc9nvyvH3v4gJL378CSRZiYmhRoP7mBy6gSPSC" "Yk6SzXPTf3ND1cZAceL7SfJ1Z3GC8vBgp2epUt13", "xprv9s21ZrQH143K25QhxbucbDDuQ4naNntJRi4KUfWT7xo4EKsHt2QJDu7KXp1A3u7Bi1j" "8ph3EGsZ9Xvz9dGuVrtHHs7pXeTzjuxBrCmmhgC6", - absl::nullopt, absl::nullopt}, + std::nullopt, std::nullopt}, {"m/0'", "xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaoh" "PX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y", "xprv9uPDJpEQgRQfDcW7BkF7eTya6RPxXeJCqCJGHuCJ4GiRVLzkTXBAJMu2qaMWPrS7AAN" "Yqdq6vcBcBUdJCVVFceUvJFjaPdGZ2y9WACViL4L", - absl::nullopt, 0}, + std::nullopt, 0}, }; std::vector bytes; // path: m diff --git a/components/brave_wallet/browser/json_rpc_response_parser.cc b/components/brave_wallet/browser/json_rpc_response_parser.cc index 24d5c510893..55d5f1173fd 100644 --- a/components/brave_wallet/browser/json_rpc_response_parser.cc +++ b/components/brave_wallet/browser/json_rpc_response_parser.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/json_rpc_response_parser.h" +#include #include #include "brave/components/brave_wallet/browser/brave_wallet_constants.h" @@ -13,73 +14,73 @@ namespace brave_wallet { -absl::optional ParseSingleStringResult( +std::optional ParseSingleStringResult( const base::Value& json_value) { auto result_v = ParseResultValue(json_value); if (!result_v) { - return absl::nullopt; + return std::nullopt; } const std::string* result_str = result_v->GetIfString(); if (!result_str) { - return absl::nullopt; + return std::nullopt; } return *result_str; } -absl::optional> ParseDecodedBytesResult( +std::optional> ParseDecodedBytesResult( const base::Value& json_value) { auto result_v = ParseResultValue(json_value); if (!result_v) { - return absl::nullopt; + return std::nullopt; } const std::string* result_str = result_v->GetIfString(); if (!result_str) { - return absl::nullopt; + return std::nullopt; } return PrefixedHexStringToBytes(*result_str); } -absl::optional ParseResultValue(const base::Value& json_value) { +std::optional ParseResultValue(const base::Value& json_value) { if (!json_value.is_dict()) { - return absl::nullopt; + return std::nullopt; } auto response = json_rpc_responses::RPCResponse::FromValue(json_value.GetDict()); if (!response || !response->result) { - return absl::nullopt; + return std::nullopt; } return std::move(*response->result); } -absl::optional ParseResultDict( +std::optional ParseResultDict( const base::Value& json_value) { auto result = ParseResultValue(json_value); if (!result || !result->is_dict()) { - return absl::nullopt; + return std::nullopt; } return std::move(result->GetDict()); } -absl::optional ParseResultList( +std::optional ParseResultList( const base::Value& json_value) { auto result = ParseResultValue(json_value); if (!result || !result->is_list()) { - return absl::nullopt; + return std::nullopt; } return std::move(result->GetList()); } -absl::optional ParseBoolResult(const base::Value& json_value) { +std::optional ParseBoolResult(const base::Value& json_value) { auto result = ParseSingleStringResult(json_value); if (!result) { - return absl::nullopt; + return std::nullopt; } if (*result == @@ -91,36 +92,36 @@ absl::optional ParseBoolResult(const base::Value& json_value) { return false; } - return absl::nullopt; + return std::nullopt; } -absl::optional ConvertUint64ToString(const std::string& path, - const std::string& json) { +std::optional ConvertUint64ToString(const std::string& path, + const std::string& json) { if (path.empty() || json.empty()) { - return absl::nullopt; + return std::nullopt; } std::string converted_json( json::convert_uint64_value_to_string(path, json, true)); if (converted_json.empty()) { - return absl::nullopt; + return std::nullopt; } return converted_json; } -absl::optional ConvertMultiUint64ToString( +std::optional ConvertMultiUint64ToString( const std::vector& paths, const std::string& json) { if (paths.empty() || json.empty()) { - return absl::nullopt; + return std::nullopt; } std::string converted_json(json); for (const auto& path : paths) { auto result = ConvertUint64ToString(path, converted_json); if (!result) { - return absl::nullopt; + return std::nullopt; } converted_json = std::move(*result); } @@ -128,40 +129,40 @@ absl::optional ConvertMultiUint64ToString( return converted_json; } -absl::optional ConvertMultiUint64InObjectArrayToString( +std::optional ConvertMultiUint64InObjectArrayToString( const std::string& path_to_list, const std::string& path_to_object, const std::vector& keys, const std::string& json) { if (path_to_list.empty() || json.empty() || keys.empty()) { - return absl::nullopt; + return std::nullopt; } std::string converted_json(json); for (const auto& key : keys) { if (key.empty()) { - return absl::nullopt; + return std::nullopt; } converted_json = std::string(json::convert_uint64_in_object_array_to_string( path_to_list, path_to_object, key, converted_json)); if (converted_json.empty()) { - return absl::nullopt; + return std::nullopt; } } return converted_json; } -absl::optional ConvertInt64ToString(const std::string& path, - const std::string& json) { +std::optional ConvertInt64ToString(const std::string& path, + const std::string& json) { if (path.empty() || json.empty()) { - return absl::nullopt; + return std::nullopt; } std::string converted_json( json::convert_int64_value_to_string(path, json, true)); if (converted_json.empty()) { - return absl::nullopt; + return std::nullopt; } return converted_json; } @@ -170,7 +171,7 @@ namespace ankr { namespace { -absl::optional GetChainIdFromAnkrBlockchain( +std::optional GetChainIdFromAnkrBlockchain( const std::string& blockchain) { auto& blockchains = GetAnkrBlockchains(); for (const auto& entry : blockchains) { @@ -179,12 +180,12 @@ absl::optional GetChainIdFromAnkrBlockchain( } } - return absl::nullopt; + return std::nullopt; } } // namespace -absl::optional> +std::optional> ParseGetAccountBalanceResponse(const base::Value& json_value) { // { // "jsonrpc": "2.0", @@ -225,13 +226,13 @@ ParseGetAccountBalanceResponse(const base::Value& json_value) { auto result = ParseResultDict(json_value); if (!result) { - return absl::nullopt; + return std::nullopt; } auto response = json_rpc_responses::AnkrGetAccountBalancesResult::FromValue(*result); if (!response) { - return absl::nullopt; + return std::nullopt; } std::vector balances; diff --git a/components/brave_wallet/browser/json_rpc_response_parser.h b/components/brave_wallet/browser/json_rpc_response_parser.h index 76db1e596de..f5a0841b76c 100644 --- a/components/brave_wallet/browser/json_rpc_response_parser.h +++ b/components/brave_wallet/browser/json_rpc_response_parser.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_JSON_RPC_RESPONSE_PARSER_H_ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_JSON_RPC_RESPONSE_PARSER_H_ +#include #include #include @@ -21,11 +22,11 @@ // Common JSON RPC response parsing functions across different blockchains. namespace brave_wallet { -absl::optional ParseSingleStringResult( +std::optional ParseSingleStringResult( const base::Value& json_value); -absl::optional ParseResultValue(const base::Value& json_value); +std::optional ParseResultValue(const base::Value& json_value); -absl::optional> ParseDecodedBytesResult( +std::optional> ParseDecodedBytesResult( const base::Value& json_value); template @@ -55,30 +56,28 @@ void ParseErrorResult(const base::Value& json_value, } } -absl::optional ParseResultDict( - const base::Value& json_value); -absl::optional ParseResultList( - const base::Value& json_value); -absl::optional ParseBoolResult(const base::Value& json_value); +std::optional ParseResultDict(const base::Value& json_value); +std::optional ParseResultList(const base::Value& json_value); +std::optional ParseBoolResult(const base::Value& json_value); -absl::optional ConvertInt64ToString(const std::string& path, +std::optional ConvertInt64ToString(const std::string& path, + const std::string& json); + +std::optional ConvertUint64ToString(const std::string& path, const std::string& json); -absl::optional ConvertUint64ToString(const std::string& path, - const std::string& json); - -absl::optional ConvertMultiUint64ToString( +std::optional ConvertMultiUint64ToString( const std::vector& paths, const std::string& json); -absl::optional ConvertMultiUint64InObjectArrayToString( +std::optional ConvertMultiUint64InObjectArrayToString( const std::string& path_to_list, const std::string& path_to_object, const std::vector& keys, const std::string& json); namespace ankr { -absl::optional> +std::optional> ParseGetAccountBalanceResponse(const base::Value& json_value); } // namespace ankr diff --git a/components/brave_wallet/browser/json_rpc_response_parser_unittest.cc b/components/brave_wallet/browser/json_rpc_response_parser_unittest.cc index a52ec3be865..6c0b511fa35 100644 --- a/components/brave_wallet/browser/json_rpc_response_parser_unittest.cc +++ b/components/brave_wallet/browser/json_rpc_response_parser_unittest.cc @@ -3,12 +3,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include "brave/components/brave_wallet/browser/json_rpc_response_parser.h" + #include +#include #include #include #include "base/test/values_test_util.h" -#include "brave/components/brave_wallet/browser/json_rpc_response_parser.h" #include "brave/components/brave_wallet/browser/json_rpc_responses.h" #include "brave/components/ipfs/ipfs_utils.h" #include "components/grit/brave_components_strings.h" @@ -46,20 +48,20 @@ TEST(JsonRpcResponseParserUnitTest, ParseBoolResult) { std::string json = "{\"jsonrpc\":\"2.0\",\"id\":1,\"result\":" "\"0x0000000000000000000000000000000000000000000000000000000000000001\"}"; - EXPECT_EQ(ParseBoolResult(ParseJson(json)), absl::make_optional(true)); + EXPECT_EQ(ParseBoolResult(ParseJson(json)), std::make_optional(true)); json = "{\"jsonrpc\":\"2.0\",\"id\":1,\"result\":" "\"0x0000000000000000000000000000000000000000000000000000000000000000\"}"; - EXPECT_EQ(ParseBoolResult(ParseJson(json)), absl::make_optional(false)); + EXPECT_EQ(ParseBoolResult(ParseJson(json)), std::make_optional(false)); json = "{\"jsonrpc\":\"2.0\",\"id\":1,\"result\":" "\"0x00000000000000000000000000000000000000000\"}"; - EXPECT_EQ(ParseBoolResult(ParseJson(json)), absl::nullopt); + EXPECT_EQ(ParseBoolResult(ParseJson(json)), std::nullopt); json = "{\"jsonrpc\":\"2.0\",\"id\":1,\"result\":\"0\"}"; - EXPECT_EQ(ParseBoolResult(ParseJson(json)), absl::nullopt); + EXPECT_EQ(ParseBoolResult(ParseJson(json)), std::nullopt); } TEST(JsonRpcResponseParserUnitTest, ParseErrorResult) { @@ -350,7 +352,7 @@ TEST(JsonRpcResponseParserUnitTest, RPCResponse) { ASSERT_TRUE(response); EXPECT_EQ(response->jsonrpc, "2.0"); EXPECT_EQ(response->id, base::Value(2)); - EXPECT_EQ(response->result, absl::nullopt); + EXPECT_EQ(response->result, std::nullopt); ASSERT_TRUE(response->error); EXPECT_EQ(response->error->code, -32601); EXPECT_EQ(response->error->message, "method does not exist"); diff --git a/components/brave_wallet/browser/json_rpc_service.cc b/components/brave_wallet/browser/json_rpc_service.cc index cea512d17ad..483e7ddd647 100644 --- a/components/brave_wallet/browser/json_rpc_service.cc +++ b/components/brave_wallet/browser/json_rpc_service.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_wallet/browser/json_rpc_service.h" #include +#include #include #include #include @@ -197,11 +198,11 @@ decentralized_dns::EnsOffchainResolveMethod FromMojomEnsOffchainResolveMethod( // Function to convert all numbers in JSON string to strings, recursively // under the top-level "result" key. -absl::optional ConvertAllNumbersToString(const std::string& json) { +std::optional ConvertAllNumbersToString(const std::string& json) { auto converted_json = std::string(json::convert_all_numbers_to_string(json, "/result")); if (converted_json.empty()) { - return absl::nullopt; + return std::nullopt; } return converted_json; @@ -248,14 +249,14 @@ namespace brave_wallet { namespace { -absl::optional GetAnkrBlockchainFromChainId( +std::optional GetAnkrBlockchainFromChainId( const std::string& chain_id) { auto& blockchains = GetAnkrBlockchains(); if (blockchains.contains(chain_id)) { return blockchains.at(chain_id); } - return absl::nullopt; + return std::nullopt; } } // namespace @@ -625,7 +626,7 @@ void JsonRpcService::RemoveChain(const std::string& chain_id, bool JsonRpcService::SetNetwork(const std::string& chain_id, mojom::CoinType coin, - const absl::optional& origin) { + const std::optional& origin) { if (!SetCurrentChainId(prefs_, coin, origin, chain_id)) { return false; } @@ -640,20 +641,20 @@ bool JsonRpcService::SetNetwork(const std::string& chain_id, void JsonRpcService::SetNetwork(const std::string& chain_id, mojom::CoinType coin, - const absl::optional& origin, + const std::optional& origin, SetNetworkCallback callback) { std::move(callback).Run(SetNetwork(chain_id, coin, origin)); } void JsonRpcService::GetNetwork(mojom::CoinType coin, - const absl::optional<::url::Origin>& origin, + const std::optional<::url::Origin>& origin, GetNetworkCallback callback) { std::move(callback).Run(GetNetworkSync(coin, origin)); } mojom::NetworkInfoPtr JsonRpcService::GetNetworkSync( mojom::CoinType coin, - const absl::optional<::url::Origin>& origin) { + const std::optional<::url::Origin>& origin) { return GetChain(prefs_, GetChainIdSync(coin, origin), coin); } @@ -725,7 +726,7 @@ void JsonRpcService::UpdateIsEip1559(const std::string& chain_id, void JsonRpcService::FireNetworkChanged( mojom::CoinType coin, const std::string& chain_id, - const absl::optional& origin) { + const std::optional& origin) { for (const auto& observer : observers_) { observer->ChainChangedEvent(chain_id, coin, origin); } @@ -733,14 +734,14 @@ void JsonRpcService::FireNetworkChanged( std::string JsonRpcService::GetChainIdSync( mojom::CoinType coin, - const absl::optional<::url::Origin>& origin) const { + const std::optional<::url::Origin>& origin) const { return GetCurrentChainId(prefs_, coin, origin); } void JsonRpcService::GetDefaultChainId( mojom::CoinType coin, mojom::JsonRpcService::GetDefaultChainIdCallback callback) { - std::move(callback).Run(GetChainIdSync(coin, absl::nullopt)); + std::move(callback).Run(GetChainIdSync(coin, std::nullopt)); } void JsonRpcService::GetChainIdForOrigin( @@ -779,7 +780,7 @@ void JsonRpcService::GetHiddenNetworks(mojom::CoinType coin, // Currently selected chain is never hidden for coin. std::erase(hidden_networks, - base::ToLowerASCII(GetChainIdSync(coin, absl::nullopt))); + base::ToLowerASCII(GetChainIdSync(coin, std::nullopt))); std::move(callback).Run(hidden_networks); } @@ -802,7 +803,7 @@ void JsonRpcService::RemoveHiddenNetwork(mojom::CoinType coin, std::string JsonRpcService::GetNetworkUrl( mojom::CoinType coin, - const absl::optional<::url::Origin>& origin) const { + const std::optional<::url::Origin>& origin) const { auto network_url = GetNetworkURL(prefs_, GetChainIdSync(coin, origin), coin); if (!network_url.is_valid()) { return std::string(); @@ -812,7 +813,7 @@ std::string JsonRpcService::GetNetworkUrl( void JsonRpcService::GetNetworkUrl( mojom::CoinType coin, - const absl::optional<::url::Origin>& origin, + const std::optional<::url::Origin>& origin, mojom::JsonRpcService::GetNetworkUrlCallback callback) { std::move(callback).Run(GetNetworkUrl(coin, origin)); } @@ -1267,7 +1268,7 @@ void JsonRpcService::OnGetERC20TokenBalance( } const auto& args = eth::DecodeEthCallResponse(*result, {"uint256"}); - if (args == absl::nullopt) { + if (args == std::nullopt) { std::move(callback).Run( "", mojom::ProviderError::kInternalError, l10n_util::GetStringUTF8(IDS_WALLET_INTERNAL_ERROR)); @@ -1341,7 +1342,7 @@ void JsonRpcService::OnGetERC20TokenAllowance( } const auto& args = eth::DecodeEthCallResponse(*result, {"uint256"}); - if (args == absl::nullopt) { + if (args == std::nullopt) { std::move(callback).Run( "", mojom::ProviderError::kInternalError, l10n_util::GetStringUTF8(IDS_WALLET_INTERNAL_ERROR)); @@ -1374,7 +1375,7 @@ void JsonRpcService::GetERC20TokenBalances( return; } - absl::optional calldata = + std::optional calldata = balance_scanner::TokensBalance(user_address, token_contract_addresses); if (!calldata) { std::move(callback).Run( @@ -1458,7 +1459,7 @@ void JsonRpcService::EnsGetContentHash(const std::string& domain, return; } - absl::optional allow_offchain; + std::optional allow_offchain; if (EnsOffchainPrefEnabled(local_state_prefs_)) { allow_offchain = true; } else if (EnsOffchainPrefDisabled(local_state_prefs_)) { @@ -1536,7 +1537,7 @@ void JsonRpcService::EnsGetEthAddr(const std::string& domain, return; } - absl::optional allow_offchain; + std::optional allow_offchain; if (EnsOffchainPrefEnabled(local_state_prefs_)) { allow_offchain = true; } else if (EnsOffchainPrefDisabled(local_state_prefs_)) { @@ -1557,8 +1558,8 @@ void JsonRpcService::EnsGetEthAddr(const std::string& domain, void JsonRpcService::OnEnsGetEthAddrTaskDone( EnsResolverTask* task, - absl::optional task_result, - absl::optional task_error) { + std::optional task_result, + std::optional task_error) { auto callbacks = ens_get_eth_addr_tasks_.TaskDone(task); if (callbacks.empty()) { return; @@ -1620,8 +1621,8 @@ void JsonRpcService::SnsGetSolAddr(const std::string& domain, void JsonRpcService::OnSnsGetSolAddrTaskDone( SnsResolverTask* task, - absl::optional task_result, - absl::optional task_error) { + std::optional task_result, + std::optional task_error) { auto callbacks = sns_get_sol_addr_tasks_.TaskDone(task); if (callbacks.empty()) { return; @@ -1650,7 +1651,7 @@ void JsonRpcService::SnsResolveHost(const std::string& domain, SnsResolveHostCallback callback) { if (!IsValidDomain(domain)) { std::move(callback).Run( - absl::nullopt, mojom::SolanaProviderError::kInvalidParams, + std::nullopt, mojom::SolanaProviderError::kInvalidParams, l10n_util::GetStringUTF8(IDS_WALLET_INVALID_PARAMETERS)); return; } @@ -1673,8 +1674,8 @@ void JsonRpcService::SnsResolveHost(const std::string& domain, void JsonRpcService::OnSnsResolveHostTaskDone( SnsResolverTask* task, - absl::optional task_result, - absl::optional task_error) { + std::optional task_result, + std::optional task_error) { auto callbacks = sns_resolve_host_tasks_.TaskDone(task); if (callbacks.empty()) { return; @@ -1701,14 +1702,14 @@ void JsonRpcService::OnSnsResolveHostTaskDone( void JsonRpcService::OnEnsGetContentHashTaskDone( EnsResolverTask* task, - absl::optional task_result, - absl::optional task_error) { + std::optional task_result, + std::optional task_error) { auto callbacks = ens_get_content_hash_tasks_.TaskDone(task); if (callbacks.empty()) { return; } - absl::optional> content_hash; + std::optional> content_hash; mojom::ProviderError error = task_error ? task_error->error : mojom::ProviderError::kSuccess; std::string error_message = task_error ? task_error->error_message : ""; @@ -1746,7 +1747,7 @@ void JsonRpcService::UnstoppableDomainsResolveDns( if (!IsValidUnstoppableDomain(domain)) { std::move(callback).Run( - absl::nullopt, mojom::ProviderError::kInvalidParams, + std::nullopt, mojom::ProviderError::kInvalidParams, l10n_util::GetStringUTF8(IDS_WALLET_INVALID_PARAMETERS)); return; } @@ -1755,7 +1756,7 @@ void JsonRpcService::UnstoppableDomainsResolveDns( domain); if (!data) { std::move(callback).Run( - absl::nullopt, mojom::ProviderError::kInvalidParams, + std::nullopt, mojom::ProviderError::kInvalidParams, l10n_util::GetStringUTF8(IDS_WALLET_INVALID_PARAMETERS)); return; } @@ -2432,14 +2433,14 @@ void JsonRpcService::GetEthNftStandard( if (!EthAddress::IsValidAddress(contract_address) || !network_url.is_valid()) { std::move(callback).Run( - absl::nullopt, mojom::ProviderError::kInvalidParams, + std::nullopt, mojom::ProviderError::kInvalidParams, l10n_util::GetStringUTF8(IDS_WALLET_INVALID_PARAMETERS)); return; } if (index >= interfaces.size()) { std::move(callback).Run( - absl::nullopt, mojom::ProviderError::kInvalidParams, + std::nullopt, mojom::ProviderError::kInvalidParams, l10n_util::GetStringUTF8(IDS_WALLET_INVALID_PARAMETERS)); return; } @@ -2464,7 +2465,7 @@ void JsonRpcService::OnGetEthNftStandard( mojom::ProviderError error, const std::string& error_message) { if (error != mojom::ProviderError::kSuccess) { - std::move(callback).Run(absl::nullopt, error, error_message); + std::move(callback).Run(std::nullopt, error, error_message); return; } @@ -2477,7 +2478,7 @@ void JsonRpcService::OnGetEthNftStandard( index++; if (index >= interfaces.size()) { - std::move(callback).Run(absl::nullopt, mojom::ProviderError::kSuccess, ""); + std::move(callback).Run(std::nullopt, mojom::ProviderError::kSuccess, ""); return; } // If the contract does not implement the interface, try the next one @@ -2657,7 +2658,7 @@ void JsonRpcService::OnGetEthTokenDecimals( } const auto& args = eth::DecodeEthCallResponse(*result, {"uint8"}); - if (args == absl::nullopt) { + if (args == std::nullopt) { std::move(callback).Run("", mojom::ProviderError::kParsingError, l10n_util::GetStringUTF8(IDS_WALLET_PARSING_ERROR)); return; @@ -2720,7 +2721,7 @@ void JsonRpcService::GetSPLTokenAccountBalance( return; } - absl::optional associated_token_account = + std::optional associated_token_account = SolanaKeyring::GetAssociatedTokenAccount(token_mint_address, wallet_address); if (!associated_token_account) { @@ -2806,7 +2807,7 @@ void JsonRpcService::GetSolTokenMetadata(const std::string& chain_id, void JsonRpcService::IsSolanaBlockhashValid( const std::string& chain_id, const std::string& blockhash, - const absl::optional& commitment, + const std::optional& commitment, IsSolanaBlockhashValidCallback callback) { auto internal_callback = base::BindOnce(&JsonRpcService::OnIsSolanaBlockhashValid, @@ -2891,7 +2892,7 @@ void JsonRpcService::OnSendFilecoinTransaction( void JsonRpcService::SendSolanaTransaction( const std::string& chain_id, const std::string& signed_tx, - absl::optional send_options, + std::optional send_options, SendSolanaTransactionCallback callback) { if (signed_tx.empty()) { std::move(callback).Run( @@ -2992,22 +2993,21 @@ void JsonRpcService::OnGetSolanaSignatureStatuses( APIRequestResult api_request_result) { if (!api_request_result.Is2XXResponseCode()) { std::move(callback).Run( - std::vector>(), + std::vector>(), mojom::SolanaProviderError::kInternalError, l10n_util::GetStringUTF8(IDS_WALLET_INTERNAL_ERROR)); return; } - std::vector> statuses; + std::vector> statuses; if (!solana::ParseGetSignatureStatuses(api_request_result.value_body(), &statuses)) { mojom::SolanaProviderError error; std::string error_message; ParseErrorResult( api_request_result.value_body(), &error, &error_message); - std::move(callback).Run( - std::vector>(), error, - error_message); + std::move(callback).Run(std::vector>(), + error, error_message); return; } @@ -3040,19 +3040,19 @@ void JsonRpcService::OnGetSolanaAccountInfo( APIRequestResult api_request_result) { if (!api_request_result.Is2XXResponseCode()) { std::move(callback).Run( - absl::nullopt, mojom::SolanaProviderError::kInternalError, + std::nullopt, mojom::SolanaProviderError::kInternalError, l10n_util::GetStringUTF8(IDS_WALLET_INTERNAL_ERROR)); return; } - absl::optional account_info; + std::optional account_info; if (!solana::ParseGetAccountInfo(api_request_result.value_body(), &account_info)) { mojom::SolanaProviderError error; std::string error_message; ParseErrorResult( api_request_result.value_body(), &error, &error_message); - std::move(callback).Run(absl::nullopt, error, error_message); + std::move(callback).Run(std::nullopt, error, error_message); return; } @@ -3298,7 +3298,7 @@ void JsonRpcService::OnAnkrGetAccountBalances( auto* blockchain_registry = BlockchainRegistry::GetInstance(); for (auto& balance : *result) { - absl::optional coingecko_id = + std::optional coingecko_id = blockchain_registry->GetCoingeckoId(balance->asset->chain_id, balance->asset->contract_address); if (coingecko_id) { diff --git a/components/brave_wallet/browser/json_rpc_service.h b/components/brave_wallet/browser/json_rpc_service.h index f28a53a770f..41f5d965515 100644 --- a/components/brave_wallet/browser/json_rpc_service.h +++ b/components/brave_wallet/browser/json_rpc_service.h @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -225,17 +226,17 @@ class JsonRpcService : public KeyedService, public mojom::JsonRpcService { bool SetNetwork(const std::string& chain_id, mojom::CoinType coin, - const absl::optional<::url::Origin>& origin); + const std::optional<::url::Origin>& origin); void SetNetwork(const std::string& chain_id, mojom::CoinType coin, - const absl::optional<::url::Origin>& origin, + const std::optional<::url::Origin>& origin, SetNetworkCallback callback) override; void GetNetwork(mojom::CoinType coin, - const absl::optional<::url::Origin>& origin, + const std::optional<::url::Origin>& origin, GetNetworkCallback callback) override; mojom::NetworkInfoPtr GetNetworkSync( mojom::CoinType coin, - const absl::optional<::url::Origin>& origin); + const std::optional<::url::Origin>& origin); void AddChain(mojom::NetworkInfoPtr chain, AddChainCallback callback) override; @@ -248,7 +249,7 @@ class JsonRpcService : public KeyedService, public mojom::JsonRpcService { RemoveChainCallback callback) override; std::string GetChainIdSync(mojom::CoinType coin, - const absl::optional<::url::Origin>& origin) const; + const std::optional<::url::Origin>& origin) const; void GetDefaultChainId( mojom::CoinType coin, mojom::JsonRpcService::GetDefaultChainIdCallback callback) override; @@ -278,10 +279,10 @@ class JsonRpcService : public KeyedService, public mojom::JsonRpcService { const std::string& chain_id, RemoveHiddenNetworkCallback callback) override; std::string GetNetworkUrl(mojom::CoinType coin, - const absl::optional<::url::Origin>& origin) const; + const std::optional<::url::Origin>& origin) const; void GetNetworkUrl( mojom::CoinType coin, - const absl::optional<::url::Origin>& origin, + const std::optional<::url::Origin>& origin, mojom::JsonRpcService::GetNetworkUrlCallback callback) override; void AddObserver( @@ -400,7 +401,7 @@ class JsonRpcService : public KeyedService, public mojom::JsonRpcService { GetSupportsInterfaceCallback callback); using GetEthNftStandardCallback = - base::OnceCallback& standard, + base::OnceCallback& standard, mojom::ProviderError error, const std::string& error_message)>; void GetEthNftStandard(const std::string& contract_address, @@ -456,7 +457,7 @@ class JsonRpcService : public KeyedService, public mojom::JsonRpcService { GetSolTokenMetadataCallback callback) override; void IsSolanaBlockhashValid(const std::string& chain_id, const std::string& blockhash, - const absl::optional& commitment, + const std::optional& commitment, IsSolanaBlockhashValidCallback callback) override; using SendSolanaTransactionCallback = base::OnceCallback send_options, + std::optional send_options, SendSolanaTransactionCallback callback); using GetSolanaLatestBlockhashCallback = base::OnceCallback>& + const std::vector>& signature_statuses, mojom::SolanaProviderError error, const std::string& error_message)>; @@ -483,7 +484,7 @@ class JsonRpcService : public KeyedService, public mojom::JsonRpcService { const std::vector& tx_signatures, GetSolanaSignatureStatusesCallback callback); using GetSolanaAccountInfoCallback = - base::OnceCallback account_info, + base::OnceCallback account_info, mojom::SolanaProviderError error, const std::string& error_message)>; void GetSolanaAccountInfo(const std::string& chain_id, @@ -523,7 +524,7 @@ class JsonRpcService : public KeyedService, public mojom::JsonRpcService { private: void FireNetworkChanged(mojom::CoinType coin, const std::string& chain_id, - const absl::optional& origin); + const std::optional& origin); void FirePendingRequestCompleted(const std::string& chain_id, const std::string& error); bool HasAddChainRequestFromOrigin(const url::Origin& origin) const; @@ -569,22 +570,20 @@ class JsonRpcService : public KeyedService, public mojom::JsonRpcService { const unstoppable_domains::WalletAddressKey& key, const std::string& chain_id, APIRequestResult api_request_result); - void OnEnsGetEthAddrTaskDone( - EnsResolverTask* task, - absl::optional task_result, - absl::optional error); + void OnEnsGetEthAddrTaskDone(EnsResolverTask* task, + std::optional task_result, + std::optional error); void OnEnsGetContentHashTaskDone( EnsResolverTask* task, - absl::optional task_result, - absl::optional error); - void OnSnsGetSolAddrTaskDone( - SnsResolverTask* task, - absl::optional task_result, - absl::optional error); + std::optional task_result, + std::optional error); + void OnSnsGetSolAddrTaskDone(SnsResolverTask* task, + std::optional task_result, + std::optional error); void OnSnsResolveHostTaskDone( SnsResolverTask* task, - absl::optional task_result, - absl::optional error); + std::optional task_result, + std::optional error); void OnGetFilEstimateGas(GetFilEstimateGasCallback callback, APIRequestResult api_request_result); void OnGetEstimateGas(GetEstimateGasCallback callback, @@ -685,7 +684,7 @@ class JsonRpcService : public KeyedService, public mojom::JsonRpcService { unstoppable_domains::MultichainCalls ud_get_eth_addr_calls_; - unstoppable_domains::MultichainCalls> + unstoppable_domains::MultichainCalls> ud_resolve_dns_calls_; mojo::RemoteSet observers_; diff --git a/components/brave_wallet/browser/json_rpc_service_test_utils_unittest.cc b/components/brave_wallet/browser/json_rpc_service_test_utils_unittest.cc index a5f2b52950a..b0d8e6f52f5 100644 --- a/components/brave_wallet/browser/json_rpc_service_test_utils_unittest.cc +++ b/components/brave_wallet/browser/json_rpc_service_test_utils_unittest.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/json_rpc_service_test_utils.h" +#include #include #include "base/json/json_reader.h" @@ -20,7 +21,7 @@ namespace brave_wallet { namespace { std::string ParseRpcJsonResult(const std::string& json) { - absl::optional value = base::JSONReader::Read(json); + std::optional value = base::JSONReader::Read(json); EXPECT_TRUE(value); EXPECT_TRUE(value->is_dict()); EXPECT_THAT(value->GetDict(), @@ -192,7 +193,7 @@ TEST(JsonRpcServiceTestUtils, MakeJsonRpcStringResponse_Empty) { TEST(JsonRpcServiceTestUtils, MakeJsonRpcErrorResponse) { auto json = MakeJsonRpcErrorResponse(123, "Error!"); - absl::optional value = base::JSONReader::Read(json); + std::optional value = base::JSONReader::Read(json); ASSERT_TRUE(value); ASSERT_TRUE(value->is_dict()); EXPECT_EQ("2.0", *value->GetDict().FindString("jsonrpc")); @@ -206,7 +207,7 @@ TEST(JsonRpcServiceTestUtils, MakeJsonRpcValueResponse) { base::Value::Dict payload; payload.Set("test", 555); auto json = MakeJsonRpcValueResponse(base::Value(std::move(payload))); - absl::optional value = base::JSONReader::Read(json); + std::optional value = base::JSONReader::Read(json); ASSERT_TRUE(value); ASSERT_TRUE(value->is_dict()); EXPECT_EQ("2.0", *value->GetDict().FindString("jsonrpc")); diff --git a/components/brave_wallet/browser/json_rpc_service_unittest.cc b/components/brave_wallet/browser/json_rpc_service_unittest.cc index bcffd670b91..9c01ee338ed 100644 --- a/components/brave_wallet/browser/json_rpc_service_unittest.cc +++ b/components/brave_wallet/browser/json_rpc_service_unittest.cc @@ -3,21 +3,23 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include "brave/components/brave_wallet/browser/json_rpc_service.h" + #include + #include #include #include +#include #include #include #include -#include "base/functional/callback_helpers.h" -#include "brave/components/brave_wallet/browser/json_rpc_service.h" - #include "base/base64.h" #include "base/containers/span.h" #include "base/functional/bind.h" #include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/notreached.h" @@ -279,7 +281,7 @@ class TestJsonRpcServiceObserver MOCK_METHOD3(ChainChangedEvent, void(const std::string&, mojom::CoinType, - const absl::optional& origin)); + const std::optional& origin)); MOCK_METHOD2(OnIsEip1559Changed, void(const std::string&, bool)); @@ -298,7 +300,7 @@ class TestJsonRpcServiceObserver constexpr char https_metadata_response[] = R"({"attributes":[{"trait_type":"Feet","value":"Green Shoes"},{"trait_type":"Legs","value":"Tan Pants"},{"trait_type":"Suspenders","value":"White Suspenders"},{"trait_type":"Upper Body","value":"Indigo Turtleneck"},{"trait_type":"Sleeves","value":"Long Sleeves"},{"trait_type":"Hat","value":"Yellow / Blue Pointy Beanie"},{"trait_type":"Eyes","value":"White Nerd Glasses"},{"trait_type":"Mouth","value":"Toothpick"},{"trait_type":"Ears","value":"Bing Bong Stick"},{"trait_type":"Right Arm","value":"Swinging"},{"trait_type":"Left Arm","value":"Diamond Hand"},{"trait_type":"Background","value":"Blue"}],"description":"5,000 animated Invisible Friends hiding in the metaverse. A collection by Markus Magnusson & Random Character Collective.","image":"https://rcc.mypinata.cloud/ipfs/QmXmuSenZRnofhGMz2NyT3Yc4Zrty1TypuiBKDcaBsNw9V/1817.gif","name":"Invisible Friends #1817"})"; -absl::optional ToValue(const network::ResourceRequest& request) { +std::optional ToValue(const network::ResourceRequest& request) { std::string_view request_string(request.request_body->elements() ->at(0) .As() @@ -339,8 +341,7 @@ class EthCallHandler { const EthAddress& to() const { return to_; } - virtual absl::optional HandleEthCall( - eth_abi::Span call_data) = 0; + virtual std::optional HandleEthCall(eth_abi::Span call_data) = 0; protected: EthAddress to_; @@ -352,7 +353,7 @@ class SolRpcCallHandler { virtual ~SolRpcCallHandler() = default; virtual bool CallSupported(const base::Value::Dict& dict) = 0; - virtual absl::optional HandleCall( + virtual std::optional HandleCall( const base::Value::Dict& dict) = 0; void FailWithTimeout(bool fail_with_timeout = true) { @@ -360,11 +361,11 @@ class SolRpcCallHandler { } void Disable(bool disabled = true) { disabled_ = disabled; } - absl::optional AddressFromParams( + std::optional AddressFromParams( const base::Value::Dict& dict) { auto* params_list = dict.FindList("params"); if (!params_list || params_list->size() == 0) { - return absl::nullopt; + return std::nullopt; } return SolanaAddress::FromBase58((*params_list)[0].GetString()); @@ -447,7 +448,7 @@ class GetAccountInfoHandler : public SolRpcCallHandler { return std::vector(text.begin(), text.end()); } - absl::optional HandleCall( + std::optional HandleCall( const base::Value::Dict& dict) override { if (fail_with_timeout_) { return "timeout"; @@ -517,7 +518,7 @@ class GetProgramAccountsHandler : public SolRpcCallHandler { return data; } - absl::optional HandleCall( + std::optional HandleCall( const base::Value::Dict& dict) override { if (fail_with_timeout_) { return "timeout"; @@ -575,10 +576,10 @@ class JsonRpcEnpointHandler { public: explicit JsonRpcEnpointHandler(const GURL& endpoint) : endpoint_(endpoint) {} - absl::optional HandleRequest( + std::optional HandleRequest( const network::ResourceRequest& request) { if (request.url != endpoint_) { - return absl::nullopt; + return std::nullopt; } auto value = ToValue(request); @@ -589,7 +590,7 @@ class JsonRpcEnpointHandler { } } - return absl::nullopt; + return std::nullopt; } void AddEthCallHandler(EthCallHandler* handler) { @@ -601,10 +602,10 @@ class JsonRpcEnpointHandler { } protected: - absl::optional HandleCall(const base::Value::Dict& dict) { + std::optional HandleCall(const base::Value::Dict& dict) { auto* method = dict.FindString("method"); if (!method) { - return absl::nullopt; + return std::nullopt; } if (*method == "eth_call") { return HandleEthCall(dict); @@ -613,23 +614,23 @@ class JsonRpcEnpointHandler { return HandleSolRpcCall(dict); } - absl::optional HandleEthCall(const base::Value::Dict& dict) { + std::optional HandleEthCall(const base::Value::Dict& dict) { auto* params_list = dict.FindList("params"); if (!params_list || params_list->size() == 0 || !params_list->begin()->is_dict()) { - return absl::nullopt; + return std::nullopt; } auto& transaction_params = params_list->begin()->GetDict(); auto* data_param = transaction_params.FindString("data"); auto* to_param = transaction_params.FindString("to"); if (!data_param || !to_param || !EthAddress::FromHex(*to_param).IsValid()) { - return absl::nullopt; + return std::nullopt; } auto call_data = PrefixedHexStringToBytes(*data_param); if (!call_data) { - return absl::nullopt; + return std::nullopt; } for (auto* handler : eth_call_handlers_) { @@ -642,10 +643,10 @@ class JsonRpcEnpointHandler { return response; } } - return absl::nullopt; + return std::nullopt; } - absl::optional HandleSolRpcCall(const base::Value::Dict& dict) { + std::optional HandleSolRpcCall(const base::Value::Dict& dict) { for (auto* handler : sol_rpc_call_handlers_) { if (!handler->CallSupported(dict)) { continue; @@ -656,7 +657,7 @@ class JsonRpcEnpointHandler { return response; } } - return absl::nullopt; + return std::nullopt; } private: @@ -708,9 +709,9 @@ class JsonRpcServiceUnitTest : public testing::Test { ipfs::IpfsService::RegisterProfilePrefs(prefs_.registry()); json_rpc_service_ = std::make_unique( shared_url_loader_factory_, &prefs_, &local_state_prefs_); - SetNetwork(mojom::kLocalhostChainId, mojom::CoinType::ETH, absl::nullopt); - SetNetwork(mojom::kLocalhostChainId, mojom::CoinType::SOL, absl::nullopt); - SetNetwork(mojom::kLocalhostChainId, mojom::CoinType::FIL, absl::nullopt); + SetNetwork(mojom::kLocalhostChainId, mojom::CoinType::ETH, std::nullopt); + SetNetwork(mojom::kLocalhostChainId, mojom::CoinType::SOL, std::nullopt); + SetNetwork(mojom::kLocalhostChainId, mojom::CoinType::FIL, std::nullopt); } ~JsonRpcServiceUnitTest() override = default; @@ -1071,12 +1072,12 @@ class JsonRpcServiceUnitTest : public testing::Test { bool SetNetwork(const std::string& chain_id, mojom::CoinType coin, - const absl::optional<::url::Origin>& origin) { + const std::optional<::url::Origin>& origin) { return json_rpc_service_->SetNetwork(chain_id, coin, origin); } std::string GetChainId(mojom::CoinType coin, - const absl::optional<::url::Origin>& origin) { + const std::optional<::url::Origin>& origin) { std::string chain_id_out; base::RunLoop run_loop; if (!origin) { @@ -1098,7 +1099,7 @@ class JsonRpcServiceUnitTest : public testing::Test { } std::string GetNetworkUrl(mojom::CoinType coin, - const absl::optional<::url::Origin>& origin) { + const std::optional<::url::Origin>& origin) { std::string url_out; base::RunLoop run_loop; json_rpc_service_->GetNetworkUrl( @@ -1116,7 +1117,7 @@ class JsonRpcServiceUnitTest : public testing::Test { const std::string& expected_bytecode, mojom::ProviderError expected_error, const std::string& expected_error_message) { - absl::optional result; + std::optional result; base::RunLoop run_loop; json_rpc_service_->GetCode( address, coin, chain_id, @@ -1270,14 +1271,14 @@ class JsonRpcServiceUnitTest : public testing::Test { const std::string& contract_address, const std::string& chain_id, std::vector& interfaces, - const absl::optional& expected_standard, + const std::optional& expected_standard, mojom::ProviderError expected_error, const std::string& expected_error_message) { base::RunLoop run_loop; json_rpc_service_->GetEthNftStandard( contract_address, chain_id, interfaces, base::BindLambdaForTesting( - [&](const absl::optional& standard, + [&](const std::optional& standard, mojom::ProviderError error, const std::string& error_message) { EXPECT_EQ(standard, expected_standard); EXPECT_EQ(error, expected_error); @@ -1433,7 +1434,7 @@ class JsonRpcServiceUnitTest : public testing::Test { const std::string& signed_tx = "signed_tx") { base::RunLoop run_loop; json_rpc_service_->SendSolanaTransaction( - chain_id, signed_tx, absl::nullopt, + chain_id, signed_tx, std::nullopt, base::BindLambdaForTesting([&](const std::string& tx_id, mojom::SolanaProviderError error, const std::string& error_message) { @@ -1469,14 +1470,14 @@ class JsonRpcServiceUnitTest : public testing::Test { void TestGetSolanaSignatureStatuses( const std::string& chain_id, const std::vector& tx_signatures, - const std::vector>& expected_stats, + const std::vector>& expected_stats, mojom::SolanaProviderError expected_error, const std::string& expected_error_message) { base::RunLoop run_loop; json_rpc_service_->GetSolanaSignatureStatuses( chain_id, tx_signatures, base::BindLambdaForTesting( - [&](const std::vector>& stats, + [&](const std::vector>& stats, mojom::SolanaProviderError error, const std::string& error_message) { EXPECT_EQ(stats, expected_stats); @@ -1489,14 +1490,14 @@ class JsonRpcServiceUnitTest : public testing::Test { void TestGetSolanaAccountInfo( const std::string& chain_id, - absl::optional expected_account_info, + std::optional expected_account_info, mojom::SolanaProviderError expected_error, const std::string& expected_error_message) { base::RunLoop run_loop; json_rpc_service_->GetSolanaAccountInfo( chain_id, "vines1vzrYbzLMRdu58ou5XTby4qAqVRLmqo36NKPTg", base::BindLambdaForTesting( - [&](absl::optional account_info, + [&](std::optional account_info, mojom::SolanaProviderError error, const std::string& error_message) { EXPECT_EQ(account_info, expected_account_info); @@ -1571,7 +1572,7 @@ class JsonRpcServiceUnitTest : public testing::Test { base::RunLoop run_loop; json_rpc_service_->IsSolanaBlockhashValid( mojom::kSolanaMainnet, "J7rBdM6AecPDEZp8aPq5iPSNKVkU5Q76F3oAV4eW5wsW", - absl::nullopt, + std::nullopt, base::BindLambdaForTesting([&](bool is_valid, mojom::SolanaProviderError error, const std::string& error_message) { @@ -1684,25 +1685,25 @@ TEST_F(JsonRpcServiceUnitTest, SetNetwork) { brave_wallet::GetAllKnownChains(prefs(), mojom::CoinType::ETH)) { SCOPED_TRACE(network->chain_id); EXPECT_TRUE( - SetNetwork(network->chain_id, mojom::CoinType::ETH, absl::nullopt)); + SetNetwork(network->chain_id, mojom::CoinType::ETH, std::nullopt)); EXPECT_TRUE( SetNetwork(mojom::kGoerliChainId, mojom::CoinType::ETH, origin_a)); EXPECT_EQ(network->chain_id, - GetCurrentChainId(prefs(), mojom::CoinType::ETH, absl::nullopt)); + GetCurrentChainId(prefs(), mojom::CoinType::ETH, std::nullopt)); EXPECT_EQ(mojom::kGoerliChainId, GetCurrentChainId(prefs(), mojom::CoinType::ETH, origin_a)); EXPECT_EQ(network->chain_id, GetCurrentChainId(prefs(), mojom::CoinType::ETH, origin_b)); - EXPECT_EQ(GetChainId(mojom::CoinType::ETH, absl::nullopt), + EXPECT_EQ(GetChainId(mojom::CoinType::ETH, std::nullopt), network->chain_id); EXPECT_EQ(GetChainId(mojom::CoinType::ETH, origin_a), mojom::kGoerliChainId); EXPECT_EQ(GetChainId(mojom::CoinType::ETH, origin_b), network->chain_id); EXPECT_EQ(url::Origin::Create( - GURL(GetNetworkUrl(mojom::CoinType::ETH, absl::nullopt))), + GURL(GetNetworkUrl(mojom::CoinType::ETH, std::nullopt))), url::Origin::Create(GetActiveEndpointUrl(*network))); EXPECT_EQ(url::Origin::Create( GURL(GetNetworkUrl(mojom::CoinType::ETH, origin_a))), @@ -1714,25 +1715,25 @@ TEST_F(JsonRpcServiceUnitTest, SetNetwork) { // Solana EXPECT_TRUE( - SetNetwork(mojom::kSolanaMainnet, mojom::CoinType::SOL, absl::nullopt)); - EXPECT_FALSE(SetNetwork("0x1234", mojom::CoinType::SOL, absl::nullopt)); + SetNetwork(mojom::kSolanaMainnet, mojom::CoinType::SOL, std::nullopt)); + EXPECT_FALSE(SetNetwork("0x1234", mojom::CoinType::SOL, std::nullopt)); EXPECT_TRUE( SetNetwork(mojom::kSolanaTestnet, mojom::CoinType::SOL, origin_a)); EXPECT_EQ(mojom::kSolanaMainnet, - GetCurrentChainId(prefs(), mojom::CoinType::SOL, absl::nullopt)); + GetCurrentChainId(prefs(), mojom::CoinType::SOL, std::nullopt)); EXPECT_EQ(mojom::kSolanaTestnet, GetCurrentChainId(prefs(), mojom::CoinType::SOL, origin_a)); EXPECT_EQ(mojom::kSolanaMainnet, GetCurrentChainId(prefs(), mojom::CoinType::SOL, origin_b)); - EXPECT_EQ(GetChainId(mojom::CoinType::SOL, absl::nullopt), + EXPECT_EQ(GetChainId(mojom::CoinType::SOL, std::nullopt), mojom::kSolanaMainnet); EXPECT_EQ(GetChainId(mojom::CoinType::SOL, origin_a), mojom::kSolanaTestnet); EXPECT_EQ(GetChainId(mojom::CoinType::SOL, origin_b), mojom::kSolanaMainnet); EXPECT_EQ(url::Origin::Create( - GURL(GetNetworkUrl(mojom::CoinType::SOL, absl::nullopt))), + GURL(GetNetworkUrl(mojom::CoinType::SOL, std::nullopt))), url::Origin::Create(GURL("https://mainnet-beta-solana.brave.com"))); EXPECT_EQ( url::Origin::Create(GURL(GetNetworkUrl(mojom::CoinType::SOL, origin_a))), @@ -1754,14 +1755,14 @@ TEST_F(JsonRpcServiceUnitTest, SetCustomNetwork) { values.push_back(NetworkInfoToValue(chain2)); UpdateCustomNetworks(prefs(), &values); - EXPECT_TRUE(SetNetwork(chain1.chain_id, mojom::CoinType::ETH, absl::nullopt)); + EXPECT_TRUE(SetNetwork(chain1.chain_id, mojom::CoinType::ETH, std::nullopt)); EXPECT_TRUE(SetNetwork(chain2.chain_id, mojom::CoinType::ETH, origin_a)); - EXPECT_EQ(GetChainId(mojom::CoinType::ETH, absl::nullopt), chain1.chain_id); + EXPECT_EQ(GetChainId(mojom::CoinType::ETH, std::nullopt), chain1.chain_id); EXPECT_EQ(GetChainId(mojom::CoinType::ETH, origin_a), chain2.chain_id); EXPECT_EQ(GetChainId(mojom::CoinType::ETH, origin_b), chain1.chain_id); - EXPECT_EQ(GetNetworkUrl(mojom::CoinType::ETH, absl::nullopt), + EXPECT_EQ(GetNetworkUrl(mojom::CoinType::ETH, std::nullopt), GetActiveEndpointUrl(chain1)); EXPECT_EQ(GetNetworkUrl(mojom::CoinType::ETH, origin_a), GetActiveEndpointUrl(chain2)); @@ -1882,7 +1883,7 @@ TEST_F(JsonRpcServiceUnitTest, GetHiddenNetworks) { testing::Mock::VerifyAndClearExpectations(&callback); // Change active network so kLocalhostChainId becomes hidden. - SetNetwork(mojom::kMainnetChainId, mojom::CoinType::ETH, absl::nullopt); + SetNetwork(mojom::kMainnetChainId, mojom::CoinType::ETH, std::nullopt); EXPECT_CALL( callback, Run(ElementsAreArray({mojom::kSepoliaChainId, mojom::kLocalhostChainId, @@ -2843,7 +2844,7 @@ class UDGetManyCallHandler : public EthCallHandler { GetFunctionHashBytes4("getMany(string[],uint256)")) {} ~UDGetManyCallHandler() override = default; - absl::optional HandleEthCall(eth_abi::Span call_data) override { + std::optional HandleEthCall(eth_abi::Span call_data) override { auto [_, args] = eth_abi::ExtractFunctionSelectorAndArgsFromCall(call_data); auto keys_array = eth_abi::ExtractStringArrayFromTuple(args, 0); auto namehash_bytes = eth_abi::ExtractFixedBytesFromTuple(args, 32, 1); @@ -2996,7 +2997,7 @@ class UnstoppableDomainsUnitTest : public JsonRpcServiceUnitTest { void HandleRequest(const network::ResourceRequest& request) { url_loader_factory_.ClearResponses(); - absl::optional response; + std::optional response; if ((response = eth_mainnet_endpoint_handler_->HandleRequest(request))) { if (response == "timeout") { url_loader_factory_.AddResponse(request.url.spec(), "", @@ -3210,7 +3211,7 @@ TEST_F(UnstoppableDomainsUnitTest, GetWalletAddr_MultipleKeys) { TEST_F(UnstoppableDomainsUnitTest, ResolveDns_PolygonNetworkError) { base::MockCallback callback; EXPECT_CALL(callback, - Run(absl::optional(), mojom::ProviderError::kInternalError, + Run(std::optional(), mojom::ProviderError::kInternalError, l10n_util::GetStringUTF8(IDS_WALLET_INTERNAL_ERROR))); SetEthTimeoutResponse(); SetPolygonTimeoutResponse(); @@ -3220,7 +3221,7 @@ TEST_F(UnstoppableDomainsUnitTest, ResolveDns_PolygonNetworkError) { testing::Mock::VerifyAndClearExpectations(&callback); EXPECT_CALL(callback, - Run(absl::optional(), mojom::ProviderError::kInternalError, + Run(std::optional(), mojom::ProviderError::kInternalError, l10n_util::GetStringUTF8(IDS_WALLET_INTERNAL_ERROR))); SetEthRawResponse(DnsBraveResponse()); SetPolygonTimeoutResponse(); @@ -3230,7 +3231,7 @@ TEST_F(UnstoppableDomainsUnitTest, ResolveDns_PolygonNetworkError) { testing::Mock::VerifyAndClearExpectations(&callback); EXPECT_CALL(callback, - Run(absl::optional(), mojom::ProviderError::kParsingError, + Run(std::optional(), mojom::ProviderError::kParsingError, l10n_util::GetStringUTF8(IDS_WALLET_PARSING_ERROR))); SetEthRawResponse(DnsBraveResponse()); SetPolygonRawResponse("Not a json"); @@ -3239,7 +3240,7 @@ TEST_F(UnstoppableDomainsUnitTest, ResolveDns_PolygonNetworkError) { base::RunLoop().RunUntilIdle(); testing::Mock::VerifyAndClearExpectations(&callback); - EXPECT_CALL(callback, Run(absl::optional(), + EXPECT_CALL(callback, Run(std::optional(), mojom::ProviderError::kLimitExceeded, "Error!")); SetEthRawResponse(DnsBraveResponse()); SetPolygonRawResponse(MakeJsonRpcErrorResponse(-32005, "Error!")); @@ -3251,7 +3252,7 @@ TEST_F(UnstoppableDomainsUnitTest, ResolveDns_PolygonNetworkError) { TEST_F(UnstoppableDomainsUnitTest, ResolveDns_PolygonResult) { base::MockCallback callback; - EXPECT_CALL(callback, Run(absl::optional("https://brave.com"), + EXPECT_CALL(callback, Run(std::optional("https://brave.com"), mojom::ProviderError::kSuccess, "")); SetEthTimeoutResponse(); SetPolygonRawResponse(DnsBraveResponse()); @@ -3260,7 +3261,7 @@ TEST_F(UnstoppableDomainsUnitTest, ResolveDns_PolygonResult) { base::RunLoop().RunUntilIdle(); testing::Mock::VerifyAndClearExpectations(&callback); - EXPECT_CALL(callback, Run(absl::optional("https://brave.com"), + EXPECT_CALL(callback, Run(std::optional("https://brave.com"), mojom::ProviderError::kSuccess, "")); SetEthRawResponse(DnsIpfsResponse()); SetPolygonRawResponse(DnsBraveResponse()); @@ -3269,7 +3270,7 @@ TEST_F(UnstoppableDomainsUnitTest, ResolveDns_PolygonResult) { base::RunLoop().RunUntilIdle(); testing::Mock::VerifyAndClearExpectations(&callback); - EXPECT_CALL(callback, Run(absl::optional("https://brave.com"), + EXPECT_CALL(callback, Run(std::optional("https://brave.com"), mojom::ProviderError::kSuccess, "")); SetEthRawResponse(DnsEmptyResponse()); SetPolygonRawResponse(DnsBraveResponse()); @@ -3280,7 +3281,7 @@ TEST_F(UnstoppableDomainsUnitTest, ResolveDns_PolygonResult) { TEST_F(UnstoppableDomainsUnitTest, ResolveDns_FallbackToEthMainnet) { base::MockCallback callback; - EXPECT_CALL(callback, Run(absl::optional("ipfs://ipfs_hash"), + EXPECT_CALL(callback, Run(std::optional("ipfs://ipfs_hash"), mojom::ProviderError::kSuccess, "")); SetEthRawResponse(DnsIpfsResponse()); SetPolygonRawResponse(DnsEmptyResponse()); @@ -3289,7 +3290,7 @@ TEST_F(UnstoppableDomainsUnitTest, ResolveDns_FallbackToEthMainnet) { base::RunLoop().RunUntilIdle(); testing::Mock::VerifyAndClearExpectations(&callback); - EXPECT_CALL(callback, Run(absl::optional("https://brave.com"), + EXPECT_CALL(callback, Run(std::optional("https://brave.com"), mojom::ProviderError::kSuccess, "")); SetEthRawResponse(DnsBraveResponse()); SetPolygonRawResponse( @@ -3303,7 +3304,7 @@ TEST_F(UnstoppableDomainsUnitTest, ResolveDns_FallbackToEthMainnet) { TEST_F(UnstoppableDomainsUnitTest, ResolveDns_FallbackToEthMainnetError) { base::MockCallback callback; EXPECT_CALL(callback, - Run(absl::optional(), mojom::ProviderError::kInternalError, + Run(std::optional(), mojom::ProviderError::kInternalError, l10n_util::GetStringUTF8(IDS_WALLET_INTERNAL_ERROR))); SetEthTimeoutResponse(); SetPolygonRawResponse(DnsEmptyResponse()); @@ -3313,7 +3314,7 @@ TEST_F(UnstoppableDomainsUnitTest, ResolveDns_FallbackToEthMainnetError) { testing::Mock::VerifyAndClearExpectations(&callback); EXPECT_CALL(callback, - Run(absl::optional(), mojom::ProviderError::kSuccess, "")); + Run(std::optional(), mojom::ProviderError::kSuccess, "")); SetEthRawResponse( MakeJsonRpcStringArrayResponse({"", "", "", "", "", "invalid url"})); SetPolygonRawResponse(DnsEmptyResponse()); @@ -3326,7 +3327,7 @@ TEST_F(UnstoppableDomainsUnitTest, ResolveDns_FallbackToEthMainnetError) { TEST_F(UnstoppableDomainsUnitTest, ResolveDns_InvalidDomain) { base::MockCallback callback; EXPECT_CALL(callback, - Run(absl::optional(), mojom::ProviderError::kInvalidParams, + Run(std::optional(), mojom::ProviderError::kInvalidParams, l10n_util::GetStringUTF8(IDS_WALLET_INVALID_PARAMETERS))); json_rpc_service_->UnstoppableDomainsResolveDns("brave.test", callback.Get()); EXPECT_EQ(0, url_loader_factory_.NumPending()); @@ -3335,13 +3336,13 @@ TEST_F(UnstoppableDomainsUnitTest, ResolveDns_InvalidDomain) { TEST_F(UnstoppableDomainsUnitTest, ResolveDns_ManyCalls) { base::MockCallback callback1; - EXPECT_CALL(callback1, Run(absl::optional("https://brave.com"), + EXPECT_CALL(callback1, Run(std::optional("https://brave.com"), mojom::ProviderError::kSuccess, "")); base::MockCallback callback2; - EXPECT_CALL(callback2, Run(absl::optional("https://brave.com"), + EXPECT_CALL(callback2, Run(std::optional("https://brave.com"), mojom::ProviderError::kSuccess, "")); base::MockCallback callback3; - EXPECT_CALL(callback3, Run(absl::optional("ipfs://ipfs_hash"), + EXPECT_CALL(callback3, Run(std::optional("ipfs://ipfs_hash"), mojom::ProviderError::kSuccess, "")); auto& keys = unstoppable_domains::GetRecordKeys(); @@ -3440,10 +3441,10 @@ TEST_F(JsonRpcServiceUnitTest, UpdateIsEip1559NotCalledForKnownChains) { EXPECT_CALL(observer, OnIsEip1559Changed(_, _)).Times(0); EXPECT_CALL(observer, ChainChangedEvent(mojom::kMainnetChainId, mojom::CoinType::ETH, - testing::Eq(absl::nullopt))) + testing::Eq(std::nullopt))) .Times(1); EXPECT_TRUE( - SetNetwork(mojom::kMainnetChainId, mojom::CoinType::ETH, absl::nullopt)); + SetNetwork(mojom::kMainnetChainId, mojom::CoinType::ETH, std::nullopt)); base::RunLoop().RunUntilIdle(); EXPECT_TRUE(testing::Mock::VerifyAndClearExpectations(&observer)); } @@ -3461,10 +3462,10 @@ TEST_F(JsonRpcServiceUnitTest, UpdateIsEip1559LocalhostChain) { .Times(1); EXPECT_CALL(observer, ChainChangedEvent(mojom::kLocalhostChainId, mojom::CoinType::ETH, - testing::Eq(absl::nullopt))) + testing::Eq(std::nullopt))) .Times(1); - EXPECT_TRUE(SetNetwork(mojom::kLocalhostChainId, mojom::CoinType::ETH, - absl::nullopt)); + EXPECT_TRUE( + SetNetwork(mojom::kLocalhostChainId, mojom::CoinType::ETH, std::nullopt)); base::RunLoop().RunUntilIdle(); EXPECT_TRUE(testing::Mock::VerifyAndClearExpectations(&observer)); EXPECT_TRUE(GetIsEip1559FromPrefs(mojom::kLocalhostChainId)); @@ -3476,10 +3477,10 @@ TEST_F(JsonRpcServiceUnitTest, UpdateIsEip1559LocalhostChain) { .Times(1); EXPECT_CALL(observer, ChainChangedEvent(mojom::kLocalhostChainId, mojom::CoinType::ETH, - testing::Eq(absl::nullopt))) + testing::Eq(std::nullopt))) .Times(1); - EXPECT_TRUE(SetNetwork(mojom::kLocalhostChainId, mojom::CoinType::ETH, - absl::nullopt)); + EXPECT_TRUE( + SetNetwork(mojom::kLocalhostChainId, mojom::CoinType::ETH, std::nullopt)); base::RunLoop().RunUntilIdle(); EXPECT_TRUE(testing::Mock::VerifyAndClearExpectations(&observer)); EXPECT_FALSE(GetIsEip1559FromPrefs(mojom::kLocalhostChainId)); @@ -3491,10 +3492,10 @@ TEST_F(JsonRpcServiceUnitTest, UpdateIsEip1559LocalhostChain) { EXPECT_CALL(observer, OnIsEip1559Changed(_, _)).Times(0); EXPECT_CALL(observer, ChainChangedEvent(mojom::kLocalhostChainId, mojom::CoinType::ETH, - testing::Eq(absl::nullopt))) + testing::Eq(std::nullopt))) .Times(1); - EXPECT_TRUE(SetNetwork(mojom::kLocalhostChainId, mojom::CoinType::ETH, - absl::nullopt)); + EXPECT_TRUE( + SetNetwork(mojom::kLocalhostChainId, mojom::CoinType::ETH, std::nullopt)); base::RunLoop().RunUntilIdle(); EXPECT_TRUE(testing::Mock::VerifyAndClearExpectations(&observer)); EXPECT_FALSE(GetIsEip1559FromPrefs(mojom::kLocalhostChainId)); @@ -3504,10 +3505,10 @@ TEST_F(JsonRpcServiceUnitTest, UpdateIsEip1559LocalhostChain) { EXPECT_CALL(observer, OnIsEip1559Changed(_, _)).Times(0); EXPECT_CALL(observer, ChainChangedEvent(mojom::kLocalhostChainId, mojom::CoinType::ETH, - testing::Eq(absl::nullopt))) + testing::Eq(std::nullopt))) .Times(1); - EXPECT_TRUE(SetNetwork(mojom::kLocalhostChainId, mojom::CoinType::ETH, - absl::nullopt)); + EXPECT_TRUE( + SetNetwork(mojom::kLocalhostChainId, mojom::CoinType::ETH, std::nullopt)); base::RunLoop().RunUntilIdle(); EXPECT_TRUE(testing::Mock::VerifyAndClearExpectations(&observer)); EXPECT_FALSE(GetIsEip1559FromPrefs(mojom::kLocalhostChainId)); @@ -3531,9 +3532,9 @@ TEST_F(JsonRpcServiceUnitTest, UpdateIsEip1559CustomChain) { SetIsEip1559Interceptor(GetActiveEndpointUrl(chain1), true); EXPECT_CALL(observer, OnIsEip1559Changed(chain1.chain_id, true)).Times(1); EXPECT_CALL(observer, ChainChangedEvent(chain1.chain_id, mojom::CoinType::ETH, - testing::Eq(absl::nullopt))) + testing::Eq(std::nullopt))) .Times(1); - EXPECT_TRUE(SetNetwork(chain1.chain_id, mojom::CoinType::ETH, absl::nullopt)); + EXPECT_TRUE(SetNetwork(chain1.chain_id, mojom::CoinType::ETH, std::nullopt)); base::RunLoop().RunUntilIdle(); EXPECT_TRUE(testing::Mock::VerifyAndClearExpectations(&observer)); EXPECT_TRUE(GetIsEip1559FromPrefs(chain1.chain_id)); @@ -3544,9 +3545,9 @@ TEST_F(JsonRpcServiceUnitTest, UpdateIsEip1559CustomChain) { SetIsEip1559Interceptor(GetActiveEndpointUrl(chain2), false); EXPECT_CALL(observer, OnIsEip1559Changed(chain2.chain_id, false)).Times(1); EXPECT_CALL(observer, ChainChangedEvent(chain2.chain_id, mojom::CoinType::ETH, - testing::Eq(absl::nullopt))) + testing::Eq(std::nullopt))) .Times(1); - EXPECT_TRUE(SetNetwork(chain2.chain_id, mojom::CoinType::ETH, absl::nullopt)); + EXPECT_TRUE(SetNetwork(chain2.chain_id, mojom::CoinType::ETH, std::nullopt)); base::RunLoop().RunUntilIdle(); EXPECT_TRUE(testing::Mock::VerifyAndClearExpectations(&observer)); EXPECT_TRUE(testing::Mock::VerifyAndClearExpectations(&observer)); @@ -3558,9 +3559,9 @@ TEST_F(JsonRpcServiceUnitTest, UpdateIsEip1559CustomChain) { SetIsEip1559Interceptor(GetActiveEndpointUrl(chain2), false); EXPECT_CALL(observer, OnIsEip1559Changed(_, _)).Times(0); EXPECT_CALL(observer, ChainChangedEvent(chain2.chain_id, mojom::CoinType::ETH, - testing::Eq(absl::nullopt))) + testing::Eq(std::nullopt))) .Times(1); - EXPECT_TRUE(SetNetwork(chain2.chain_id, mojom::CoinType::ETH, absl::nullopt)); + EXPECT_TRUE(SetNetwork(chain2.chain_id, mojom::CoinType::ETH, std::nullopt)); base::RunLoop().RunUntilIdle(); EXPECT_TRUE(testing::Mock::VerifyAndClearExpectations(&observer)); EXPECT_TRUE(testing::Mock::VerifyAndClearExpectations(&observer)); @@ -3570,9 +3571,9 @@ TEST_F(JsonRpcServiceUnitTest, UpdateIsEip1559CustomChain) { SetHTTPRequestTimeoutInterceptor(); EXPECT_CALL(observer, OnIsEip1559Changed(_, _)).Times(0); EXPECT_CALL(observer, ChainChangedEvent(chain2.chain_id, mojom::CoinType::ETH, - testing::Eq(absl::nullopt))) + testing::Eq(std::nullopt))) .Times(1); - EXPECT_TRUE(SetNetwork(chain2.chain_id, mojom::CoinType::ETH, absl::nullopt)); + EXPECT_TRUE(SetNetwork(chain2.chain_id, mojom::CoinType::ETH, std::nullopt)); base::RunLoop().RunUntilIdle(); EXPECT_TRUE(testing::Mock::VerifyAndClearExpectations(&observer)); EXPECT_TRUE(testing::Mock::VerifyAndClearExpectations(&observer)); @@ -4043,11 +4044,11 @@ TEST_F(JsonRpcServiceUnitTest, Reset) { UpdateCustomNetworks(prefs(), &values); ASSERT_FALSE(GetAllEthCustomChains(prefs()).empty()); - EXPECT_TRUE(SetNetwork(mojom::kLocalhostChainId, mojom::CoinType::ETH, - absl::nullopt)); + EXPECT_TRUE( + SetNetwork(mojom::kLocalhostChainId, mojom::CoinType::ETH, std::nullopt)); prefs()->SetBoolean(kSupportEip1559OnLocalhostChain, true); EXPECT_TRUE(prefs()->HasPrefPath(kBraveWalletCustomNetworks)); - EXPECT_EQ(GetCurrentChainId(prefs(), mojom::CoinType::ETH, absl::nullopt), + EXPECT_EQ(GetCurrentChainId(prefs(), mojom::CoinType::ETH, std::nullopt), mojom::kLocalhostChainId); auto origin = url::Origin::Create(GURL("https://brave.com")); @@ -4063,7 +4064,7 @@ TEST_F(JsonRpcServiceUnitTest, Reset) { ASSERT_TRUE(GetAllEthCustomChains(prefs()).empty()); EXPECT_FALSE(prefs()->HasPrefPath(kBraveWalletCustomNetworks)); - EXPECT_EQ(GetCurrentChainId(prefs(), mojom::CoinType::ETH, absl::nullopt), + EXPECT_EQ(GetCurrentChainId(prefs(), mojom::CoinType::ETH, std::nullopt), mojom::kMainnetChainId); EXPECT_FALSE(prefs()->HasPrefPath(kSupportEip1559OnLocalhostChain)); EXPECT_TRUE(json_rpc_service_->add_chain_pending_requests_.empty()); @@ -4280,7 +4281,7 @@ TEST_F(JsonRpcServiceUnitTest, MigrateDeprecatedEthereumTestnets) { EXPECT_EQ(*selected_eth_network, mojom::kMainnetChainId); EXPECT_TRUE( prefs()->GetBoolean(kBraveWalletDeprecateEthereumTestNetworksMigrated)); - EXPECT_EQ(GetCurrentChainId(prefs(), mojom::CoinType::ETH, absl::nullopt), + EXPECT_EQ(GetCurrentChainId(prefs(), mojom::CoinType::ETH, std::nullopt), mojom::kMainnetChainId); } @@ -4308,7 +4309,7 @@ TEST_F(JsonRpcServiceUnitTest, MigrateDeprecatedEthereumTestnets) { EXPECT_EQ(*selected_eth_network, mojom::kSepoliaChainId); EXPECT_TRUE( prefs()->GetBoolean(kBraveWalletDeprecateEthereumTestNetworksMigrated)); - EXPECT_EQ(GetCurrentChainId(prefs(), mojom::CoinType::ETH, absl::nullopt), + EXPECT_EQ(GetCurrentChainId(prefs(), mojom::CoinType::ETH, std::nullopt), mojom::kSepoliaChainId); } @@ -4316,7 +4317,7 @@ TEST_F(JsonRpcServiceUnitTest, MigrateMultichainNetworks) { prefs()->ClearPref(kBraveWalletCustomNetworks); prefs()->ClearPref(kBraveWalletSelectedNetworks); - absl::optional old_custom_networks = base::JSONReader::Read(R"([ + std::optional old_custom_networks = base::JSONReader::Read(R"([ { "blockExplorerUrls": [ "https://thaichain.io" @@ -4428,12 +4429,12 @@ TEST_F(JsonRpcServiceUnitTest, GetSolanaSignatureStatuses) { "45j7s6NiJS3JAkvgkoc18WVAsiSaci2pxB2A6ueCJP4tprA2TFg9wSyTLeYouxPBJEMzJinE" "NTkpA52YStRW5Dia7"}; - std::vector> expected_statuses( + std::vector> expected_statuses( {SolanaSignatureStatus(UINT64_MAX, 10u, "", "confirmed"), SolanaSignatureStatus(72u, UINT64_MAX, "", "confirmed"), SolanaSignatureStatus( 1092u, 0u, R"({"InstructionError":[0,{"Custom":1}]})", "finalized"), - absl::nullopt}); + std::nullopt}); TestGetSolanaSignatureStatuses(mojom::kLocalhostChainId, tx_sigs, expected_statuses, mojom::SolanaProviderError::kSuccess, ""); @@ -4443,7 +4444,7 @@ TEST_F(JsonRpcServiceUnitTest, GetSolanaSignatureStatuses) { R"({"jsonrpc":"2.0","id":1,"result":"0"})"); TestGetSolanaSignatureStatuses( mojom::kLocalhostChainId, tx_sigs, - std::vector>(), + std::vector>(), mojom::SolanaProviderError::kParsingError, l10n_util::GetStringUTF8(IDS_WALLET_PARSING_ERROR)); @@ -4453,14 +4454,14 @@ TEST_F(JsonRpcServiceUnitTest, GetSolanaSignatureStatuses) { "code":-32601, "message": "method does not exist"}})"); TestGetSolanaSignatureStatuses( mojom::kLocalhostChainId, tx_sigs, - std::vector>(), + std::vector>(), mojom::SolanaProviderError::kMethodNotFound, "method does not exist"); // HTTP error SetHTTPRequestTimeoutInterceptor(); TestGetSolanaSignatureStatuses( mojom::kLocalhostChainId, tx_sigs, - std::vector>(), + std::vector>(), mojom::SolanaProviderError::kInternalError, l10n_util::GetStringUTF8(IDS_WALLET_INTERNAL_ERROR)); } @@ -4499,13 +4500,13 @@ TEST_F(JsonRpcServiceUnitTest, GetSolanaAccountInfo) { SetInterceptor( expected_network_url, "getAccountInfo", "", R"({"jsonrpc":"2.0","result":{"context":{"slot":123121238},"value":null},"id":1})"); - TestGetSolanaAccountInfo(mojom::kLocalhostChainId, absl::nullopt, + TestGetSolanaAccountInfo(mojom::kLocalhostChainId, std::nullopt, mojom::SolanaProviderError::kSuccess, ""); // Response parsing error SetInterceptor(expected_network_url, "getAccountInfo", "", R"({"jsonrpc":"2.0","id":1,"result":"0"})"); - TestGetSolanaAccountInfo(mojom::kLocalhostChainId, absl::nullopt, + TestGetSolanaAccountInfo(mojom::kLocalhostChainId, std::nullopt, mojom::SolanaProviderError::kParsingError, l10n_util::GetStringUTF8(IDS_WALLET_PARSING_ERROR)); @@ -4513,13 +4514,13 @@ TEST_F(JsonRpcServiceUnitTest, GetSolanaAccountInfo) { SetInterceptor(expected_network_url, "getAccountInfo", "", R"({"jsonrpc":"2.0","id":1,"error":{ "code":-32601, "message": "method does not exist"}})"); - TestGetSolanaAccountInfo(mojom::kLocalhostChainId, absl::nullopt, + TestGetSolanaAccountInfo(mojom::kLocalhostChainId, std::nullopt, mojom::SolanaProviderError::kMethodNotFound, "method does not exist"); // HTTP error SetHTTPRequestTimeoutInterceptor(); - TestGetSolanaAccountInfo(mojom::kLocalhostChainId, absl::nullopt, + TestGetSolanaAccountInfo(mojom::kLocalhostChainId, std::nullopt, mojom::SolanaProviderError::kInternalError, l10n_util::GetStringUTF8(IDS_WALLET_INTERNAL_ERROR)); } @@ -4785,7 +4786,7 @@ TEST_F(JsonRpcServiceUnitTest, GetSolanaTokenAccountsByOwner) { account_info.rent_epoch = 361; expected_account_infos.push_back(std::move(account_info)); - absl::optional solana_address = + std::optional solana_address = SolanaAddress::FromBase58("4fzcQKyGFuk55uJaBZtvTHh42RBxbrZMuXzsGQvBJbwF"); ASSERT_TRUE(solana_address); @@ -5149,7 +5150,7 @@ class EnsGetResolverHandler : public EthCallHandler { resolver_address_(resolver_address) {} ~EnsGetResolverHandler() override = default; - absl::optional HandleEthCall(eth_abi::Span call_data) override { + std::optional HandleEthCall(eth_abi::Span call_data) override { auto [_, args] = eth_abi::ExtractFunctionSelectorAndArgsFromCall(call_data); auto namehash_bytes = eth_abi::ExtractFixedBytesFromTuple(args, 32, 0); EXPECT_TRUE(namehash_bytes); @@ -5175,7 +5176,7 @@ class Ensip10SupportHandler : public EthCallHandler { GetFunctionHashBytes4("supportsInterface(bytes4)")) {} ~Ensip10SupportHandler() override = default; - absl::optional HandleEthCall(eth_abi::Span call_data) override { + std::optional HandleEthCall(eth_abi::Span call_data) override { auto [_, args] = eth_abi::ExtractFunctionSelectorAndArgsFromCall(call_data); auto arg_selector = eth_abi::ExtractFixedBytesFromTuple(args, 4, 0); @@ -5206,7 +5207,7 @@ class EnsGetRecordHandler : public EthCallHandler { result_contenthash_(result_contenthash) {} ~EnsGetRecordHandler() override = default; - absl::optional HandleEthCall(eth_abi::Span call_data) override { + std::optional HandleEthCall(eth_abi::Span call_data) override { if (offchain_lookup_) { auto extra_data = eth_abi::TupleEncoder().AddString("extra data").Encode(); @@ -5254,7 +5255,7 @@ class EnsGetRecordHandler : public EthCallHandler { eth_abi::TupleEncoder().AddBytes(contenthash)); } NOTREACHED(); - return absl::nullopt; + return std::nullopt; } void RespondWithOffchainLookup(GURL gateway_url) { @@ -5282,7 +5283,7 @@ class Ensip10ResolveHandler : public EthCallHandler { ~Ensip10ResolveHandler() override = default; - absl::optional HandleEthCall(eth_abi::Span call_data) override { + std::optional HandleEthCall(eth_abi::Span call_data) override { auto extra_data = eth_abi::TupleEncoder().AddString("extra data").Encode(); // Sending `bytes` as callData argument to gateway. Gateway will decode it @@ -5313,7 +5314,7 @@ class OffchainCallbackHandler : public EthCallHandler { GetFunctionHashBytes4("resolveCallback(bytes,bytes)")) {} ~OffchainCallbackHandler() override = default; - absl::optional HandleEthCall(eth_abi::Span call_data) override { + std::optional HandleEthCall(eth_abi::Span call_data) override { auto [_, args] = eth_abi::ExtractFunctionSelectorAndArgsFromCall(call_data); auto extra_data_bytes = eth_abi::ExtractBytesFromTuple(args, 1); @@ -5322,7 +5323,7 @@ class OffchainCallbackHandler : public EthCallHandler { auto bytes_result = eth_abi::ExtractBytesFromTuple(args, 0); if (!bytes_result) { - return absl::nullopt; + return std::nullopt; } // Just returning bytes result from gateway as is. @@ -5343,10 +5344,10 @@ class OffchainGatewayHandler { map_offchain_eth_address_(map_offchain_eth_address), map_offchain_contenthash_(map_offchain_contenthash) {} - absl::optional HandleRequest( + std::optional HandleRequest( const network::ResourceRequest& request) { if (request.url.host() != gateway_url_.host()) { - return absl::nullopt; + return std::nullopt; } if (respond_with_500_) { @@ -5355,7 +5356,7 @@ class OffchainGatewayHandler { auto payload = ToValue(request); if (!payload || !payload->is_dict()) { - return absl::nullopt; + return std::nullopt; } auto* sender = payload->GetDict().FindString("sender"); EXPECT_EQ(EthAddress::FromHex(*sender), resolver_address_); @@ -5364,14 +5365,14 @@ class OffchainGatewayHandler { auto bytes = PrefixedHexStringToBytes(*data); if (!bytes) { NOTREACHED(); - return absl::nullopt; + return std::nullopt; } auto [selector, args] = eth_abi::ExtractFunctionSelectorAndArgsFromCall(*bytes); bool ensip10_resolve = false; - absl::optional> encoded_call; + std::optional> encoded_call; if (ToHex(selector) == GetFunctionHash("resolve(bytes,bytes)")) { auto dns_encoded_name = eth_abi::ExtractBytesFromTuple(args, 0); EXPECT_TRUE(dns_encoded_name); @@ -5418,7 +5419,7 @@ class OffchainGatewayHandler { } } else { NOTREACHED(); - return absl::nullopt; + return std::nullopt; } if (ensip10_resolve) { @@ -6571,33 +6572,33 @@ TEST_F(JsonRpcServiceUnitTest, GetEthNftStandard) { // Empty interface IDs yields invalid params error TestGetEthNftStandard( "0x06012c8cf97BEaD5deAe237070F9587f8E7A266d", mojom::kMainnetChainId, - interfaces, absl::nullopt, mojom::ProviderError::kInvalidParams, + interfaces, std::nullopt, mojom::ProviderError::kInvalidParams, l10n_util::GetStringUTF8(IDS_WALLET_INVALID_PARAMETERS)); // Empty contract address yields invalid params error interfaces.push_back(kERC721InterfaceId); TestGetEthNftStandard( - "", mojom::kMainnetChainId, interfaces, absl::nullopt, + "", mojom::kMainnetChainId, interfaces, std::nullopt, mojom::ProviderError::kInvalidParams, l10n_util::GetStringUTF8(IDS_WALLET_INVALID_PARAMETERS)); // Empty chain ID yields invalid params error TestGetEthNftStandard( "0x06012c8cf97BEaD5deAe237070F9587f8E7A266d", "", interfaces, - absl::nullopt, mojom::ProviderError::kInvalidParams, + std::nullopt, mojom::ProviderError::kInvalidParams, l10n_util::GetStringUTF8(IDS_WALLET_INVALID_PARAMETERS)); // Valid inputs but HTTP Timeout SetHTTPRequestTimeoutInterceptor(); TestGetEthNftStandard("0x06012c8cf97BEaD5deAe237070F9587f8E7A266d", - mojom::kMainnetChainId, interfaces, absl::nullopt, + mojom::kMainnetChainId, interfaces, std::nullopt, mojom::ProviderError::kInternalError, l10n_util::GetStringUTF8(IDS_WALLET_INTERNAL_ERROR)); // Valid inputs, invalid provider JSON yields parsing error SetInvalidJsonInterceptor(); TestGetEthNftStandard("0x06012c8cf97BEaD5deAe237070F9587f8E7A266d", - mojom::kMainnetChainId, interfaces, absl::nullopt, + mojom::kMainnetChainId, interfaces, std::nullopt, mojom::ProviderError::kParsingError, l10n_util::GetStringUTF8(IDS_WALLET_PARSING_ERROR)); @@ -6640,7 +6641,7 @@ TEST_F(JsonRpcServiceUnitTest, GetEthNftStandard) { responses[kERC1155InterfaceId] = interface_not_supported_response; SetGetEthNftStandardInterceptor(network, responses); TestGetEthNftStandard("0x06012c8cf97BEaD5deAe237070F9587f8E7A266d", - mojom::kMainnetChainId, interfaces, absl::nullopt, + mojom::kMainnetChainId, interfaces, std::nullopt, mojom::ProviderError::kSuccess, ""); } @@ -6814,7 +6815,7 @@ TEST_F(JsonRpcServiceUnitTest, AnkrGetAccountBalances) { "0x2791bca1f2de4661ed88a30c99a7a9449aa84174": "usd-coin" } })"; - absl::optional coingecko_ids_map = + std::optional coingecko_ids_map = ParseCoingeckoIdsMap(coingecko_ids_json); ASSERT_TRUE(coingecko_ids_map); BlockchainRegistry::GetInstance()->UpdateCoingeckoIdsMap( diff --git a/components/brave_wallet/browser/keyring_service.cc b/components/brave_wallet/browser/keyring_service.cc index 1e338d25b6b..1a5acf4eb89 100644 --- a/components/brave_wallet/browser/keyring_service.cc +++ b/components/brave_wallet/browser/keyring_service.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_wallet/browser/keyring_service.h" #include +#include #include #include #include @@ -49,7 +50,6 @@ #include "components/prefs/pref_service.h" #include "components/prefs/scoped_user_pref_update.h" #include "crypto/random.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/re2/src/re2/re2.h" #include "ui/base/l10n/l10n_util.h" @@ -196,8 +196,8 @@ std::string GetRootPath(mojom::KeyringId keyring_id) { return ""; } -absl::optional ExtractAccountIndex(mojom::KeyringId keyring_id, - const std::string& path) { +std::optional ExtractAccountIndex(mojom::KeyringId keyring_id, + const std::string& path) { CHECK(keyring_id == mojom::KeyringId::kDefault || keyring_id == mojom::KeyringId::kFilecoin || keyring_id == mojom::KeyringId::kFilecoinTestnet || @@ -213,25 +213,25 @@ absl::optional ExtractAccountIndex(mojom::KeyringId keyring_id, auto account_index = std::string_view(path); auto root_path = GetRootPath(keyring_id); if (!base::StartsWith(account_index, root_path)) { - return absl::nullopt; + return std::nullopt; } account_index.remove_prefix(root_path.size()); if (!base::StartsWith(account_index, "/")) { - return absl::nullopt; + return std::nullopt; } account_index.remove_prefix(1); if (keyring_id == mojom::KeyringId::kSolana) { if (!base::EndsWith(account_index, "'/0'")) { - return absl::nullopt; + return std::nullopt; } account_index.remove_suffix(4); } uint32_t result = 0; if (!base::StringToUint(account_index, &result)) { - return absl::nullopt; + return std::nullopt; } return result; @@ -370,10 +370,10 @@ struct ImportedAccountInfo { return base::Value(std::move(imported_account)); } - static absl::optional FromValue( + static std::optional FromValue( const base::Value& value) { if (!value.is_dict()) { - return absl::nullopt; + return std::nullopt; } auto& value_dict = value.GetDict(); @@ -382,13 +382,13 @@ struct ImportedAccountInfo { const std::string* encrypted_private_key = value_dict.FindString(kEncryptedPrivateKey); if (!account_name || !account_address || !encrypted_private_key) { - return absl::nullopt; + return std::nullopt; } auto encrypted_private_key_decoded = base::Base64Decode(*encrypted_private_key); if (!encrypted_private_key_decoded) { - return absl::nullopt; + return std::nullopt; } return ImportedAccountInfo(*account_name, *account_address, @@ -482,11 +482,10 @@ struct DerivedAccountInfo { return base::Value(std::move(derived_account)); } - static absl::optional FromValue( - const base::Value& value) { + static std::optional FromValue(const base::Value& value) { auto* value_dict = value.GetIfDict(); if (!value_dict) { - return absl::nullopt; + return std::nullopt; } const std::string* account_index_string = value_dict->FindString(kAccountIndex); @@ -494,12 +493,12 @@ struct DerivedAccountInfo { const std::string* account_address = value_dict->FindString(kAccountAddress); if (!account_index_string || !account_name || !account_address) { - return absl::nullopt; + return std::nullopt; } uint32_t account_index = 0; if (!base::StringToUint(*account_index_string, &account_index)) { - return absl::nullopt; + return std::nullopt; } DerivedAccountInfo account_info(account_index, *account_name, @@ -509,7 +508,7 @@ struct DerivedAccountInfo { uint32_t bitcoin_receive_value = 0; if (!base::StringToUint(*bitcoin_receive_string, &bitcoin_receive_value)) { - return absl::nullopt; + return std::nullopt; } account_info.bitcoin_next_receive_address_index = bitcoin_receive_value; } @@ -517,7 +516,7 @@ struct DerivedAccountInfo { value_dict->FindStringByDottedPath(kBitcoinNextChangeIndex)) { uint32_t bitcoin_change_value = 0; if (!base::StringToUint(*bitcoin_change_string, &bitcoin_change_value)) { - return absl::nullopt; + return std::nullopt; } account_info.bitcoin_next_change_address_index = bitcoin_change_value; } @@ -528,8 +527,8 @@ struct DerivedAccountInfo { uint32_t account_index; std::string account_name; std::string account_address; - absl::optional bitcoin_next_receive_address_index; - absl::optional bitcoin_next_change_address_index; + std::optional bitcoin_next_receive_address_index; + std::optional bitcoin_next_change_address_index; }; // Gets all hd account from prefs. @@ -735,8 +734,8 @@ void KeyringService::MigrateDerivedAccountIndex(PrefService* profile_prefs) { } // static -absl::optional& KeyringService::GetPbkdf2IterationsForTesting() { - static absl::optional iterations; +std::optional& KeyringService::GetPbkdf2IterationsForTesting() { + static std::optional iterations; return iterations; } @@ -752,7 +751,7 @@ void KeyringService::Bind( } // static -absl::optional KeyringService::GetKeyringIdForCoinNonFIL( +std::optional KeyringService::GetKeyringIdForCoinNonFIL( mojom::CoinType coin) { // TODO(apaymyshev): we should get rid of these methods which try to guess // keyring_id by coin as this is not possible for filecoin and bitcoin. In @@ -760,7 +759,7 @@ absl::optional KeyringService::GetKeyringIdForCoinNonFIL( DCHECK_NE(coin, mojom::CoinType::BTC) << "Bitcoin not supported"; if (coin == mojom::CoinType::FIL) { - return absl::nullopt; + return std::nullopt; } else if (coin == mojom::CoinType::SOL) { return mojom::kSolanaKeyringId; } @@ -1432,7 +1431,7 @@ void KeyringService::SetSelectedWalletAccountInternal( account_id.keyring_id == mojom::kFilecoinKeyringId ? mojom::kFilecoinMainnet : mojom::kFilecoinTestnet, - account_id.coin, absl::nullopt); + account_id.coin, std::nullopt); } } } @@ -1693,27 +1692,27 @@ bool KeyringService::RemoveHardwareAccountInternal( return false; } -absl::optional KeyringService::SignTransactionByFilecoinKeyring( +std::optional KeyringService::SignTransactionByFilecoinKeyring( const mojom::AccountId& account_id, FilTransaction* tx) { if (!tx) { - return absl::nullopt; + return std::nullopt; } auto* keyring = GetHDKeyringById(account_id.keyring_id); if (!keyring) { - return absl::nullopt; + return std::nullopt; } return static_cast(keyring)->SignTransaction( account_id.address, tx); } -absl::optional KeyringService::GetDiscoveryAddress( +std::optional KeyringService::GetDiscoveryAddress( mojom::KeyringId keyring_id, int index) { auto* hd_keyring = GetHDKeyringById(keyring_id); if (!hd_keyring) { - return absl::nullopt; + return std::nullopt; } return hd_keyring->GetDiscoveryAddress(index); } @@ -1746,7 +1745,7 @@ KeyringService::SignatureWithError KeyringService::SignMessageByDefaultKeyring( SignatureWithError ret; auto* keyring = GetHDKeyringById(mojom::kDefaultKeyringId); if (!keyring || account_id->keyring_id != mojom::kDefaultKeyringId) { - ret.signature = absl::nullopt; + ret.signature = std::nullopt; ret.error_message = l10n_util::GetStringUTF8(IDS_BRAVE_WALLET_SIGN_MESSAGE_UNLOCK_FIRST); return ret; @@ -1758,7 +1757,7 @@ KeyringService::SignatureWithError KeyringService::SignMessageByDefaultKeyring( static_cast(keyring)->SignMessage(address, message, 0, is_eip712); if (signature.empty()) { - ret.signature = absl::nullopt; + ret.signature = std::nullopt; ret.error_message = l10n_util::GetStringFUTF8(IDS_BRAVE_WALLET_SIGN_MESSAGE_INVALID_ADDRESS, base::ASCIIToUTF16(address)); @@ -1790,7 +1789,7 @@ bool KeyringService::GetPublicKeyFromX25519_XSalsa20_Poly1305ByDefaultKeyring( EthAddress::FromHex(account_id->address).ToChecksumAddress(), key); } -absl::optional> +std::optional> KeyringService::DecryptCipherFromX25519_XSalsa20_Poly1305ByDefaultKeyring( const mojom::AccountIdPtr& account_id, const std::string& version, @@ -1799,11 +1798,11 @@ KeyringService::DecryptCipherFromX25519_XSalsa20_Poly1305ByDefaultKeyring( const std::vector& ciphertext) { CHECK(account_id); if (account_id->keyring_id != mojom::kDefaultKeyringId) { - return absl::nullopt; + return std::nullopt; } auto* keyring = GetHDKeyringById(mojom::kDefaultKeyringId); if (!keyring) { - return absl::nullopt; + return std::nullopt; } return static_cast(keyring) @@ -2084,18 +2083,18 @@ void KeyringService::ResetAutoLockTimer() { } // static -absl::optional> KeyringService::GetPrefInBytesForKeyring( +std::optional> KeyringService::GetPrefInBytesForKeyring( const PrefService& profile_prefs, const std::string& key, mojom::KeyringId keyring_id) { const base::Value* value = GetPrefForKeyring(profile_prefs, key, keyring_id); if (!value) { - return absl::nullopt; + return std::nullopt; } const std::string* encoded = value->GetIfString(); if (!encoded || encoded->empty()) { - return absl::nullopt; + return std::nullopt; } return base::Base64Decode(*encoded); @@ -2502,13 +2501,13 @@ void KeyringService::HasPendingUnlockRequest( std::move(callback).Run(HasPendingUnlockRequest()); } -absl::optional>> +std::optional>> KeyringService::GetZCashAddresses(const mojom::AccountId& account_id) { CHECK(IsZCashAccount(account_id)); auto* zcash_keyring = GetZCashKeyringById(account_id.keyring_id); if (!zcash_keyring) { - return absl::nullopt; + return std::nullopt; } // TODO(cypt4): store used addresses indexes in prefs. @@ -2521,7 +2520,7 @@ KeyringService::GetZCashAddresses(const mojom::AccountId& account_id) { mojom::ZCashKeyId::New(account_id.bitcoin_account_index, 0, i); auto address = zcash_keyring->GetAddress(*key_id); if (!address) { - return absl::nullopt; + return std::nullopt; } addresses.emplace_back(*address, std::move(key_id)); } @@ -2530,7 +2529,7 @@ KeyringService::GetZCashAddresses(const mojom::AccountId& account_id) { mojom::ZCashKeyId::New(account_id.bitcoin_account_index, 1, i); auto address = zcash_keyring->GetAddress(*key_id); if (!address) { - return absl::nullopt; + return std::nullopt; } addresses.emplace_back(*address, std::move(key_id)); } @@ -2538,7 +2537,7 @@ KeyringService::GetZCashAddresses(const mojom::AccountId& account_id) { return addresses; } -absl::optional KeyringService::GetZCashAddress( +std::optional KeyringService::GetZCashAddress( const mojom::AccountId& account_id, const mojom::ZCashKeyId& key_id) { CHECK(IsZCashAccount(account_id)); @@ -2546,13 +2545,13 @@ absl::optional KeyringService::GetZCashAddress( auto* zcash_keyring = GetZCashKeyringById(account_id.keyring_id); if (!zcash_keyring) { - return absl::nullopt; + return std::nullopt; } return zcash_keyring->GetAddress(key_id); } -absl::optional> KeyringService::GetZCashPubKey( +std::optional> KeyringService::GetZCashPubKey( const mojom::AccountIdPtr& account_id, const mojom::ZCashKeyIdPtr& key_id) { CHECK(account_id); @@ -2561,7 +2560,7 @@ absl::optional> KeyringService::GetZCashPubKey( auto* zcash_keyring = GetZCashKeyringById(account_id->keyring_id); if (!zcash_keyring) { - return absl::nullopt; + return std::nullopt; } return zcash_keyring->GetPubkey(*key_id); @@ -2569,8 +2568,8 @@ absl::optional> KeyringService::GetZCashPubKey( void KeyringService::UpdateNextUnusedAddressForBitcoinAccount( const mojom::AccountIdPtr& account_id, - absl::optional next_receive_index, - absl::optional next_change_index) { + std::optional next_receive_index, + std::optional next_change_index) { CHECK(account_id); CHECK(IsBitcoinAccount(*account_id)); CHECK(next_receive_index || next_change_index); @@ -2645,19 +2644,19 @@ mojom::BitcoinAccountInfoPtr KeyringService::GetBitcoinAccountInfo( return {}; } -absl::optional> +std::optional> KeyringService::GetBitcoinAddresses(const mojom::AccountIdPtr& account_id) { CHECK(account_id); CHECK(IsBitcoinAccount(*account_id)); auto* bitcoin_keyring = GetBitcoinKeyringById(account_id->keyring_id); if (!bitcoin_keyring) { - return absl::nullopt; + return std::nullopt; } auto bitcoin_account_info = GetBitcoinAccountInfo(account_id); if (!bitcoin_account_info) { - return absl::nullopt; + return std::nullopt; } std::vector addresses; @@ -2667,7 +2666,7 @@ KeyringService::GetBitcoinAddresses(const mojom::AccountIdPtr& account_id) { auto address = bitcoin_keyring->GetAddress(account_id->bitcoin_account_index, *key_id); if (!address) { - return absl::nullopt; + return std::nullopt; } addresses.emplace_back( mojom::BitcoinAddress::New(*address, std::move(key_id))); @@ -2678,7 +2677,7 @@ KeyringService::GetBitcoinAddresses(const mojom::AccountIdPtr& account_id) { auto address = bitcoin_keyring->GetAddress(account_id->bitcoin_account_index, *key_id); if (!address) { - return absl::nullopt; + return std::nullopt; } addresses.emplace_back( mojom::BitcoinAddress::New(*address, std::move(key_id))); @@ -2726,7 +2725,7 @@ mojom::BitcoinAddressPtr KeyringService::GetBitcoinAccountDiscoveryAddress( return mojom::BitcoinAddress::New(*address_string, key_id.Clone()); } -absl::optional> KeyringService::GetBitcoinPubkey( +std::optional> KeyringService::GetBitcoinPubkey( const mojom::AccountIdPtr& account_id, const mojom::BitcoinKeyIdPtr& key_id) { CHECK(account_id); @@ -2735,14 +2734,13 @@ absl::optional> KeyringService::GetBitcoinPubkey( auto* bitcoin_keyring = GetBitcoinKeyringById(account_id->keyring_id); if (!bitcoin_keyring) { - return absl::nullopt; + return std::nullopt; } return bitcoin_keyring->GetPubkey(account_id->bitcoin_account_index, *key_id); } -absl::optional> -KeyringService::SignMessageByBitcoinKeyring( +std::optional> KeyringService::SignMessageByBitcoinKeyring( const mojom::AccountIdPtr& account_id, const mojom::BitcoinKeyIdPtr& key_id, base::span message) { @@ -2752,14 +2750,14 @@ KeyringService::SignMessageByBitcoinKeyring( auto* bitcoin_keyring = GetBitcoinKeyringById(account_id->keyring_id); if (!bitcoin_keyring) { - return absl::nullopt; + return std::nullopt; } return bitcoin_keyring->SignMessage(account_id->bitcoin_account_index, *key_id, message); } -absl::optional> KeyringService::SignMessageByZCashKeyring( +std::optional> KeyringService::SignMessageByZCashKeyring( const mojom::AccountIdPtr& account_id, const mojom::ZCashKeyIdPtr& key_id, const base::span message) { @@ -2769,7 +2767,7 @@ absl::optional> KeyringService::SignMessageByZCashKeyring( auto* zcash_keyring = GetZCashKeyringById(account_id->keyring_id); if (!zcash_keyring) { - return absl::nullopt; + return std::nullopt; } return zcash_keyring->SignMessage(*key_id, message); diff --git a/components/brave_wallet/browser/keyring_service.h b/components/brave_wallet/browser/keyring_service.h index 6627217fb88..337ac88c9d0 100644 --- a/components/brave_wallet/browser/keyring_service.h +++ b/components/brave_wallet/browser/keyring_service.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_KEYRING_SERVICE_H_ #include +#include #include #include #include @@ -22,7 +23,6 @@ #include "mojo/public/cpp/bindings/pending_remote.h" #include "mojo/public/cpp/bindings/receiver_set.h" #include "mojo/public/cpp/bindings/remote_set.h" -#include "third_party/abseil-cpp/absl/types/optional.h" class PrefChangeRegistrar; class PrefService; @@ -56,7 +56,7 @@ class KeyringService : public KeyedService, public mojom::KeyringService { static void MigrateDerivedAccountIndex(PrefService* profile_prefs); void MaybeMigrateSelectedAccountPrefs(); - static absl::optional& GetPbkdf2IterationsForTesting(); + static std::optional& GetPbkdf2IterationsForTesting(); static void MigrateObsoleteProfilePrefs(PrefService* profile_prefs); static bool HasPrefForKeyring(const PrefService& profile_prefs, @@ -70,7 +70,7 @@ class KeyringService : public KeyedService, public mojom::KeyringService { const std::string& key, base::Value value, mojom::KeyringId keyring_id); - static absl::optional> GetPrefInBytesForKeyring( + static std::optional> GetPrefInBytesForKeyring( const PrefService& profile_prefs, const std::string& key, mojom::KeyringId keyring_id); @@ -79,7 +79,7 @@ class KeyringService : public KeyedService, public mojom::KeyringService { base::span bytes, mojom::KeyringId keyring_id); - static absl::optional GetKeyringIdForCoinNonFIL( + static std::optional GetKeyringIdForCoinNonFIL( mojom::CoinType coin); mojo::PendingRemote MakeRemote(); @@ -148,11 +148,11 @@ class KeyringService : public KeyedService, public mojom::KeyringService { void SignTransactionByDefaultKeyring(const mojom::AccountId& account_id, EthTransaction* tx, uint256_t chain_id); - absl::optional SignTransactionByFilecoinKeyring( + std::optional SignTransactionByFilecoinKeyring( const mojom::AccountId& account_id, FilTransaction* tx); - absl::optional GetDiscoveryAddress(mojom::KeyringId keyring_id, - int index); + std::optional GetDiscoveryAddress(mojom::KeyringId keyring_id, + int index); struct SignatureWithError { SignatureWithError(); @@ -162,7 +162,7 @@ class KeyringService : public KeyedService, public mojom::KeyringService { SignatureWithError& operator=(const SignatureWithError&) = delete; ~SignatureWithError(); - absl::optional> signature; + std::optional> signature; std::string error_message; }; SignatureWithError SignMessageByDefaultKeyring( @@ -179,7 +179,7 @@ class KeyringService : public KeyedService, public mojom::KeyringService { bool GetPublicKeyFromX25519_XSalsa20_Poly1305ByDefaultKeyring( const mojom::AccountIdPtr& account_id, std::string* key); - absl::optional> + std::optional> DecryptCipherFromX25519_XSalsa20_Poly1305ByDefaultKeyring( const mojom::AccountIdPtr& account_id, const std::string& version, @@ -218,11 +218,11 @@ class KeyringService : public KeyedService, public mojom::KeyringService { void UpdateNextUnusedAddressForBitcoinAccount( const mojom::AccountIdPtr& account_id, - absl::optional next_receive_index, - absl::optional next_change_index); + std::optional next_receive_index, + std::optional next_change_index); mojom::BitcoinAccountInfoPtr GetBitcoinAccountInfo( const mojom::AccountIdPtr& account_id); - absl::optional> GetBitcoinAddresses( + std::optional> GetBitcoinAddresses( const mojom::AccountIdPtr& account_id); mojom::BitcoinAddressPtr GetBitcoinAddress( const mojom::AccountIdPtr& account_id, @@ -231,24 +231,23 @@ class KeyringService : public KeyedService, public mojom::KeyringService { const mojom::KeyringId keyring_id, uint32_t account_index, const mojom::BitcoinKeyIdPtr& key_id); - absl::optional> GetBitcoinPubkey( + std::optional> GetBitcoinPubkey( const mojom::AccountIdPtr& account_id, const mojom::BitcoinKeyIdPtr& key_id); - absl::optional> SignMessageByBitcoinKeyring( + std::optional> SignMessageByBitcoinKeyring( const mojom::AccountIdPtr& account_id, const mojom::BitcoinKeyIdPtr& key_id, base::span message); - absl::optional> SignMessageByZCashKeyring( + std::optional> SignMessageByZCashKeyring( const mojom::AccountIdPtr& account_id, const mojom::ZCashKeyIdPtr& key_id, const base::span message); - absl::optional>> + std::optional>> GetZCashAddresses(const mojom::AccountId& account_id); - absl::optional GetZCashAddress( - const mojom::AccountId& account_id, - const mojom::ZCashKeyId& key_id); - absl::optional> GetZCashPubKey( + std::optional GetZCashAddress(const mojom::AccountId& account_id, + const mojom::ZCashKeyId& key_id); + std::optional> GetZCashPubKey( const mojom::AccountIdPtr& account_id, const mojom::ZCashKeyIdPtr& key_id); diff --git a/components/brave_wallet/browser/nft_metadata_fetcher.cc b/components/brave_wallet/browser/nft_metadata_fetcher.cc index 55f9ad07915..47d429b9f9a 100644 --- a/components/brave_wallet/browser/nft_metadata_fetcher.cc +++ b/components/brave_wallet/browser/nft_metadata_fetcher.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/nft_metadata_fetcher.h" +#include #include #include @@ -27,10 +28,10 @@ namespace { -absl::optional DecodeUint32(const std::vector& input, - size_t& offset) { +std::optional DecodeUint32(const std::vector& input, + size_t& offset) { if (offset >= input.size() || input.size() - offset < sizeof(uint32_t)) { - return absl::nullopt; + return std::nullopt; } // Read bytes in little endian order. @@ -276,7 +277,7 @@ void NftMetadataFetcher::GetSolTokenMetadata( const std::string& token_mint_address, GetSolTokenMetadataCallback callback) { // Derive metadata PDA for the NFT accounts - absl::optional associated_metadata_account = + std::optional associated_metadata_account = SolanaKeyring::GetAssociatedMetadataAccount(token_mint_address); if (!associated_metadata_account) { std::move(callback).Run( @@ -294,7 +295,7 @@ void NftMetadataFetcher::GetSolTokenMetadata( void NftMetadataFetcher::OnGetSolanaAccountInfoTokenMetadata( GetSolTokenMetadataCallback callback, - absl::optional account_info, + std::optional account_info, mojom::SolanaProviderError error, const std::string& error_message) { if (error != mojom::SolanaProviderError::kSuccess || !account_info) { @@ -302,7 +303,7 @@ void NftMetadataFetcher::OnGetSolanaAccountInfoTokenMetadata( return; } - absl::optional> metadata = + std::optional> metadata = base::Base64Decode(account_info->data); if (!metadata) { @@ -311,7 +312,7 @@ void NftMetadataFetcher::OnGetSolanaAccountInfoTokenMetadata( return; } - absl::optional url = DecodeMetadataUri(*metadata); + std::optional url = DecodeMetadataUri(*metadata); if (!url || !url.value().is_valid()) { std::move(callback).Run("", "", mojom::SolanaProviderError::kParsingError, l10n_util::GetStringUTF8(IDS_WALLET_PARSING_ERROR)); @@ -344,7 +345,7 @@ void NftMetadataFetcher::CompleteGetSolTokenMetadata( // and returns the URI string in of the nested Data struct (see // https://docs.rs/spl-token-metadata/latest/spl_token_metadata/state/struct.Data.html) // as a GURL. -absl::optional NftMetadataFetcher::DecodeMetadataUri( +std::optional NftMetadataFetcher::DecodeMetadataUri( const std::vector& data) { size_t offset = 0; offset = offset + /* Skip first byte for metadata.key */ 1 + @@ -355,7 +356,7 @@ absl::optional NftMetadataFetcher::DecodeMetadataUri( // whose length is represented by a leading 32 bit integer auto length = DecodeUint32(data, offset); if (!length) { - return absl::nullopt; + return std::nullopt; } offset += static_cast(*length); @@ -363,19 +364,19 @@ absl::optional NftMetadataFetcher::DecodeMetadataUri( // whose length is represented by a leading 32 bit integer length = DecodeUint32(data, offset); if (!length) { - return absl::nullopt; + return std::nullopt; } offset += static_cast(*length); // Parse next field, metadata.data.uri, a string length = DecodeUint32(data, offset); if (!length) { - return absl::nullopt; + return std::nullopt; } // Prevent out of bounds access in case length value incorrent if (data.size() <= offset + *length) { - return absl::nullopt; + return std::nullopt; } std::string uri = std::string(data.begin() + offset, data.begin() + offset + *length); diff --git a/components/brave_wallet/browser/nft_metadata_fetcher.h b/components/brave_wallet/browser/nft_metadata_fetcher.h index 8306b7cfa85..a071588f47d 100644 --- a/components/brave_wallet/browser/nft_metadata_fetcher.h +++ b/components/brave_wallet/browser/nft_metadata_fetcher.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_NFT_METADATA_FETCHER_H_ #include +#include #include #include @@ -83,7 +84,7 @@ class NftMetadataFetcher { APIRequestResult api_request_result); void OnGetSolanaAccountInfoTokenMetadata( GetSolTokenMetadataCallback callback, - absl::optional account_info, + std::optional account_info, mojom::SolanaProviderError error, const std::string& error_message); void CompleteGetEthTokenMetadata(GetEthTokenMetadataCallback callback, @@ -100,7 +101,7 @@ class NftMetadataFetcher { friend class NftMetadataFetcherUnitTest; FRIEND_TEST_ALL_PREFIXES(NftMetadataFetcherUnitTest, DecodeMetadataUri); - static absl::optional DecodeMetadataUri( + static std::optional DecodeMetadataUri( const std::vector& data); scoped_refptr url_loader_factory_; diff --git a/components/brave_wallet/browser/nonce_tracker.cc b/components/brave_wallet/browser/nonce_tracker.cc index a8eeff9f3f8..770325c9496 100644 --- a/components/brave_wallet/browser/nonce_tracker.cc +++ b/components/brave_wallet/browser/nonce_tracker.cc @@ -11,7 +11,6 @@ #include "brave/components/brave_wallet/browser/tx_meta.h" #include "brave/components/brave_wallet/browser/tx_state_manager.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_wallet { diff --git a/components/brave_wallet/browser/password_encryptor.cc b/components/brave_wallet/browser/password_encryptor.cc index 111eb1489d7..9c070a7cc78 100644 --- a/components/brave_wallet/browser/password_encryptor.cc +++ b/components/brave_wallet/browser/password_encryptor.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/password_encryptor.h" +#include #include #include "brave/components/brave_wallet/common/mem_utils.h" @@ -52,7 +53,7 @@ std::vector PasswordEncryptor::Encrypt( return aead.Seal(plaintext, nonce, std::vector()); } -absl::optional> PasswordEncryptor::Decrypt( +std::optional> PasswordEncryptor::Decrypt( base::span ciphertext, base::span nonce) { crypto::Aead aead(crypto::Aead::AES_256_GCM_SIV); @@ -60,7 +61,7 @@ absl::optional> PasswordEncryptor::Decrypt( return aead.Open(ciphertext, nonce, std::vector()); } -absl::optional> PasswordEncryptor::DecryptForImporter( +std::optional> PasswordEncryptor::DecryptForImporter( base::span ciphertext, base::span nonce) { crypto::Aead aead(crypto::Aead::AES_256_GCM); diff --git a/components/brave_wallet/browser/password_encryptor.h b/components/brave_wallet/browser/password_encryptor.h index 71550b05e5e..996b60c34b0 100644 --- a/components/brave_wallet/browser/password_encryptor.h +++ b/components/brave_wallet/browser/password_encryptor.h @@ -7,12 +7,12 @@ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_PASSWORD_ENCRYPTOR_H_ #include +#include #include #include #include "base/containers/span.h" #include "base/gtest_prod_util.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_wallet { @@ -31,12 +31,12 @@ class PasswordEncryptor { std::vector Encrypt(base::span plaintext, base::span nonce); - absl::optional> Decrypt( + std::optional> Decrypt( base::span ciphertext, base::span nonce); // This can only be used by wallet importer - absl::optional> DecryptForImporter( + std::optional> DecryptForImporter( base::span ciphertext, base::span nonce); diff --git a/components/brave_wallet/browser/permission_utils.cc b/components/brave_wallet/browser/permission_utils.cc index addfa06b253..bdb984199b6 100644 --- a/components/brave_wallet/browser/permission_utils.cc +++ b/components/brave_wallet/browser/permission_utils.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/permission_utils.h" +#include #include #include "base/no_destructor.h" @@ -206,7 +207,7 @@ GURL GetConnectWithSiteWebUIURL(const GURL& webui_base_url, return webui_base_url.ReplaceComponents(replacements); } -absl::optional CoinTypeToPermissionType( +std::optional CoinTypeToPermissionType( mojom::CoinType coin_type) { switch (coin_type) { case mojom::CoinType::ETH: @@ -214,11 +215,11 @@ absl::optional CoinTypeToPermissionType( case mojom::CoinType::SOL: return blink::PermissionType::BRAVE_SOLANA; default: - return absl::nullopt; + return std::nullopt; } } -absl::optional CoinTypeToPermissionRequestType( +std::optional CoinTypeToPermissionRequestType( mojom::CoinType coin_type) { switch (coin_type) { case mojom::CoinType::ETH: @@ -226,7 +227,7 @@ absl::optional CoinTypeToPermissionRequestType( case mojom::CoinType::SOL: return permissions::RequestType::kBraveSolana; default: - return absl::nullopt; + return std::nullopt; } } diff --git a/components/brave_wallet/browser/permission_utils.h b/components/brave_wallet/browser/permission_utils.h index 674de63e729..d3ca13e8e16 100644 --- a/components/brave_wallet/browser/permission_utils.h +++ b/components/brave_wallet/browser/permission_utils.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_PERMISSION_UTILS_H_ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_PERMISSION_UTILS_H_ +#include #include #include #include @@ -78,10 +79,10 @@ GURL GetConnectWithSiteWebUIURL(const GURL& webui_base_url, const std::vector& accounts, const url::Origin& origin); -absl::optional CoinTypeToPermissionType( +std::optional CoinTypeToPermissionType( mojom::CoinType coin_type); -absl::optional CoinTypeToPermissionRequestType( +std::optional CoinTypeToPermissionRequestType( mojom::CoinType coin_type); } // namespace brave_wallet diff --git a/components/brave_wallet/browser/permission_utils_unittest.cc b/components/brave_wallet/browser/permission_utils_unittest.cc index 737763e1a91..aa82cd3407f 100644 --- a/components/brave_wallet/browser/permission_utils_unittest.cc +++ b/components/brave_wallet/browser/permission_utils_unittest.cc @@ -3,12 +3,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include "brave/components/brave_wallet/browser/permission_utils.h" + +#include #include #include #include "base/strings/string_util.h" #include "base/time/time.h" -#include "brave/components/brave_wallet/browser/permission_utils.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" #include "brave/components/permissions/permission_lifetime_utils.h" #include "testing/gtest/include/gtest/gtest.h" @@ -370,7 +372,7 @@ TEST(PermissionUtilsUnitTest, SyncingWithCreatePermissionLifetimeOptions) { EXPECT_EQ( options[static_cast(mojom::PermissionLifetimeOption::kForever)] .lifetime, - absl::nullopt); + std::nullopt); } TEST(PermissionUtilsUnitTest, CoinTypeToPermissionType) { diff --git a/components/brave_wallet/browser/simple_hash_client.cc b/components/brave_wallet/browser/simple_hash_client.cc index e38e446c2be..9a42b590045 100644 --- a/components/brave_wallet/browser/simple_hash_client.cc +++ b/components/brave_wallet/browser/simple_hash_client.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_wallet/browser/simple_hash_client.h" #include +#include #include #include "base/base64.h" @@ -62,7 +63,7 @@ constexpr char kPalm[] = "palm"; constexpr char kPolygonZkEvm[] = "polygon-zkevm"; constexpr char kZkSyncEra[] = "zksync-era"; -absl::optional ChainIdToSimpleHashChainId( +std::optional ChainIdToSimpleHashChainId( const std::string& chain_id) { static base::NoDestructor> chain_id_lookup({ @@ -84,13 +85,13 @@ absl::optional ChainIdToSimpleHashChainId( {brave_wallet::mojom::kZkSyncEraChainId, kZkSyncEra}, }); if (!chain_id_lookup->contains(chain_id)) { - return absl::nullopt; + return std::nullopt; } return chain_id_lookup->at(chain_id); } -absl::optional SimpleHashChainIdToChainId( +std::optional SimpleHashChainIdToChainId( const std::string& simple_hash_chain_id) { static base::NoDestructor> simple_hash_chain_id_lookup({ @@ -112,7 +113,7 @@ absl::optional SimpleHashChainIdToChainId( {kZkSyncEra, brave_wallet::mojom::kZkSyncEraChainId}, }); if (!simple_hash_chain_id_lookup->contains(simple_hash_chain_id)) { - return absl::nullopt; + return std::nullopt; } return simple_hash_chain_id_lookup->at(simple_hash_chain_id); @@ -149,18 +150,18 @@ void SimpleHashClient::FetchNFTsFromSimpleHash( const std::string& account_address, const std::vector& chain_ids, mojom::CoinType coin, - const absl::optional& cursor, + const std::optional& cursor, bool skip_spam, bool only_spam, FetchNFTsFromSimpleHashCallback callback) { if (!(coin == mojom::CoinType::ETH || coin == mojom::CoinType::SOL)) { - std::move(callback).Run({}, absl::nullopt); + std::move(callback).Run({}, std::nullopt); return; } GURL url = GetSimpleHashNftsByWalletUrl(account_address, chain_ids, cursor); if (!url.is_valid()) { - std::move(callback).Run({}, absl::nullopt); + std::move(callback).Run({}, std::nullopt); return; } @@ -182,22 +183,22 @@ void SimpleHashClient::OnFetchNFTsFromSimpleHash( APIRequestResult api_request_result) { std::vector nfts; if (!api_request_result.Is2XXResponseCode()) { - std::move(callback).Run(std::move(nfts), absl::nullopt); + std::move(callback).Run(std::move(nfts), std::nullopt); return; } // Invalid JSON becomes an empty string after sanitization if (api_request_result.body().empty()) { - std::move(callback).Run(std::move(nfts), absl::nullopt); + std::move(callback).Run(std::move(nfts), std::nullopt); return; } - absl::optional, - std::vector>> + std::optional, + std::vector>> result = ParseNFTsFromSimpleHash(api_request_result.value_body(), coin, skip_spam, only_spam); if (!result) { - std::move(callback).Run(std::move(nfts), absl::nullopt); + std::move(callback).Run(std::move(nfts), std::nullopt); return; } @@ -219,7 +220,7 @@ void SimpleHashClient::FetchAllNFTsFromSimpleHash( weak_ptr_factory_.GetWeakPtr(), std::vector(), account_address, chain_ids, coin, std::move(callback)); - FetchNFTsFromSimpleHash(account_address, chain_ids, coin, absl::nullopt, + FetchNFTsFromSimpleHash(account_address, chain_ids, coin, std::nullopt, true /* skip_spam*/, false /* only spam */, std::move(internal_callback)); } @@ -231,7 +232,7 @@ void SimpleHashClient::OnFetchAllNFTsFromSimpleHash( mojom::CoinType coin, FetchAllNFTsFromSimpleHashCallback callback, std::vector nfts, - const absl::optional& next_cursor) { + const std::optional& next_cursor) { // Combine the NFTs with the ones fetched already for (auto& token : nfts) { nfts_so_far.push_back(std::move(token)); @@ -254,8 +255,8 @@ void SimpleHashClient::OnFetchAllNFTsFromSimpleHash( std::move(callback).Run(std::move(nfts_so_far)); } -absl::optional, - std::vector>> +std::optional, + std::vector>> SimpleHashClient::ParseNFTsFromSimpleHash(const base::Value& json_value, mojom::CoinType coin, bool skip_spam, @@ -440,30 +441,30 @@ SimpleHashClient::ParseNFTsFromSimpleHash(const base::Value& json_value, // Only ETH and SOL NFTs are supported. if (!(coin == mojom::CoinType::ETH || coin == mojom::CoinType::SOL)) { - return absl::nullopt; + return std::nullopt; } // If both skip_spam and only_spam are true, return early. if (skip_spam && only_spam) { - return absl::nullopt; + return std::nullopt; } const base::Value::Dict* dict = json_value.GetIfDict(); if (!dict) { - return absl::nullopt; + return std::nullopt; } auto* next_cursor_ptr = dict->FindString("next_cursor"); - absl::optional next_cursor; + std::optional next_cursor; if (next_cursor_ptr) { next_cursor = *next_cursor_ptr; } else { - next_cursor = absl::nullopt; + next_cursor = std::nullopt; } const base::Value::List* nfts = dict->FindList("nfts"); if (!nfts) { - return absl::nullopt; + return std::nullopt; } std::vector nft_tokens; @@ -478,7 +479,7 @@ SimpleHashClient::ParseNFTsFromSimpleHash(const base::Value& json_value, if (!collection) { continue; } - absl::optional spam_score = collection->FindInt("spam_score"); + std::optional spam_score = collection->FindInt("spam_score"); if (skip_spam && (!spam_score || *spam_score > 0)) { continue; } @@ -498,7 +499,7 @@ SimpleHashClient::ParseNFTsFromSimpleHash(const base::Value& json_value, if (!chain) { continue; } - absl::optional chain_id = SimpleHashChainIdToChainId(*chain); + std::optional chain_id = SimpleHashChainIdToChainId(*chain); if (!chain_id) { continue; } @@ -600,7 +601,7 @@ SimpleHashClient::ParseNFTsFromSimpleHash(const base::Value& json_value, GURL SimpleHashClient::GetSimpleHashNftsByWalletUrl( const std::string& account_address, const std::vector& chain_ids, - const absl::optional& cursor) { + const std::optional& cursor) { if (chain_ids.empty() || account_address.empty()) { return GURL(); } @@ -610,7 +611,7 @@ GURL SimpleHashClient::GetSimpleHashNftsByWalletUrl( std::string chain_ids_param; for (const auto& chain_id : chain_ids) { - absl::optional simple_hash_chain_id = + std::optional simple_hash_chain_id = ChainIdToSimpleHashChainId(chain_id); if (simple_hash_chain_id) { if (!chain_ids_param.empty()) { diff --git a/components/brave_wallet/browser/simple_hash_client.h b/components/brave_wallet/browser/simple_hash_client.h index 0954f9d5ec3..4a2939c4bf0 100644 --- a/components/brave_wallet/browser/simple_hash_client.h +++ b/components/brave_wallet/browser/simple_hash_client.h @@ -8,6 +8,7 @@ #include #include +#include #include #include #include @@ -38,7 +39,7 @@ class SimpleHashClient { // For discovering NFTs on Solana and Ethereum using FetchNFTsFromSimpleHashCallback = base::OnceCallback nfts, - const absl::optional& cursor)>; + const std::optional& cursor)>; using FetchAllNFTsFromSimpleHashCallback = base::OnceCallback nfts)>; @@ -46,7 +47,7 @@ class SimpleHashClient { void FetchNFTsFromSimpleHash(const std::string& account_address, const std::vector& chain_ids, mojom::CoinType coin, - const absl::optional& cursor, + const std::optional& cursor, bool skip_spam, bool only_spam, FetchNFTsFromSimpleHashCallback callback); @@ -75,10 +76,10 @@ class SimpleHashClient { mojom::CoinType coin, FetchAllNFTsFromSimpleHashCallback callback, std::vector nfts, - const absl::optional& next_cursor); + const std::optional& next_cursor); - absl::optional, - std::vector>> + std::optional, + std::vector>> ParseNFTsFromSimpleHash(const base::Value& json_value, mojom::CoinType coin, bool skip_spam, @@ -87,7 +88,7 @@ class SimpleHashClient { static GURL GetSimpleHashNftsByWalletUrl( const std::string& account_address, const std::vector& chain_ids, - const absl::optional& cursor); + const std::optional& cursor); std::unique_ptr api_request_helper_; base::WeakPtrFactory weak_ptr_factory_; diff --git a/components/brave_wallet/browser/simple_hash_client_unittest.cc b/components/brave_wallet/browser/simple_hash_client_unittest.cc index 96cc9a42f54..3189311efdf 100644 --- a/components/brave_wallet/browser/simple_hash_client_unittest.cc +++ b/components/brave_wallet/browser/simple_hash_client_unittest.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_wallet/browser/simple_hash_client.h" +#include + #include "base/json/json_reader.h" #include "base/memory/raw_ptr.h" #include "base/test/bind.h" @@ -87,17 +89,17 @@ class SimpleHashClientUnitTest : public testing::Test { const std::string& account_address, const std::vector& chain_ids, mojom::CoinType coin, - absl::optional cursor, + std::optional cursor, bool skip_spam, bool only_spam, const std::vector& expected_nfts, - absl::optional expected_cursor) { + std::optional expected_cursor) { base::RunLoop run_loop; simple_hash_client_->FetchNFTsFromSimpleHash( account_address, chain_ids, coin, cursor, skip_spam, only_spam, base::BindLambdaForTesting( [&](std::vector nfts, - const absl::optional& returned_cursor) { + const std::optional& returned_cursor) { ASSERT_EQ(nfts.size(), expected_nfts.size()); EXPECT_EQ(returned_cursor, expected_cursor); EXPECT_EQ(nfts, expected_nfts); @@ -116,19 +118,18 @@ class SimpleHashClientUnitTest : public testing::Test { TEST_F(SimpleHashClientUnitTest, GetSimpleHashNftsByWalletUrl) { // Empty address yields empty URL EXPECT_EQ(simple_hash_client_->GetSimpleHashNftsByWalletUrl( - "", {mojom::kMainnetChainId}, absl::nullopt), + "", {mojom::kMainnetChainId}, std::nullopt), GURL("")); // Empty chains yields empty URL - EXPECT_EQ( - simple_hash_client_->GetSimpleHashNftsByWalletUrl( - "0x0000000000000000000000000000000000000000", {}, absl::nullopt), - GURL()); + EXPECT_EQ(simple_hash_client_->GetSimpleHashNftsByWalletUrl( + "0x0000000000000000000000000000000000000000", {}, std::nullopt), + GURL()); // One valid chain yields correct URL EXPECT_EQ(simple_hash_client_->GetSimpleHashNftsByWalletUrl( "0x0000000000000000000000000000000000000000", - {mojom::kMainnetChainId}, absl::nullopt), + {mojom::kMainnetChainId}, std::nullopt), GURL("https://simplehash.wallet.brave.com/api/v0/nfts/" "owners?chains=ethereum&wallet_addresses=" "0x0000000000000000000000000000000000000000")); @@ -137,7 +138,7 @@ TEST_F(SimpleHashClientUnitTest, GetSimpleHashNftsByWalletUrl) { EXPECT_EQ(simple_hash_client_->GetSimpleHashNftsByWalletUrl( "0x0000000000000000000000000000000000000000", {mojom::kMainnetChainId, mojom::kOptimismMainnetChainId}, - absl::nullopt), + std::nullopt), GURL("https://simplehash.wallet.brave.com/api/v0/nfts/" "owners?chains=ethereum%2Coptimism&wallet_addresses=" "0x0000000000000000000000000000000000000000")); @@ -145,11 +146,11 @@ TEST_F(SimpleHashClientUnitTest, GetSimpleHashNftsByWalletUrl) { // One invalid chain yields empty URL EXPECT_EQ(simple_hash_client_->GetSimpleHashNftsByWalletUrl( "0x0000000000000000000000000000000000000000", - {"chain ID not supported by SimpleHash"}, absl::nullopt), + {"chain ID not supported by SimpleHash"}, std::nullopt), GURL()); // One valid chain with cursor yields correct URL - absl::optional cursor = "example_cursor"; + std::optional cursor = "example_cursor"; EXPECT_EQ( simple_hash_client_->GetSimpleHashNftsByWalletUrl( "0x0000000000000000000000000000000000000000", @@ -170,7 +171,7 @@ TEST_F(SimpleHashClientUnitTest, GetSimpleHashNftsByWalletUrl) { TEST_F(SimpleHashClientUnitTest, ParseNFTsFromSimpleHash) { std::string json; - absl::optional json_value; + std::optional json_value; // Non dictionary JSON response yields nullopt json = R"([])"; @@ -251,7 +252,7 @@ TEST_F(SimpleHashClientUnitTest, ParseNFTsFromSimpleHash) { result = simple_hash_client_->ParseNFTsFromSimpleHash( *json_value, mojom::CoinType::ETH, true, false); ASSERT_TRUE(result); - EXPECT_EQ(result->first, absl::nullopt); + EXPECT_EQ(result->first, std::nullopt); // Unsupported CoinType yields nullopt (valid otherwise) json = R"({ @@ -857,18 +858,18 @@ TEST_F(SimpleHashClientUnitTest, FetchNFTsFromSimpleHash) { // Test unsupported coin type TestFetchNFTsFromSimpleHash("0x0000000000000000000000000000000000000000", {mojom::kMainnetChainId}, mojom::CoinType::FIL, - absl::nullopt, true, false, {}, absl::nullopt); + std::nullopt, true, false, {}, std::nullopt); // Test invalid URL TestFetchNFTsFromSimpleHash("", {mojom::kMainnetChainId}, - mojom::CoinType::ETH, absl::nullopt, true, false, - {}, absl::nullopt); + mojom::CoinType::ETH, std::nullopt, true, false, + {}, std::nullopt); // Non 2xx response yields empty expected_nfts SetHTTPRequestTimeoutInterceptor(); TestFetchNFTsFromSimpleHash("0x0000000000000000000000000000000000000000", {mojom::kMainnetChainId}, mojom::CoinType::ETH, - absl::nullopt, true, false, {}, absl::nullopt); + std::nullopt, true, false, {}, std::nullopt); // Single NFT fetched without cursor argument std::vector expected_nfts; @@ -912,8 +913,8 @@ TEST_F(SimpleHashClientUnitTest, FetchNFTsFromSimpleHash) { TestFetchNFTsFromSimpleHash("0x0000000000000000000000000000000000000000", {mojom::kMainnetChainId}, mojom::CoinType::ETH, - absl::nullopt, true, false, expected_nfts, - absl::nullopt); + std::nullopt, true, false, expected_nfts, + std::nullopt); // Single NFT fetched with cursor argument also returning a cursor url = GURL( @@ -998,8 +999,8 @@ TEST_F(SimpleHashClientUnitTest, FetchNFTsFromSimpleHash) { TestFetchNFTsFromSimpleHash("0x0000000000000000000000000000000000000000", {mojom::kMainnetChainId}, mojom::CoinType::ETH, - absl::nullopt, false, true, - expected_nfts_only_spam, absl::nullopt); + std::nullopt, false, true, + expected_nfts_only_spam, std::nullopt); } } // namespace brave_wallet diff --git a/components/brave_wallet/browser/simulation_request_helper.cc b/components/brave_wallet/browser/simulation_request_helper.cc index f2073380cae..7c37fa36016 100644 --- a/components/brave_wallet/browser/simulation_request_helper.cc +++ b/components/brave_wallet/browser/simulation_request_helper.cc @@ -3,13 +3,15 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include "brave/components/brave_wallet/browser/simulation_request_helper.h" + +#include #include #include #include "base/base64.h" #include "base/values.h" #include "brave/components/brave_wallet/browser/json_rpc_requests_helper.h" -#include "brave/components/brave_wallet/browser/simulation_request_helper.h" #include "brave/components/brave_wallet/browser/solana_transaction.h" #include "brave/components/brave_wallet/common/brave_wallet_constants.h" #include "brave/components/brave_wallet/common/hex_utils.h" @@ -40,10 +42,10 @@ base::Value::Dict GetMetadata(const mojom::OriginInfoPtr& origin_info) { namespace evm { -absl::optional EncodeScanTransactionParams( +std::optional EncodeScanTransactionParams( const mojom::TransactionInfoPtr& tx_info) { if (!tx_info || !tx_info->from_address) { - return absl::nullopt; + return std::nullopt; } base::Value::Dict tx_object; @@ -62,10 +64,10 @@ absl::optional EncodeScanTransactionParams( // // Here's an unoptimised implementation for future reference: // - // absl::optional HexToWei(const std::string& value) { + // std::optional HexToWei(const std::string& value) { // uint256_t uint256_value; // if (!HexValueToUint256(value, &uint256_value)) { - // return absl::nullopt; + // return std::nullopt; // } // // std::string result; @@ -95,7 +97,7 @@ absl::optional EncodeScanTransactionParams( tx_object.Set("data", ToHex(tx_data->data)); } } else { - return absl::nullopt; + return std::nullopt; } base::Value::Dict params; @@ -112,10 +114,10 @@ namespace solana { namespace { -absl::optional GetBase64TransactionFromTxDataUnion( +std::optional GetBase64TransactionFromTxDataUnion( mojom::TxDataUnionPtr tx_data_union) { if (!tx_data_union->is_solana_tx_data()) { - return absl::nullopt; + return std::nullopt; } auto tx = SolanaTransaction::FromSolanaTxData( @@ -123,7 +125,7 @@ absl::optional GetBase64TransactionFromTxDataUnion( auto message_signers_pair = tx->GetSerializedMessage(); if (!message_signers_pair) { - return absl::nullopt; + return std::nullopt; } auto& message_bytes = message_signers_pair->first; @@ -133,7 +135,7 @@ absl::optional GetBase64TransactionFromTxDataUnion( // number in the first 8 bits of the message header. We therefore check // if the number of signers is a valid unsigned 8-bit integer. if (signers.size() > UINT8_MAX) { - return absl::nullopt; + return std::nullopt; } // transaction_bytes is a compact-array of signatures, followed by the @@ -151,10 +153,10 @@ absl::optional GetBase64TransactionFromTxDataUnion( } // namespace -absl::optional EncodeScanTransactionParams( +std::optional EncodeScanTransactionParams( const mojom::SolanaTransactionRequestUnionPtr& request) { if (!request) { - return absl::nullopt; + return std::nullopt; } base::Value::Dict params; @@ -166,7 +168,7 @@ absl::optional EncodeScanTransactionParams( auto serialized_tx = GetBase64TransactionFromTxDataUnion( std::move(sign_transaction_request->tx_data)); if (!serialized_tx) { - return absl::nullopt; + return std::nullopt; } base::Value::List transactions; @@ -183,7 +185,7 @@ absl::optional EncodeScanTransactionParams( auto serialized_tx = GetBase64TransactionFromTxDataUnion(std::move(tx_data)); if (!serialized_tx) { - return absl::nullopt; + return std::nullopt; } transactions.Append(*serialized_tx); @@ -197,12 +199,12 @@ absl::optional EncodeScanTransactionParams( } else if (request->is_transaction_info()) { const auto& tx_info = request->get_transaction_info(); if (!tx_info->from_address) { - return absl::nullopt; + return std::nullopt; } auto serialized_tx = GetBase64TransactionFromTxDataUnion(std::move(tx_info->tx_data_union)); if (!serialized_tx) { - return absl::nullopt; + return std::nullopt; } base::Value::List transactions; @@ -212,7 +214,7 @@ absl::optional EncodeScanTransactionParams( params.Set("metadata", GetMetadata(tx_info->origin_info)); params.Set("userAccount", *tx_info->from_address); } else { - return absl::nullopt; + return std::nullopt; } return GetJSON(base::Value(std::move(params))); diff --git a/components/brave_wallet/browser/simulation_request_helper.h b/components/brave_wallet/browser/simulation_request_helper.h index 58f20b0ca74..af9c09b31e8 100644 --- a/components/brave_wallet/browser/simulation_request_helper.h +++ b/components/brave_wallet/browser/simulation_request_helper.h @@ -6,21 +6,23 @@ #ifndef BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_SIMULATION_REQUEST_HELPER_H_ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_SIMULATION_REQUEST_HELPER_H_ +#include #include + #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" namespace brave_wallet { namespace evm { -absl::optional EncodeScanTransactionParams( +std::optional EncodeScanTransactionParams( const mojom::TransactionInfoPtr& tx_info); } // namespace evm namespace solana { -absl::optional EncodeScanTransactionParams( +std::optional EncodeScanTransactionParams( const mojom::SolanaTransactionRequestUnionPtr& request); } // namespace solana diff --git a/components/brave_wallet/browser/simulation_request_helper_unittest.cc b/components/brave_wallet/browser/simulation_request_helper_unittest.cc index e6e39d8dc2b..ac63caf827d 100644 --- a/components/brave_wallet/browser/simulation_request_helper_unittest.cc +++ b/components/brave_wallet/browser/simulation_request_helper_unittest.cc @@ -3,7 +3,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include "brave/components/brave_wallet/browser/simulation_request_helper.h" + #include +#include #include #include @@ -12,7 +15,6 @@ #include "brave/components/brave_wallet/browser/eth_transaction.h" #include "brave/components/brave_wallet/browser/eth_tx_meta.h" #include "brave/components/brave_wallet/browser/json_rpc_requests_helper.h" -#include "brave/components/brave_wallet/browser/simulation_request_helper.h" #include "brave/components/brave_wallet/browser/solana_transaction.h" #include "brave/components/brave_wallet/browser/solana_tx_meta.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" @@ -29,12 +31,12 @@ namespace { mojom::TransactionInfoPtr GetCannedScanEVMTransactionParams( bool eip1559, bool is_eth_send, - absl::optional origin) { + std::optional origin) { auto base_tx_data = mojom::TxData::New( "0x09", "0x4a817c800", "0x5208", "0x3535353535353535353535353535353535353535", "0xde0b6b3a7640000", is_eth_send ? std::vector() : std::vector({10u}), false, - absl::nullopt); + std::nullopt); auto tx = eip1559 @@ -58,7 +60,7 @@ mojom::TransactionInfoPtr GetCannedScanEVMTransactionParams( } mojom::TransactionInfoPtr GetCannedScanSolanaTransactionParams( - absl::optional origin) { + std::optional origin) { std::string from_account = "BrG44HdsEhzapvs8bEqzvkq4egwevS3fRE6ze2ENo6S8"; auto sol_account = MakeAccountId(mojom::CoinType::SOL, mojom::KeyringId::kSolana, @@ -72,8 +74,8 @@ mojom::TransactionInfoPtr GetCannedScanSolanaTransactionParams( // Program ID mojom::kSolanaSystemProgramId, // Accounts - {SolanaAccountMeta(from_account, absl::nullopt, true, true), - SolanaAccountMeta(to_account, absl::nullopt, false, true)}, + {SolanaAccountMeta(from_account, std::nullopt, true, true), + SolanaAccountMeta(to_account, std::nullopt, false, true)}, data); auto msg = SolanaMessage::CreateLegacyMessage( @@ -149,7 +151,7 @@ TEST(SimulationRequestHelperUnitTest, EncodeScanTransactionParamsEVMType0DefaultOrigin) { // OK: Params for legacy (type-0) EVM native asset transfer is encoded // correctly. - auto tx_info = GetCannedScanEVMTransactionParams(false, true, absl::nullopt); + auto tx_info = GetCannedScanEVMTransactionParams(false, true, std::nullopt); auto encoded_params = evm::EncodeScanTransactionParams(tx_info); std::string expected_params(R"( { @@ -170,7 +172,7 @@ TEST(SimulationRequestHelperUnitTest, // OK: Params for legacy (type-0) EVM contract interaction is encoded // properly. - tx_info = GetCannedScanEVMTransactionParams(false, false, absl::nullopt); + tx_info = GetCannedScanEVMTransactionParams(false, false, std::nullopt); encoded_params = evm::EncodeScanTransactionParams(tx_info); expected_params = R"( { @@ -193,7 +195,7 @@ TEST(SimulationRequestHelperUnitTest, TEST(SimulationRequestHelperUnitTest, EncodeScanTransactionParamsEVMType2DefaultOrigin) { // OK: Params for EIP-1559 (type-2) EVM ETH transfer is encoded correctly. - auto tx_info = GetCannedScanEVMTransactionParams(true, true, absl::nullopt); + auto tx_info = GetCannedScanEVMTransactionParams(true, true, std::nullopt); auto encoded_params = evm::EncodeScanTransactionParams(tx_info); std::string expected_params(R"( { @@ -214,7 +216,7 @@ TEST(SimulationRequestHelperUnitTest, // OK: Params for EIP-1559 (type-2) EVM contract interaction is encoded // correctly. - tx_info = GetCannedScanEVMTransactionParams(true, false, absl::nullopt); + tx_info = GetCannedScanEVMTransactionParams(true, false, std::nullopt); encoded_params = evm::EncodeScanTransactionParams(tx_info); expected_params = R"( { @@ -330,7 +332,7 @@ TEST(SimulationRequestHelperUnitTest, TEST(SimulationRequestHelperUnitTest, EncodeScanTransactionParamsEVMInvalidTxData) { - auto tx_info = GetCannedScanSolanaTransactionParams(absl::nullopt); + auto tx_info = GetCannedScanSolanaTransactionParams(std::nullopt); auto encoded_params = evm::EncodeScanTransactionParams(tx_info); // KO: Invalid tx data is not encoded. @@ -339,12 +341,12 @@ TEST(SimulationRequestHelperUnitTest, TEST(SimulationRequestHelperUnitTest, EncodeScanTransactionParamsEVMNullParams) { - EXPECT_EQ(evm::EncodeScanTransactionParams(nullptr), absl::nullopt); + EXPECT_EQ(evm::EncodeScanTransactionParams(nullptr), std::nullopt); } TEST(SimulationRequestHelperUnitTest, EncodeScanTransactionParamsSolanaTransactionInfoDefaultOrigin) { - auto tx_info = GetCannedScanSolanaTransactionParams(absl::nullopt); + auto tx_info = GetCannedScanSolanaTransactionParams(std::nullopt); auto request = mojom::SolanaTransactionRequestUnion::NewTransactionInfo( std::move(tx_info)); auto encoded_params = solana::EncodeScanTransactionParams(request); @@ -392,7 +394,7 @@ TEST(SimulationRequestHelperUnitTest, TEST(SimulationRequestHelperUnitTest, EncodeScanTransactionParamsSolanaSignTransactionRequestDefaultOrigin) { - auto tx_info = GetCannedScanSolanaTransactionParams(absl::nullopt); + auto tx_info = GetCannedScanSolanaTransactionParams(std::nullopt); auto parsed = MakeSolanaSignTransactionRequest(std::move(tx_info)); auto request = @@ -446,7 +448,7 @@ TEST(SimulationRequestHelperUnitTest, TEST(SimulationRequestHelperUnitTest, EncodeScanTransactionParamsSolanaSignAllTransactionsRequestDefaultOrigin) { - auto tx_info = GetCannedScanSolanaTransactionParams(absl::nullopt); + auto tx_info = GetCannedScanSolanaTransactionParams(std::nullopt); auto parsed = MakeSolanaSignAllTransactionsRequest(std::move(tx_info)); auto request = @@ -500,7 +502,7 @@ TEST(SimulationRequestHelperUnitTest, TEST(SimulationRequestHelperUnitTest, EncodeScanTransactionParamsSolanaInvalidTxData) { - auto tx_info = GetCannedScanEVMTransactionParams(false, true, absl::nullopt); + auto tx_info = GetCannedScanEVMTransactionParams(false, true, std::nullopt); auto request = mojom::SolanaTransactionRequestUnion::NewTransactionInfo( std::move(tx_info)); auto encoded_params = solana::EncodeScanTransactionParams(request); @@ -511,7 +513,7 @@ TEST(SimulationRequestHelperUnitTest, TEST(SimulationRequestHelperUnitTest, EncodeScanTransactionParamsSolanaNullParams) { - EXPECT_EQ(solana::EncodeScanTransactionParams(nullptr), absl::nullopt); + EXPECT_EQ(solana::EncodeScanTransactionParams(nullptr), std::nullopt); } } // namespace brave_wallet diff --git a/components/brave_wallet/browser/simulation_response_parser.cc b/components/brave_wallet/browser/simulation_response_parser.cc index c25e0004abc..1d769a45ce9 100644 --- a/components/brave_wallet/browser/simulation_response_parser.cc +++ b/components/brave_wallet/browser/simulation_response_parser.cc @@ -3,12 +3,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include "brave/components/brave_wallet/browser/simulation_response_parser.h" + +#include #include #include #include #include "base/strings/string_number_conversions.h" -#include "brave/components/brave_wallet/browser/simulation_response_parser.h" #include "brave/components/brave_wallet/browser/simulation_responses.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" @@ -277,12 +279,12 @@ std::vector ParseWarnings( return warnings; } -absl::optional ParseNullableString(const base::Value& value) { +std::optional ParseNullableString(const base::Value& value) { if (value.is_string()) { return value.GetString(); } - return absl::nullopt; + return std::nullopt; } } // namespace @@ -1115,16 +1117,16 @@ mojom::SolanaSimulationResponsePtr ParseSimulationResponse( } // namespace solana -absl::optional ParseSimulationErrorResponse( +std::optional ParseSimulationErrorResponse( const base::Value& json_value) { if (!json_value.is_dict()) { - return absl::nullopt; + return std::nullopt; } auto error_response = simulation_responses::HTTPError::FromValue(json_value.GetDict()); if (!error_response) { - return absl::nullopt; + return std::nullopt; } return error_response->error; diff --git a/components/brave_wallet/browser/simulation_response_parser.h b/components/brave_wallet/browser/simulation_response_parser.h index bda66416c54..12524836dc6 100644 --- a/components/brave_wallet/browser/simulation_response_parser.h +++ b/components/brave_wallet/browser/simulation_response_parser.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_SIMULATION_RESPONSE_PARSER_H_ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_SIMULATION_RESPONSE_PARSER_H_ +#include #include #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" @@ -26,7 +27,7 @@ mojom::SolanaSimulationResponsePtr ParseSimulationResponse( } // namespace solana -absl::optional ParseSimulationErrorResponse( +std::optional ParseSimulationErrorResponse( const base::Value& json_value); } // namespace brave_wallet diff --git a/components/brave_wallet/browser/simulation_response_parser_unittest.cc b/components/brave_wallet/browser/simulation_response_parser_unittest.cc index 4f65bb486f2..6cfc18b9321 100644 --- a/components/brave_wallet/browser/simulation_response_parser_unittest.cc +++ b/components/brave_wallet/browser/simulation_response_parser_unittest.cc @@ -3,14 +3,16 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include "brave/components/brave_wallet/browser/simulation_response_parser.h" + #include +#include #include #include #include "base/strings/stringprintf.h" #include "base/test/values_test_util.h" #include "brave/components/brave_wallet/browser/json_rpc_requests_helper.h" -#include "brave/components/brave_wallet/browser/simulation_response_parser.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" #include "testing/gtest/include/gtest/gtest.h" @@ -1132,7 +1134,7 @@ TEST(SimulationResponseParserUnitTest, ParseEVMNullableFields) { EXPECT_EQ(state_change_raw_info->asset->address, "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee"); EXPECT_EQ(state_change_raw_info->asset->decimals, 18); - EXPECT_EQ(state_change_raw_info->asset->image_url, absl::nullopt); + EXPECT_EQ(state_change_raw_info->asset->image_url, std::nullopt); EXPECT_EQ(state_change_raw_info->asset->name, "Binance Coin"); EXPECT_FALSE(state_change_raw_info->asset->price); EXPECT_EQ(state_change_raw_info->asset->symbol, "BNB"); @@ -1150,7 +1152,7 @@ TEST(SimulationResponseParserUnitTest, ParseEVMNullableFields) { const auto& state_change_raw_info = state_change->raw_info->data->get_native_asset_transfer_data(); - EXPECT_EQ(state_change_raw_info->asset->image_url, absl::nullopt); + EXPECT_EQ(state_change_raw_info->asset->image_url, std::nullopt); } { diff --git a/components/brave_wallet/browser/simulation_service.cc b/components/brave_wallet/browser/simulation_service.cc index 82b49b76ec8..26240409dcd 100644 --- a/components/brave_wallet/browser/simulation_service.cc +++ b/components/brave_wallet/browser/simulation_service.cc @@ -4,6 +4,7 @@ * You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "brave/components/brave_wallet/browser/simulation_service.h" +#include #include #include "base/strings/stringprintf.h" @@ -45,11 +46,11 @@ net::NetworkTrafficAnnotationTag GetNetworkTrafficAnnotationTag() { // Function to convert all numbers in JSON string to strings. // // For sample JSON response, refer to ParseJupiterQuote. -absl::optional ConvertAllNumbersToString(const std::string& json) { +std::optional ConvertAllNumbersToString(const std::string& json) { auto converted_json = std::string(json::convert_all_numbers_to_string(json, "")); if (converted_json.empty()) { - return absl::nullopt; + return std::nullopt; } return converted_json; diff --git a/components/brave_wallet/browser/simulation_service_unittest.cc b/components/brave_wallet/browser/simulation_service_unittest.cc index d2759035ba9..29600482838 100644 --- a/components/brave_wallet/browser/simulation_service_unittest.cc +++ b/components/brave_wallet/browser/simulation_service_unittest.cc @@ -3,7 +3,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include "brave/components/brave_wallet/browser/simulation_service.h" + #include +#include #include #include "base/memory/ref_counted.h" @@ -18,7 +21,6 @@ #include "brave/components/brave_wallet/browser/eth_transaction.h" #include "brave/components/brave_wallet/browser/eth_tx_meta.h" #include "brave/components/brave_wallet/browser/simulation_response_parser.h" -#include "brave/components/brave_wallet/browser/simulation_service.h" #include "brave/components/brave_wallet/browser/solana_transaction.h" #include "brave/components/brave_wallet/browser/solana_tx_meta.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" @@ -83,7 +85,7 @@ class SimulationServiceUnitTest : public testing::Test { auto base_tx_data = mojom::TxData::New( "0x09", "0x4a817c800", "0x5208", "0x3535353535353535353535353535353535353535", "0x0de0b6b3a7640000", - std::vector(), false, absl::nullopt); + std::vector(), false, std::nullopt); if (eip1559) { std::unique_ptr tx = @@ -103,7 +105,7 @@ class SimulationServiceUnitTest : public testing::Test { } mojom::TransactionInfoPtr GetCannedScanSolanaTransactionParams( - absl::optional origin, + std::optional origin, const std::string& chain_id) { std::string from_account = "BrG44HdsEhzapvs8bEqzvkq4egwevS3fRE6ze2ENo6S8"; auto sol_account = @@ -121,8 +123,8 @@ class SimulationServiceUnitTest : public testing::Test { // Program ID mojom::kSolanaSystemProgramId, // Accounts - {SolanaAccountMeta(from_account, absl::nullopt, true, true), - SolanaAccountMeta(to_account, absl::nullopt, false, true)}, + {SolanaAccountMeta(from_account, std::nullopt, true, true), + SolanaAccountMeta(to_account, std::nullopt, false, true)}, data); auto msg = SolanaMessage::CreateLegacyMessage( @@ -480,8 +482,8 @@ TEST_F(SimulationServiceUnitTest, ScanSolanaTransactionValid) { )"); base::RunLoop run_loop; - auto tx_info = GetCannedScanSolanaTransactionParams(absl::nullopt, - mojom::kSolanaMainnet); + auto tx_info = + GetCannedScanSolanaTransactionParams(std::nullopt, mojom::kSolanaMainnet); auto request = mojom::SolanaTransactionRequestUnion::NewTransactionInfo( std::move(tx_info)); @@ -537,7 +539,7 @@ TEST_F(SimulationServiceUnitTest, ScanSolanaTransactionValid) { } TEST_F(SimulationServiceUnitTest, ScanSolanaTransactionUnsupportedNetwork) { - auto tx_info = GetCannedScanSolanaTransactionParams(absl::nullopt, + auto tx_info = GetCannedScanSolanaTransactionParams(std::nullopt, mojom::kLocalhostChainId); auto request = mojom::SolanaTransactionRequestUnion::NewTransactionInfo( std::move(tx_info)); @@ -557,7 +559,7 @@ TEST_F(SimulationServiceUnitTest, ScanSolanaTransactionUnsupportedNetwork) { } TEST_F(SimulationServiceUnitTest, ScanSolanaTransactionEmptyNetwork) { - auto tx_info = GetCannedScanSolanaTransactionParams(absl::nullopt, ""); + auto tx_info = GetCannedScanSolanaTransactionParams(std::nullopt, ""); auto request = mojom::SolanaTransactionRequestUnion::NewTransactionInfo( std::move(tx_info)); @@ -583,8 +585,8 @@ TEST_F(SimulationServiceUnitTest, ScanSolanaTransactionValidErrorResponse) { )"; SetErrorInterceptor(error); - auto tx_info = GetCannedScanSolanaTransactionParams(absl::nullopt, - mojom::kSolanaMainnet); + auto tx_info = + GetCannedScanSolanaTransactionParams(std::nullopt, mojom::kSolanaMainnet); auto request = mojom::SolanaTransactionRequestUnion::NewTransactionInfo( std::move(tx_info)); @@ -605,8 +607,8 @@ TEST_F(SimulationServiceUnitTest, std::string error = "Woot"; SetErrorInterceptor(error); - auto tx_info = GetCannedScanSolanaTransactionParams(absl::nullopt, - mojom::kSolanaMainnet); + auto tx_info = + GetCannedScanSolanaTransactionParams(std::nullopt, mojom::kSolanaMainnet); auto request = mojom::SolanaTransactionRequestUnion::NewTransactionInfo( std::move(tx_info)); diff --git a/components/brave_wallet/browser/siwe_message_parser.cc b/components/brave_wallet/browser/siwe_message_parser.cc index 34ee41c2633..2d9c2e05953 100644 --- a/components/brave_wallet/browser/siwe_message_parser.cc +++ b/components/brave_wallet/browser/siwe_message_parser.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/siwe_message_parser.h" +#include #include #include @@ -88,23 +89,23 @@ bool IsPChar(char c) { return false; } -absl::optional> -ExtractValue(std::string_view input, - std::string_view field, - bool expect_lf = true) { +std::optional> ExtractValue( + std::string_view input, + std::string_view field, + bool expect_lf = true) { auto field_end = field.length(); if (field_end == input.length()) { - return absl::nullopt; + return std::nullopt; } auto field_pos = input.rfind(field); if (field_pos == std::string::npos || field_pos != 0) { - return absl::nullopt; + return std::nullopt; } std::string::size_type n; if (expect_lf) { n = input.find('\n', field_end); if (n == field_end || n == std::string::npos) { - return absl::nullopt; + return std::nullopt; } } else { n = input.length(); @@ -113,21 +114,21 @@ ExtractValue(std::string_view input, return std::make_pair(n, input.substr(field_end, n - field_end)); } -absl::optional> +std::optional> ExtractOptionalValue(std::string_view input, std::string_view field, bool is_resources = false) { auto effective_field = base::StrCat({"\n", field}); auto field_end = effective_field.length(); if (field_end == input.length()) { - return absl::nullopt; + return std::nullopt; } auto field_pos = input.rfind(effective_field); if (field_pos == std::string::npos) { return std::make_pair(std::string::npos, input); } if (field_pos != 0) { - return absl::nullopt; + return std::nullopt; } std::string::size_type n; if (is_resources) { @@ -139,7 +140,7 @@ ExtractOptionalValue(std::string_view input, return std::make_pair(input.length(), input.substr(field_end)); } if (n == field_end) { - return absl::nullopt; + return std::nullopt; } } @@ -263,7 +264,7 @@ bool SIWEMessageParser::ParseAddress(std::string_view& msg_view, } bool SIWEMessageParser::ParseStatement(std::string_view& msg_view, - absl::optional& statement) { + std::optional& statement) { if (msg_view.size() < 2 || msg_view[0] != '\n') { return false; } @@ -380,7 +381,7 @@ bool SIWEMessageParser::ParseIssuedAt(std::string_view& msg_view, bool SIWEMessageParser::ParseOptionalStringField( std::string_view& msg_view, const std::string& name, - absl::optional& value_out) { + std::optional& value_out) { auto value = ExtractOptionalValue(msg_view, name); if (!value) { return false; @@ -396,7 +397,7 @@ bool SIWEMessageParser::ParseOptionalStringField( bool SIWEMessageParser::ParseOptionalResources( std::string_view& msg_view, - absl::optional>& resources) { + std::optional>& resources) { if (!msg_view.empty() && msg_view.back() == '\n') { return false; } diff --git a/components/brave_wallet/browser/siwe_message_parser.h b/components/brave_wallet/browser/siwe_message_parser.h index 428b3d13385..3ef73908d49 100644 --- a/components/brave_wallet/browser/siwe_message_parser.h +++ b/components/brave_wallet/browser/siwe_message_parser.h @@ -6,12 +6,12 @@ #ifndef BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_SIWE_MESSAGE_PARSER_H_ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_SIWE_MESSAGE_PARSER_H_ +#include #include #include #include #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" -#include "third_party/abseil-cpp/absl/types/optional.h" class GURL; @@ -56,7 +56,7 @@ class SIWEMessageParser { bool ParseSchemeAndDomain(std::string_view& msg_view, url::Origin& origin); bool ParseAddress(std::string_view& msg_view, std::string& address); bool ParseStatement(std::string_view& msg_view, - absl::optional& statement); + std::optional& statement); bool ParseURI(std::string_view& msg_view, GURL& uri); bool ParseVersion(std::string_view& msg_view, uint32_t& version); bool ParseChainId(std::string_view& msg_view, uint64_t& chain_id); @@ -64,9 +64,9 @@ class SIWEMessageParser { bool ParseIssuedAt(std::string_view& msg_view, std::string& issued_at); bool ParseOptionalStringField(std::string_view& msg_view, const std::string& name, - absl::optional& value); + std::optional& value); bool ParseOptionalResources(std::string_view& msg_view, - absl::optional>& resources); + std::optional>& resources); static std::string GetStartingTokenForTesting(); static std::string GetURITokenForTesting(); diff --git a/components/brave_wallet/browser/siwe_message_parser_unittest.cc b/components/brave_wallet/browser/siwe_message_parser_unittest.cc index 1069c6980fe..3c19a0fa0c3 100644 --- a/components/brave_wallet/browser/siwe_message_parser_unittest.cc +++ b/components/brave_wallet/browser/siwe_message_parser_unittest.cc @@ -3,10 +3,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include "brave/components/brave_wallet/browser/siwe_message_parser.h" + +#include #include #include "base/strings/strcat.h" -#include "brave/components/brave_wallet/browser/siwe_message_parser.h" #include "testing/gtest/include/gtest/gtest.h" #include "url/gurl.h" #include "url/origin.h" @@ -353,7 +355,7 @@ TEST_F(SIWEMessageParserTest, OptionalStringFields) { SCOPED_TRACE(testing::Message() << "\"" << message << "\""); auto result = parser_.Parse(message); ASSERT_TRUE(result); - absl::optional field; + std::optional field; if (state_info.token == expiration_time_token()) { field = result->expiration_time; EXPECT_FALSE(result->not_before); diff --git a/components/brave_wallet/browser/sns_resolver_task.cc b/components/brave_wallet/browser/sns_resolver_task.cc index 0ced7dce542..7ca9033b975 100644 --- a/components/brave_wallet/browser/sns_resolver_task.cc +++ b/components/brave_wallet/browser/sns_resolver_task.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_wallet/browser/sns_resolver_task.h" #include +#include #include #include "base/base64.h" @@ -37,10 +38,10 @@ namespace brave_wallet { namespace { template -absl::optional FromBase64(const std::string& str) { +std::optional FromBase64(const std::string& str) { auto data = base::Base64Decode(str); if (!data) { - return absl::nullopt; + return std::nullopt; } return T::FromBytes(*data); @@ -76,7 +77,7 @@ SnsResolverTaskError MakeInvalidParamsError() { // Parse SOL record data and verify signature. // https://bonfida.github.io/solana-name-service-guide/domain-name/records.html#the-sol-record -absl::optional ParseAndVerifySolRecordData( +std::optional ParseAndVerifySolRecordData( base::span sol_record_payload, const SolanaAddress& sol_record_address, const SolanaAddress& domain_owner) { @@ -88,14 +89,14 @@ absl::optional ParseAndVerifySolRecordData( // No strict equality check here as `sol_record_payload` usually comes as 2K // bytes vector. We need only first 96 bytes of it. if (sol_record_payload.size() < kSolRecordDataSize) { - return absl::nullopt; + return std::nullopt; } // Extract 32 bytes of address followed by 64 bytes of signature. auto sol_record_payload_address = SolanaAddress::FromBytes( sol_record_payload.subspan(0, kSolanaPubkeySize)); if (!sol_record_payload_address) { - return absl::nullopt; + return std::nullopt; } auto sol_record_payload_signature = sol_record_payload.subspan(kSolanaPubkeySize, kSolRecordDataSignature); @@ -114,7 +115,7 @@ absl::optional ParseAndVerifySolRecordData( if (!ED25519_verify(reinterpret_cast(hex_message.data()), hex_message.size(), sol_record_payload_signature.data(), domain_owner.bytes().data())) { - return absl::nullopt; + return std::nullopt; } return sol_record_payload_address; @@ -125,11 +126,11 @@ struct SplMintData { // Only interested in supply. uint64_t supply = 0; - static absl::optional FromBytes( + static std::optional FromBytes( base::span data_span) { // https://github.com/solana-labs/solana-program-library/blob/f97a3dc7cf0e6b8e346d473a8c9d02de7b213cfd/token/program/src/state.rs#L37 const size_t kSplMintDataSize = 82; - absl::optional result; + std::optional result; if (data_span.size() != kSplMintDataSize) { return result; @@ -149,11 +150,11 @@ struct SplAccountData { // Only interested in owner. SolanaAddress owner; - static absl::optional FromBytes( + static std::optional FromBytes( base::span data_span) { // https://github.com/solana-labs/solana-program-library/blob/f97a3dc7cf0e6b8e346d473a8c9d02de7b213cfd/token/program/src/state.rs#L129 const size_t kSplAccountDataSize = 165; - absl::optional result; + std::optional result; if (data_span.size() != kSplAccountDataSize) { return result; @@ -165,7 +166,7 @@ struct SplAccountData { auto address = SolanaAddress::FromBytes( data_span.subspan(owner_offset, kSolanaPubkeySize)); if (!address) { - return absl::nullopt; + return std::nullopt; } result->owner = *address; return result; @@ -210,52 +211,52 @@ std::string getProgramAccounts(const SolanaAddress& mint_token) { // https://docs.solana.com/developing/clients/jsonrpc-api#example-34 // Parsing result of getProgramAccounts call. Exepected to find 1 token account // for mint. If parsing fails first element of pair is `false`. -std::pair> +std::pair> GetTokenOwnerFromGetProgramAccountsResult(const base::Value& json_value) { auto response = json_rpc_responses::RPCResponse::FromValue(json_value); if (!response || !response->result) { - return {false, absl::nullopt}; + return {false, std::nullopt}; } auto* result = response->result->GetIfList(); if (!result) { - return {false, absl::nullopt}; + return {false, std::nullopt}; } if (result->size() != 1) { - return {true, absl::nullopt}; + return {true, std::nullopt}; } auto* item = result->front().GetIfDict(); if (!item) { - return {false, absl::nullopt}; + return {false, std::nullopt}; } auto* account = item->FindDict("account"); if (!account) { - return {false, absl::nullopt}; + return {false, std::nullopt}; } - absl::optional account_info; + std::optional account_info; if (!solana::ParseGetAccountInfoPayload(*account, &account_info)) { - return {false, absl::nullopt}; + return {false, std::nullopt}; } DCHECK(account_info); auto account_data = FromBase64(account_info->data); if (!account_data) { - return {false, absl::nullopt}; + return {false, std::nullopt}; } return {true, account_data->owner}; } // https://github.com/Bonfida/solana-program-library/blob/6e3be3eedad3a7f4a83c1b7cd5f17f89231e0bca/name-service/js/src/utils.ts#L25 -absl::optional GetNameAccountKey( +std::optional GetNameAccountKey( const SnsNamehash& hashed_name, - const absl::optional& parent) { + const std::optional& parent) { if (!parent) { - return absl::nullopt; + return std::nullopt; } std::vector> seeds; @@ -270,7 +271,7 @@ absl::optional GetNameAccountKey( auto address = SolanaKeyring::FindProgramDerivedAddress(seeds, kNameProgramId); if (!address) { - return absl::nullopt; + return std::nullopt; } return SolanaAddress::FromBase58(*address); @@ -287,7 +288,7 @@ SnsNamehash GetHashedName(const std::string& name) { } // https://github.com/Bonfida/name-tokenizer#mint -absl::optional GetMintAddress( +std::optional GetMintAddress( const SolanaAddress& domain_address) { const std::string kMintPrefix = "tokenized_name"; auto mint_prefix_bytes = base::make_span(kMintPrefix); @@ -303,15 +304,15 @@ absl::optional GetMintAddress( auto address = SolanaKeyring::FindProgramDerivedAddress(seeds, kNameTokenizerId); if (!address) { - return absl::nullopt; + return std::nullopt; } return SolanaAddress::FromBase58(*address); } // https://github.com/Bonfida/solana-program-library/blob/6e3be3eedad3a7f4a83c1b7cd5f17f89231e0bca/name-service/js/src/utils.ts#L158 -absl::optional GetDomainKey(const std::string& domain, - bool record) { +std::optional GetDomainKey(const std::string& domain, + bool record) { // https://github.com/Bonfida/solana-program-library/blob/6e3be3eedad3a7f4a83c1b7cd5f17f89231e0bca/name-service/js/src/constants.ts#L19 if (domain == "sol") { return SolanaAddress::FromBase58( @@ -321,7 +322,7 @@ absl::optional GetDomainKey(const std::string& domain, auto dot_pos = domain.find('.'); if (dot_pos == std::string::npos) { DCHECK(false); - return absl::nullopt; + return std::nullopt; } auto name = domain.substr(0, dot_pos); @@ -347,11 +348,11 @@ NameRegistryState& NameRegistryState::operator=(NameRegistryState&&) = default; NameRegistryState::~NameRegistryState() = default; // static -absl::optional NameRegistryState::FromBytes( +std::optional NameRegistryState::FromBytes( base::span data_span) { // https://bonfida.github.io/solana-name-service-guide/registry.html const size_t kNameRegistryStateHeaderLength = 96; - absl::optional result; + std::optional result; if (data_span.size() < kNameRegistryStateHeaderLength) { return result; } @@ -406,8 +407,8 @@ SnsResolverTask::GetWorkOnTaskForTesting() { } void SnsResolverTask::SetResultForTesting( - absl::optional task_result, - absl::optional task_error) { + std::optional task_result, + std::optional task_error) { task_result_ = std::move(task_result); task_error_ = std::move(task_error); } @@ -424,12 +425,12 @@ void SnsResolverTask::WorkOnTask() { } if (task_result_) { - std::move(done_callback_).Run(this, std::move(task_result_), absl::nullopt); + std::move(done_callback_).Run(this, std::move(task_result_), std::nullopt); // `this` is not valid here return; } if (task_error_) { - std::move(done_callback_).Run(this, absl::nullopt, std::move(task_error_)); + std::move(done_callback_).Run(this, std::nullopt, std::move(task_error_)); // `this` is not valid here. return; } @@ -456,7 +457,7 @@ void SnsResolverTask::WorkOnWalletAddressTask() { if (!nft_mint_address_) { nft_mint_address_ = GetMintAddress(*domain_address_); if (!nft_mint_address_) { - NftOwnerDone(absl::nullopt); + NftOwnerDone(std::nullopt); ScheduleWorkOnTask(); return; } @@ -506,7 +507,7 @@ void SnsResolverTask::SetError(SnsResolverTaskError error) { task_error_.emplace(std::move(error)); } -void SnsResolverTask::NftOwnerDone(absl::optional nft_owner) { +void SnsResolverTask::NftOwnerDone(std::optional nft_owner) { nft_owner_check_done_ = true; if (nft_owner) { task_result_.emplace(*nft_owner); @@ -533,7 +534,7 @@ void SnsResolverTask::OnFetchNftSplMint(APIRequestResult api_request_result) { return; } - absl::optional account_info; + std::optional account_info; if (!solana::ParseGetAccountInfo(api_request_result.value_body(), &account_info)) { SetError(ParseErrorResult(api_request_result.value_body())); @@ -541,13 +542,13 @@ void SnsResolverTask::OnFetchNftSplMint(APIRequestResult api_request_result) { } if (!account_info) { - NftOwnerDone(absl::nullopt); + NftOwnerDone(std::nullopt); return; } auto nft_mint = FromBase64(account_info->data); if (!nft_mint || nft_mint->supply != 1) { - NftOwnerDone(absl::nullopt); + NftOwnerDone(std::nullopt); return; } @@ -603,7 +604,7 @@ void SnsResolverTask::OnFetchDomainRegistryState( return; } - absl::optional account_info; + std::optional account_info; if (!solana::ParseGetAccountInfo(api_request_result.value_body(), &account_info)) { SetError(ParseErrorResult(api_request_result.value_body())); @@ -652,7 +653,7 @@ void SnsResolverTask::OnFetchSolRecordRegistryState( return; } - absl::optional account_info; + std::optional account_info; if (!solana::ParseGetAccountInfo(api_request_result.value_body(), &account_info)) { SetError(ParseErrorResult(api_request_result.value_body())); @@ -707,7 +708,7 @@ void SnsResolverTask::OnFetchUrlRecordRegistryState( return; } - absl::optional account_info; + std::optional account_info; if (!solana::ParseGetAccountInfo(api_request_result.value_body(), &account_info)) { SetError(ParseErrorResult(api_request_result.value_body())); @@ -768,7 +769,7 @@ void SnsResolverTask::OnFetchIpfsRecordRegistryState( return; } - absl::optional account_info; + std::optional account_info; if (!solana::ParseGetAccountInfo(api_request_result.value_body(), &account_info)) { SetError(ParseErrorResult(api_request_result.value_body())); diff --git a/components/brave_wallet/browser/sns_resolver_task.h b/components/brave_wallet/browser/sns_resolver_task.h index 0ac36454ec1..56264477afc 100644 --- a/components/brave_wallet/browser/sns_resolver_task.h +++ b/components/brave_wallet/browser/sns_resolver_task.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_SNS_RESOLVER_TASK_H_ #include +#include #include #include #include @@ -17,7 +18,6 @@ #include "brave/components/brave_wallet/browser/solana_keyring.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" #include "brave/components/brave_wallet/common/solana_address.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_wallet { @@ -25,10 +25,10 @@ using SnsNamehash = std::array; SnsNamehash GetHashedName(const std::string& name); -absl::optional GetMintAddress( +std::optional GetMintAddress( const SolanaAddress& domain_address); -absl::optional GetDomainKey(const std::string& domain, - bool record); +std::optional GetDomainKey(const std::string& domain, + bool record); struct NameRegistryState { NameRegistryState(); @@ -38,9 +38,9 @@ struct NameRegistryState { NameRegistryState& operator=(NameRegistryState&&); ~NameRegistryState(); - static absl::optional FromBytes( + static std::optional FromBytes( base::span data_span); - static absl::optional FromBase64(const std::string& str); + static std::optional FromBase64(const std::string& str); SolanaAddress parent_name; SolanaAddress owner; @@ -81,12 +81,12 @@ class SnsResolverTask { using APIRequestResult = api_request_helper::APIRequestResult; using DoneCallback = base::OnceCallback result, - absl::optional error)>; + std::optional result, + std::optional error)>; using RequestIntermediateCallback = base::OnceCallback; using ResponseConversionCallback = - base::OnceCallback( + base::OnceCallback( const std::string& raw_response)>; SnsResolverTask(DoneCallback done_callback, @@ -102,8 +102,8 @@ class SnsResolverTask { static base::RepeatingCallback& GetWorkOnTaskForTesting(); - void SetResultForTesting(absl::optional task_result, - absl::optional task_error); + void SetResultForTesting(std::optional task_result, + std::optional task_error); void FetchNftSplMint(); void OnFetchNftSplMint(APIRequestResult api_request_result); @@ -131,7 +131,7 @@ class SnsResolverTask { void SetAddressResult(SolanaAddress address); void SetUrlResult(GURL url); void SetError(SnsResolverTaskError error); - void NftOwnerDone(absl::optional nft_owner); + void NftOwnerDone(std::optional nft_owner); void RequestInternal( const std::string& json_payload, @@ -144,19 +144,19 @@ class SnsResolverTask { GURL network_url_; bool resolve_address_ = false; - absl::optional domain_address_; + std::optional domain_address_; bool nft_owner_check_done_ = false; - absl::optional nft_mint_address_; + std::optional nft_mint_address_; bool nft_mint_supply_check_done_ = false; - absl::optional domain_name_registry_state_; + std::optional domain_name_registry_state_; SolanaAddress sol_record_address_; bool url_record_check_done_ = false; - absl::optional task_result_; - absl::optional task_error_; + std::optional task_result_; + std::optional task_error_; base::WeakPtrFactory weak_ptr_factory_{this}; }; diff --git a/components/brave_wallet/browser/solana_account_meta.cc b/components/brave_wallet/browser/solana_account_meta.cc index bb99a0a5d5e..dc7a689f258 100644 --- a/components/brave_wallet/browser/solana_account_meta.cc +++ b/components/brave_wallet/browser/solana_account_meta.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/solana_account_meta.h" +#include #include namespace { @@ -20,7 +21,7 @@ namespace brave_wallet { SolanaAccountMeta::SolanaAccountMeta( const std::string& pubkey, - absl::optional address_table_lookup_index, + std::optional address_table_lookup_index, bool is_signer, bool is_writable) : pubkey(pubkey), @@ -61,31 +62,31 @@ base::Value::Dict SolanaAccountMeta::ToValue() const { } // static -absl::optional SolanaAccountMeta::FromValue( +std::optional SolanaAccountMeta::FromValue( const base::Value::Dict& value) { const std::string* pubkey = value.FindString(kPubkey); if (!pubkey) { - return absl::nullopt; + return std::nullopt; } - absl::optional is_signer = value.FindBool(kIsSigner); + std::optional is_signer = value.FindBool(kIsSigner); if (!is_signer) { - return absl::nullopt; + return std::nullopt; } - absl::optional is_writable = value.FindBool(kIsWritable); + std::optional is_writable = value.FindBool(kIsWritable); if (!is_writable) { - return absl::nullopt; + return std::nullopt; } - absl::optional address_table_lookup_index; + std::optional address_table_lookup_index; const std::string* address_table_lookup_index_string = value.FindString(kAddressTableLookupIndex); if (address_table_lookup_index_string) { unsigned val = 0; if (!base::StringToUint(*address_table_lookup_index_string, &val)) { - return absl::nullopt; + return std::nullopt; } if (val > UINT8_MAX) { - return absl::nullopt; + return std::nullopt; } address_table_lookup_index = static_cast(val); } @@ -103,7 +104,7 @@ void SolanaAccountMeta::FromMojomSolanaAccountMetas( } account_metas->clear(); for (const auto& mojom_account_meta : mojom_account_metas) { - absl::optional addr_table_lookup_index = absl::nullopt; + std::optional addr_table_lookup_index = std::nullopt; if (mojom_account_meta->addr_table_lookup_index) { addr_table_lookup_index = mojom_account_meta->addr_table_lookup_index->val; diff --git a/components/brave_wallet/browser/solana_account_meta.h b/components/brave_wallet/browser/solana_account_meta.h index 66fc1dc0707..a9f353a09ef 100644 --- a/components/brave_wallet/browser/solana_account_meta.h +++ b/components/brave_wallet/browser/solana_account_meta.h @@ -6,18 +6,18 @@ #ifndef BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_SOLANA_ACCOUNT_META_H_ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_SOLANA_ACCOUNT_META_H_ +#include #include #include #include "base/values.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_wallet { struct SolanaAccountMeta { SolanaAccountMeta(const std::string& pubkey, - absl::optional address_table_lookup_index, + std::optional address_table_lookup_index, bool is_signer, bool is_writable); ~SolanaAccountMeta(); @@ -31,11 +31,11 @@ struct SolanaAccountMeta { static void FromMojomSolanaAccountMetas( const std::vector& mojom_account_metas, std::vector* account_metas); - static absl::optional FromValue( + static std::optional FromValue( const base::Value::Dict& value); std::string pubkey; - absl::optional address_table_lookup_index; + std::optional address_table_lookup_index; bool is_signer; bool is_writable; }; diff --git a/components/brave_wallet/browser/solana_account_meta_unittest.cc b/components/brave_wallet/browser/solana_account_meta_unittest.cc index c80cae04f58..a777baa0290 100644 --- a/components/brave_wallet/browser/solana_account_meta_unittest.cc +++ b/components/brave_wallet/browser/solana_account_meta_unittest.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/solana_account_meta.h" +#include #include #include #include @@ -23,7 +24,7 @@ constexpr char kAccount2[] = "83astBRguLMdt2h5U1Tpdq5tjFoJ6noeGwaY3mDLVcri"; namespace brave_wallet { TEST(SolanaAccountMetaUnitTest, ToMojomSolanaAccountMeta) { - SolanaAccountMeta meta(kAccount1, absl::nullopt, true, false); + SolanaAccountMeta meta(kAccount1, std::nullopt, true, false); EXPECT_EQ(meta.ToMojomSolanaAccountMeta(), mojom::SolanaAccountMeta::New(kAccount1, nullptr, true, false)); @@ -48,7 +49,7 @@ TEST(SolanaAccountMetaUnitTest, FromMojomSolanaAccountMetas) { &account_metas); EXPECT_EQ(account_metas, std::vector( - {SolanaAccountMeta(kAccount1, absl::nullopt, true, false), + {SolanaAccountMeta(kAccount1, std::nullopt, true, false), SolanaAccountMeta(kAccount2, 2, false, true)})); } @@ -58,7 +59,7 @@ TEST(SolanaAccountMetaUnitTest, FromValue) { "is_signer": true, "is_writable": false })"); - EXPECT_EQ(SolanaAccountMeta(kAccount1, absl::nullopt, true, false), + EXPECT_EQ(SolanaAccountMeta(kAccount1, std::nullopt, true, false), SolanaAccountMeta::FromValue(value.GetDict())); value.GetDict().Set("address_table_lookup_index", "255"); @@ -91,7 +92,7 @@ TEST(SolanaAccountMetaUnitTest, FromValue) { } TEST(SolanaAccountMetaUnitTest, ToValue) { - SolanaAccountMeta meta(kAccount1, absl::nullopt, true, false); + SolanaAccountMeta meta(kAccount1, std::nullopt, true, false); base::Value::Dict value = meta.ToValue(); EXPECT_EQ(*value.FindString("pubkey"), "3Lu176FQzbQJCc8iL9PnmALbpMPhZeknoturApnXRDJw"); diff --git a/components/brave_wallet/browser/solana_compiled_instruction.cc b/components/brave_wallet/browser/solana_compiled_instruction.cc index 4542c514f37..df9e358d291 100644 --- a/components/brave_wallet/browser/solana_compiled_instruction.cc +++ b/components/brave_wallet/browser/solana_compiled_instruction.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_wallet/browser/solana_compiled_instruction.h" +#include + #include "brave/components/brave_wallet/browser/solana_instruction.h" #include "brave/components/brave_wallet/browser/solana_message_address_table_lookup.h" #include "brave/components/brave_wallet/common/solana_address.h" @@ -14,22 +16,22 @@ namespace brave_wallet { namespace { -absl::optional FindIndexInStaticAccounts( +std::optional FindIndexInStaticAccounts( const std::vector& keys, const std::string& target_key) { if (keys.size() > UINT8_MAX) { - return absl::nullopt; + return std::nullopt; } auto it = base::ranges::find_if(keys, [&](const SolanaAddress& key) { return key.ToBase58() == target_key; }); if (it == keys.end()) { - return absl::nullopt; + return std::nullopt; } return it - keys.begin(); } -absl::optional FindIndexInAddressTableLookups( +std::optional FindIndexInAddressTableLookups( const std::vector& addr_table_lookups, const SolanaAccountMeta& account, uint8_t num_of_static_accounts, @@ -55,7 +57,7 @@ absl::optional FindIndexInAddressTableLookups( } } - return absl::nullopt; + return std::nullopt; } } // namespace @@ -81,7 +83,7 @@ bool SolanaCompiledInstruction::operator==( } // static -absl::optional +std::optional SolanaCompiledInstruction::FromInstruction( const SolanaInstruction& instruction, const std::vector& static_accounts, @@ -92,24 +94,24 @@ SolanaCompiledInstruction::FromInstruction( auto program_id_index = FindIndexInStaticAccounts(static_accounts, instruction.GetProgramId()); if (!program_id_index) { - return absl::nullopt; + return std::nullopt; } std::vector account_indexes; for (const auto& account : instruction.GetAccounts()) { - absl::optional account_index; + std::optional account_index; if (!account.address_table_lookup_index) { // static accounts account_index = FindIndexInStaticAccounts(static_accounts, account.pubkey); if (!account_index) { - return absl::nullopt; + return std::nullopt; } } else { // dynamic loaded accounts account_index = FindIndexInAddressTableLookups( addr_table_lookups, account, static_accounts.size(), num_of_total_write_indexes); if (!account_index) { - return absl::nullopt; + return std::nullopt; } } account_indexes.emplace_back(*account_index); @@ -132,20 +134,20 @@ void SolanaCompiledInstruction::Serialize(std::vector* bytes) const { } // static -absl::optional -SolanaCompiledInstruction::Deserialize(const std::vector& bytes, - size_t* bytes_index) { +std::optional SolanaCompiledInstruction::Deserialize( + const std::vector& bytes, + size_t* bytes_index) { DCHECK(bytes_index); if (*bytes_index >= bytes.size()) { - return absl::nullopt; + return std::nullopt; } uint8_t program_id_index = bytes[(*bytes_index)++]; auto account_indexes = CompactArrayDecode(bytes, bytes_index); auto data = CompactArrayDecode(bytes, bytes_index); if (!account_indexes || !data) { - return absl::nullopt; + return std::nullopt; } return SolanaCompiledInstruction(program_id_index, *account_indexes, *data); diff --git a/components/brave_wallet/browser/solana_compiled_instruction.h b/components/brave_wallet/browser/solana_compiled_instruction.h index ce341f8bff0..d0b65d161bd 100644 --- a/components/brave_wallet/browser/solana_compiled_instruction.h +++ b/components/brave_wallet/browser/solana_compiled_instruction.h @@ -6,10 +6,10 @@ #ifndef BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_SOLANA_COMPILED_INSTRUCTION_H_ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_SOLANA_COMPILED_INSTRUCTION_H_ +#include #include #include -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_wallet { @@ -33,11 +33,11 @@ class SolanaCompiledInstruction { bool operator==(const SolanaCompiledInstruction& ins) const; void Serialize(std::vector* bytes) const; - static absl::optional Deserialize( + static std::optional Deserialize( const std::vector& bytes, size_t* bytes_index); - static absl::optional FromInstruction( + static std::optional FromInstruction( const SolanaInstruction& instruction, const std::vector& static_accounts, const std::vector& addr_table_lookups, diff --git a/components/brave_wallet/browser/solana_instruction.cc b/components/brave_wallet/browser/solana_instruction.cc index a902956f32a..bd63bd50e2c 100644 --- a/components/brave_wallet/browser/solana_instruction.cc +++ b/components/brave_wallet/browser/solana_instruction.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_wallet/browser/solana_instruction.h" #include +#include #include #include @@ -45,7 +46,7 @@ SolanaInstruction::SolanaInstruction( const std::string& program_id, std::vector&& accounts, const std::vector& data, - absl::optional decoded_data) + std::optional decoded_data) : program_id_(program_id), accounts_(std::move(accounts)), data_(data), @@ -92,7 +93,7 @@ bool SolanaInstruction::operator==(const SolanaInstruction& ins) const { // https://docs.solana.com/proposals/versioned-transactions#limitations. // // static -absl::optional SolanaInstruction::FromCompiledInstruction( +std::optional SolanaInstruction::FromCompiledInstruction( const SolanaCompiledInstruction& compiled_instruction, const SolanaMessageHeader& message_header, const std::vector& static_accounts, @@ -107,13 +108,13 @@ absl::optional SolanaInstruction::FromCompiledInstruction( message_header.num_readonly_signed_accounts; if (num_writable_signed_accounts < 0 || num_writable_unsigned_accounts < 0) { // invalid message header - return absl::nullopt; + return std::nullopt; } // Program ID of compiled_instruction should be in static accounts. // https://docs.rs/solana-program/1.14.12/src/solana_program/message/versions/v0/mod.rs.html#72-73 if (compiled_instruction.program_id_index() >= static_accounts.size()) { - return absl::nullopt; + return std::nullopt; } std::string program_id = static_accounts[compiled_instruction.program_id_index()].ToBase58(); @@ -121,7 +122,7 @@ absl::optional SolanaInstruction::FromCompiledInstruction( std::vector account_metas; for (const auto& account_index : compiled_instruction.account_indexes()) { std::string account_key; - absl::optional address_table_lookup_index = absl::nullopt; + std::optional address_table_lookup_index = std::nullopt; bool is_signer = false; bool is_writable = false; @@ -157,10 +158,10 @@ absl::optional SolanaInstruction::FromCompiledInstruction( } if (!address_table_lookup_index) { // not found in table lookups - return absl::nullopt; + return std::nullopt; } } else { // out of bound - return absl::nullopt; + return std::nullopt; } account_metas.emplace_back(SolanaAccountMeta( account_key, address_table_lookup_index, is_signer, is_writable)); @@ -208,41 +209,41 @@ base::Value::Dict SolanaInstruction::ToValue() const { } // static -absl::optional SolanaInstruction::FromValue( +std::optional SolanaInstruction::FromValue( const base::Value::Dict& value) { const std::string* program_id = value.FindString(kProgramId); if (!program_id) { - return absl::nullopt; + return std::nullopt; } const base::Value::List* account_list = value.FindList(kAccounts); if (!account_list) { - return absl::nullopt; + return std::nullopt; } std::vector accounts; for (const auto& account_value : *account_list) { if (!account_value.is_dict()) { - return absl::nullopt; + return std::nullopt; } - absl::optional account = + std::optional account = SolanaAccountMeta::FromValue(account_value.GetDict()); if (!account) { - return absl::nullopt; + return std::nullopt; } accounts.push_back(*account); } const std::string* data_base64_encoded = value.FindString(kData); if (!data_base64_encoded) { - return absl::nullopt; + return std::nullopt; } std::string data_decoded; if (!base::Base64Decode(*data_base64_encoded, &data_decoded)) { - return absl::nullopt; + return std::nullopt; } std::vector data(data_decoded.begin(), data_decoded.end()); - absl::optional decoded_data = absl::nullopt; + std::optional decoded_data = std::nullopt; const base::Value::Dict* decoded_data_dict = value.FindDict(kDecodedData); if (decoded_data_dict) { decoded_data = SolanaInstructionDecodedData::FromValue(*decoded_data_dict); diff --git a/components/brave_wallet/browser/solana_instruction.h b/components/brave_wallet/browser/solana_instruction.h index 46f9777c2b2..b943c4cab8a 100644 --- a/components/brave_wallet/browser/solana_instruction.h +++ b/components/brave_wallet/browser/solana_instruction.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_SOLANA_INSTRUCTION_H_ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_SOLANA_INSTRUCTION_H_ +#include #include #include #include @@ -13,7 +14,6 @@ #include "brave/components/brave_wallet/browser/solana_account_meta.h" #include "brave/components/brave_wallet/browser/solana_instruction_decoded_data.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace base { class Value; @@ -39,7 +39,7 @@ class SolanaInstruction { SolanaInstruction(const std::string& program_id, std::vector&& accounts, const std::vector& data, - absl::optional decoded_data); + std::optional decoded_data); ~SolanaInstruction(); SolanaInstruction(const SolanaInstruction&); @@ -48,7 +48,7 @@ class SolanaInstruction { SolanaInstruction& operator=(SolanaInstruction&&); bool operator==(const SolanaInstruction&) const; - static absl::optional FromCompiledInstruction( + static std::optional FromCompiledInstruction( const SolanaCompiledInstruction& compiled_instruction, const SolanaMessageHeader& message_header, const std::vector& static_accounts, @@ -68,7 +68,7 @@ class SolanaInstruction { static void FromMojomSolanaInstructions( const std::vector& mojom_instructions, std::vector* instructions); - static absl::optional FromValue( + static std::optional FromValue( const base::Value::Dict& value); private: @@ -76,7 +76,7 @@ class SolanaInstruction { std::vector accounts_; std::vector data_; - absl::optional decoded_data_; + std::optional decoded_data_; }; } // namespace brave_wallet diff --git a/components/brave_wallet/browser/solana_instruction_builder.cc b/components/brave_wallet/browser/solana_instruction_builder.cc index 7dda75376ee..8b1ccfe2c37 100644 --- a/components/brave_wallet/browser/solana_instruction_builder.cc +++ b/components/brave_wallet/browser/solana_instruction_builder.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/solana_instruction_builder.h" +#include #include #include @@ -52,11 +53,11 @@ namespace system_program { // 0. Funding account [signer, writable]. // 1. Recipient account [non-signer, writable]. // Insturction data: u32 instruction index and u64 lamport. -absl::optional Transfer(const std::string& from_pubkey, - const std::string& to_pubkey, - uint64_t lamport) { +std::optional Transfer(const std::string& from_pubkey, + const std::string& to_pubkey, + uint64_t lamport) { if (from_pubkey.empty() || to_pubkey.empty()) { - return absl::nullopt; + return std::nullopt; } // Instruction data is consisted of u32 instruction index and u64 lamport. @@ -73,8 +74,8 @@ absl::optional Transfer(const std::string& from_pubkey, return SolanaInstruction( mojom::kSolanaSystemProgramId, std::vector( - {SolanaAccountMeta(from_pubkey, absl::nullopt, true, true), - SolanaAccountMeta(to_pubkey, absl::nullopt, false, true)}), + {SolanaAccountMeta(from_pubkey, std::nullopt, true, true), + SolanaAccountMeta(to_pubkey, std::nullopt, false, true)}), instruction_data); } @@ -95,7 +96,7 @@ namespace spl_token_program { // [non-signer, readonly] // 3~3+M. M signer accounts [signer, readonly]. // Insturction data: u8 instruction index and u64 amount. -absl::optional Transfer( +std::optional Transfer( const std::string& token_program_id, const std::string& source_pubkey, const std::string& destination_pubkey, @@ -104,7 +105,7 @@ absl::optional Transfer( uint64_t amount) { if (token_program_id.empty() || source_pubkey.empty() || destination_pubkey.empty() || authority_pubkey.empty()) { - return absl::nullopt; + return std::nullopt; } // Instruction data is consisted of u8 instruction index and u64 amount. @@ -117,13 +118,13 @@ absl::optional Transfer( amount_bytes.end()); std::vector account_metas = { - SolanaAccountMeta(source_pubkey, absl::nullopt, false, true), - SolanaAccountMeta(destination_pubkey, absl::nullopt, false, true), - SolanaAccountMeta(authority_pubkey, absl::nullopt, signer_pubkeys.empty(), + SolanaAccountMeta(source_pubkey, std::nullopt, false, true), + SolanaAccountMeta(destination_pubkey, std::nullopt, false, true), + SolanaAccountMeta(authority_pubkey, std::nullopt, signer_pubkeys.empty(), false)}; for (const auto& signer_pubkey : signer_pubkeys) { - account_metas.emplace_back(signer_pubkey, absl::nullopt, true, false); + account_metas.emplace_back(signer_pubkey, std::nullopt, true, false); } return SolanaInstruction(token_program_id, std::move(account_metas), @@ -147,7 +148,7 @@ namespace spl_associated_token_account_program { // 5. SPL Token program [non-signer, readonly]. // Ref: // https://docs.rs/spl-associated-token-account/1.1.2/spl_associated_token_account/instruction/enum.AssociatedTokenAccountInstruction.html#variant.Create -absl::optional CreateAssociatedTokenAccount( +std::optional CreateAssociatedTokenAccount( const std::string& funding_address, const std::string& wallet_address, const std::string& associated_token_account_address, @@ -155,18 +156,18 @@ absl::optional CreateAssociatedTokenAccount( if (funding_address.empty() || wallet_address.empty() || associated_token_account_address.empty() || spl_token_mint_address.empty()) { - return absl::nullopt; + return std::nullopt; } std::vector account_metas = { - SolanaAccountMeta(funding_address, absl::nullopt, true, true), - SolanaAccountMeta(associated_token_account_address, absl::nullopt, false, + SolanaAccountMeta(funding_address, std::nullopt, true, true), + SolanaAccountMeta(associated_token_account_address, std::nullopt, false, true), - SolanaAccountMeta(wallet_address, absl::nullopt, false, false), - SolanaAccountMeta(spl_token_mint_address, absl::nullopt, false, false), - SolanaAccountMeta(mojom::kSolanaSystemProgramId, absl::nullopt, false, + SolanaAccountMeta(wallet_address, std::nullopt, false, false), + SolanaAccountMeta(spl_token_mint_address, std::nullopt, false, false), + SolanaAccountMeta(mojom::kSolanaSystemProgramId, std::nullopt, false, false), - SolanaAccountMeta(mojom::kSolanaTokenProgramId, absl::nullopt, false, + SolanaAccountMeta(mojom::kSolanaTokenProgramId, std::nullopt, false, false)}; return SolanaInstruction(mojom::kSolanaAssociatedTokenProgramId, std::move(account_metas), std::vector()); diff --git a/components/brave_wallet/browser/solana_instruction_builder.h b/components/brave_wallet/browser/solana_instruction_builder.h index 7ec3f3651f5..54f16a0b2d7 100644 --- a/components/brave_wallet/browser/solana_instruction_builder.h +++ b/components/brave_wallet/browser/solana_instruction_builder.h @@ -6,10 +6,10 @@ #ifndef BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_SOLANA_INSTRUCTION_BUILDER_H_ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_SOLANA_INSTRUCTION_BUILDER_H_ +#include #include #include -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_wallet { @@ -19,15 +19,15 @@ namespace solana { namespace system_program { -absl::optional Transfer(const std::string& from_pubkey, - const std::string& to_pubkey, - uint64_t lamport); +std::optional Transfer(const std::string& from_pubkey, + const std::string& to_pubkey, + uint64_t lamport); } // namespace system_program namespace spl_token_program { -absl::optional Transfer( +std::optional Transfer( const std::string& token_program_id, const std::string& source_pubkey, const std::string& destination_pubkey, @@ -39,7 +39,7 @@ absl::optional Transfer( namespace spl_associated_token_account_program { -absl::optional CreateAssociatedTokenAccount( +std::optional CreateAssociatedTokenAccount( const std::string& funding_address, const std::string& wallet_address, const std::string& associated_token_account_address, diff --git a/components/brave_wallet/browser/solana_instruction_builder_unittest.cc b/components/brave_wallet/browser/solana_instruction_builder_unittest.cc index 83ffb1253ee..61b975ef532 100644 --- a/components/brave_wallet/browser/solana_instruction_builder_unittest.cc +++ b/components/brave_wallet/browser/solana_instruction_builder_unittest.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/solana_instruction_builder.h" +#include #include #include @@ -26,8 +27,8 @@ TEST(SolanaInstructionBuilderUnitTest, TransferSOL) { EXPECT_EQ(ins.value(), SolanaInstruction( mojom::kSolanaSystemProgramId, - {SolanaAccountMeta("pubkey1", absl::nullopt, true, true), - SolanaAccountMeta("pubkey2", absl::nullopt, false, true)}, + {SolanaAccountMeta("pubkey1", std::nullopt, true, true), + SolanaAccountMeta("pubkey2", std::nullopt, false, true)}, {2, 0, 0, 0, 128, 150, 152, 0, 0, 0, 0, 0})); ins = Transfer("", "", 10000000); @@ -45,9 +46,9 @@ TEST(SolanaInstructionBuilderUnitTest, TransferSPLToken) { EXPECT_EQ(ins.value(), SolanaInstruction( "program", - {SolanaAccountMeta("source", absl::nullopt, false, true), - SolanaAccountMeta("destination", absl::nullopt, false, true), - SolanaAccountMeta("authority", absl::nullopt, true, false)}, + {SolanaAccountMeta("source", std::nullopt, false, true), + SolanaAccountMeta("destination", std::nullopt, false, true), + SolanaAccountMeta("authority", std::nullopt, true, false)}, {3, 128, 150, 152, 0, 0, 0, 0, 0})); ins = Transfer("program", "source", "destination", "authority", @@ -56,11 +57,11 @@ TEST(SolanaInstructionBuilderUnitTest, TransferSPLToken) { EXPECT_EQ(ins.value(), SolanaInstruction( "program", - {SolanaAccountMeta("source", absl::nullopt, false, true), - SolanaAccountMeta("destination", absl::nullopt, false, true), - SolanaAccountMeta("authority", absl::nullopt, false, false), - SolanaAccountMeta("signer1", absl::nullopt, true, false), - SolanaAccountMeta("signer2", absl::nullopt, true, false)}, + {SolanaAccountMeta("source", std::nullopt, false, true), + SolanaAccountMeta("destination", std::nullopt, false, true), + SolanaAccountMeta("authority", std::nullopt, false, false), + SolanaAccountMeta("signer1", std::nullopt, true, false), + SolanaAccountMeta("signer2", std::nullopt, true, false)}, {3, 128, 150, 152, 0, 0, 0, 0, 0})); ins = Transfer("program", "source", "destination", "authority", @@ -69,9 +70,9 @@ TEST(SolanaInstructionBuilderUnitTest, TransferSPLToken) { EXPECT_EQ(ins.value(), SolanaInstruction( "program", - {SolanaAccountMeta("source", absl::nullopt, false, true), - SolanaAccountMeta("destination", absl::nullopt, false, true), - SolanaAccountMeta("authority", absl::nullopt, true, false)}, + {SolanaAccountMeta("source", std::nullopt, false, true), + SolanaAccountMeta("destination", std::nullopt, false, true), + SolanaAccountMeta("authority", std::nullopt, true, false)}, {3, 1, 0, 0, 0, 0, 0, 0, 0})); ins = Transfer("", "", "", "", std::vector(), 1); @@ -91,15 +92,15 @@ TEST(SolanaInstructionBuilderUnitTest, CreateAssociatedTokenAccount) { ins.value(), SolanaInstruction( mojom::kSolanaAssociatedTokenProgramId, - {SolanaAccountMeta("funding_address", absl::nullopt, true, true), - SolanaAccountMeta("associated_token_account_address", absl::nullopt, + {SolanaAccountMeta("funding_address", std::nullopt, true, true), + SolanaAccountMeta("associated_token_account_address", std::nullopt, false, true), - SolanaAccountMeta("wallet_address", absl::nullopt, false, false), - SolanaAccountMeta("spl_token_mint_address", absl::nullopt, false, + SolanaAccountMeta("wallet_address", std::nullopt, false, false), + SolanaAccountMeta("spl_token_mint_address", std::nullopt, false, false), - SolanaAccountMeta(mojom::kSolanaSystemProgramId, absl::nullopt, - false, false), - SolanaAccountMeta(mojom::kSolanaTokenProgramId, absl::nullopt, false, + SolanaAccountMeta(mojom::kSolanaSystemProgramId, std::nullopt, false, + false), + SolanaAccountMeta(mojom::kSolanaTokenProgramId, std::nullopt, false, false)}, std::vector())); diff --git a/components/brave_wallet/browser/solana_instruction_data_decoder.cc b/components/brave_wallet/browser/solana_instruction_data_decoder.cc index 970485ae649..d0ee8ae70b9 100644 --- a/components/brave_wallet/browser/solana_instruction_data_decoder.cc +++ b/components/brave_wallet/browser/solana_instruction_data_decoder.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/solana_instruction_data_decoder.h" +#include #include #include @@ -606,39 +607,39 @@ GetTokenInstructionAccountParams() { return *params; } -absl::optional DecodeUint8(const std::vector& input, - size_t& offset) { +std::optional DecodeUint8(const std::vector& input, + size_t& offset) { if (offset >= input.size() || input.size() - offset < sizeof(uint8_t)) { - return absl::nullopt; + return std::nullopt; } offset += sizeof(uint8_t); return input[offset - sizeof(uint8_t)]; } -absl::optional DecodeUint8String(const std::vector& input, - size_t& offset) { +std::optional DecodeUint8String(const std::vector& input, + size_t& offset) { auto ret = DecodeUint8(input, offset); if (!ret) { - return absl::nullopt; + return std::nullopt; } return base::NumberToString(*ret); } -absl::optional DecodeAuthorityTypeString( +std::optional DecodeAuthorityTypeString( const std::vector& input, size_t& offset) { auto ret = DecodeUint8(input, offset); if (ret && *ret <= kAuthorityTypeMax) { return base::NumberToString(*ret); } - return absl::nullopt; + return std::nullopt; } -absl::optional DecodeUint32(const std::vector& input, - size_t& offset) { +std::optional DecodeUint32(const std::vector& input, + size_t& offset) { if (offset >= input.size() || input.size() - offset < sizeof(uint32_t)) { - return absl::nullopt; + return std::nullopt; } // Read bytes in little endian order. @@ -655,20 +656,19 @@ absl::optional DecodeUint32(const std::vector& input, #endif } -absl::optional DecodeUint32String( - const std::vector& input, - size_t& offset) { +std::optional DecodeUint32String(const std::vector& input, + size_t& offset) { auto ret = DecodeUint32(input, offset); if (!ret) { - return absl::nullopt; + return std::nullopt; } return base::NumberToString(*ret); } -absl::optional DecodeUint64(const std::vector& input, - size_t& offset) { +std::optional DecodeUint64(const std::vector& input, + size_t& offset) { if (offset >= input.size() || input.size() - offset < sizeof(uint64_t)) { - return absl::nullopt; + return std::nullopt; } // Read bytes in little endian order. @@ -685,20 +685,19 @@ absl::optional DecodeUint64(const std::vector& input, #endif } -absl::optional DecodeUint64String( - const std::vector& input, - size_t& offset) { +std::optional DecodeUint64String(const std::vector& input, + size_t& offset) { auto ret = DecodeUint64(input, offset); if (!ret) { - return absl::nullopt; + return std::nullopt; } return base::NumberToString(*ret); } -absl::optional DecodePublicKey(const std::vector& input, - size_t& offset) { +std::optional DecodePublicKey(const std::vector& input, + size_t& offset) { if (offset >= input.size() || input.size() - offset < kSolanaPubkeySize) { - return absl::nullopt; + return std::nullopt; } offset += kSolanaPubkeySize; @@ -706,11 +705,11 @@ absl::optional DecodePublicKey(const std::vector& input, input.begin() + offset - kSolanaPubkeySize, input.begin() + offset)); } -absl::optional DecodeOptionalPublicKey( +std::optional DecodeOptionalPublicKey( const std::vector& input, size_t& offset) { if (offset == input.size()) { - return absl::nullopt; + return std::nullopt; } // First byte is 0 or 1 to indicate if public key is passed. @@ -722,7 +721,7 @@ absl::optional DecodeOptionalPublicKey( offset++; return DecodePublicKey(input, offset); } else { - return absl::nullopt; + return std::nullopt; } } @@ -733,19 +732,19 @@ absl::optional DecodeOptionalPublicKey( // We currently cap the length here to be the max size of std::string // on 32 bit systems, it's safe to do so because currently we don't expect any // valid cases would have strings larger than it. -absl::optional DecodeString(const std::vector& input, - size_t& offset) { +std::optional DecodeString(const std::vector& input, + size_t& offset) { auto len_lower = DecodeUint32(input, offset); if (!len_lower || *len_lower > kMaxStringSize32Bit) { - return absl::nullopt; + return std::nullopt; } auto len_upper = DecodeUint32(input, offset); if (!len_upper || *len_upper != 0) { // Non-zero means len exceeds u32 max. - return absl::nullopt; + return std::nullopt; } if (offset + *len_lower > input.size()) { - return absl::nullopt; + return std::nullopt; } offset += *len_lower; @@ -757,7 +756,7 @@ bool DecodeParamType(const ParamNameTypeTuple& name_type_tuple, const std::vector data, size_t& offset, std::vector& ins_param_tuple) { - absl::optional value; + std::optional value; switch (std::get<2>(name_type_tuple)) { case mojom::SolanaInstructionParamType::kUint8: @@ -804,24 +803,24 @@ bool DecodeParamType(const ParamNameTypeTuple& name_type_tuple, return true; } -absl::optional DecodeSystemInstructionType( +std::optional DecodeSystemInstructionType( const std::vector& data, size_t& offset) { auto ins_type = DecodeUint32(data, offset); if (!ins_type || *ins_type > static_cast( mojom::SolanaSystemInstruction::kMaxValue)) { - return absl::nullopt; + return std::nullopt; } return static_cast(*ins_type); } -absl::optional DecodeTokenInstructionType( +std::optional DecodeTokenInstructionType( const std::vector& data, size_t& offset) { auto ins_type = DecodeUint8(data, offset); if (!ins_type || *ins_type > static_cast( mojom::SolanaTokenInstruction::kMaxValue)) { - return absl::nullopt; + return std::nullopt; } return static_cast(*ins_type); } @@ -854,12 +853,12 @@ const std::vector* DecodeInstructionType( } // namespace -absl::optional Decode( +std::optional Decode( const std::vector& data, const std::string& program_id) { if (program_id != mojom::kSolanaSystemProgramId && program_id != mojom::kSolanaTokenProgramId) { - return absl::nullopt; + return std::nullopt; } SolanaInstructionDecodedData decoded_data; @@ -868,12 +867,12 @@ absl::optional Decode( const std::vector* param_tuples = DecodeInstructionType(program_id, data, offset, decoded_data); if (!param_tuples) { - return absl::nullopt; + return std::nullopt; } for (const auto& param_tuple : *param_tuples) { if (!DecodeParamType(param_tuple, data, offset, decoded_data.params)) { - return absl::nullopt; + return std::nullopt; } } @@ -881,8 +880,8 @@ absl::optional Decode( } std::vector GetAccountParamsForTesting( - absl::optional sys_ins_type, - absl::optional token_ins_type) { + std::optional sys_ins_type, + std::optional token_ins_type) { if (sys_ins_type) { return GetSystemInstructionAccountParams().at(*sys_ins_type); } @@ -897,8 +896,8 @@ std::vector GetAccountParamsForTesting( std::vector GetMojomAccountParamsForTesting( - absl::optional sys_ins_type, - absl::optional token_ins_type) { + std::optional sys_ins_type, + std::optional token_ins_type) { std::vector mojom_params; for (const auto& param : GetAccountParamsForTesting(sys_ins_type, token_ins_type)) { diff --git a/components/brave_wallet/browser/solana_instruction_data_decoder.h b/components/brave_wallet/browser/solana_instruction_data_decoder.h index b07087155d1..97ed540f52b 100644 --- a/components/brave_wallet/browser/solana_instruction_data_decoder.h +++ b/components/brave_wallet/browser/solana_instruction_data_decoder.h @@ -6,27 +6,27 @@ #ifndef BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_SOLANA_INSTRUCTION_DATA_DECODER_H_ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_SOLANA_INSTRUCTION_DATA_DECODER_H_ +#include #include #include #include "brave/components/brave_wallet/browser/solana_instruction_decoded_data.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_wallet::solana_ins_data_decoder { -absl::optional Decode( +std::optional Decode( const std::vector& data, const std::string& program_id); std::vector GetAccountParamsForTesting( - absl::optional sys_ins_type, - absl::optional token_ins_type); + std::optional sys_ins_type, + std::optional token_ins_type); std::vector GetMojomAccountParamsForTesting( - absl::optional sys_ins_type, - absl::optional token_ins_type); + std::optional sys_ins_type, + std::optional token_ins_type); } // namespace brave_wallet::solana_ins_data_decoder diff --git a/components/brave_wallet/browser/solana_instruction_data_decoder_unittest.cc b/components/brave_wallet/browser/solana_instruction_data_decoder_unittest.cc index d8c4d9f5520..1fdee356c76 100644 --- a/components/brave_wallet/browser/solana_instruction_data_decoder_unittest.cc +++ b/components/brave_wallet/browser/solana_instruction_data_decoder_unittest.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/solana_instruction_data_decoder.h" +#include #include #include #include @@ -36,7 +37,7 @@ class SolanaInstructionDecoderTest : public testing::Test { EXPECT_EQ(params[i], std::make_pair(std::get<0>(ret->params[i]), std::get<2>(ret->params[i]))); } - EXPECT_EQ(GetAccountParamsForTesting(ins_type, absl::nullopt), + EXPECT_EQ(GetAccountParamsForTesting(ins_type, std::nullopt), ret->account_params); for (size_t i = 0; i < data.size(); ++i) { @@ -59,7 +60,7 @@ class SolanaInstructionDecoderTest : public testing::Test { EXPECT_EQ(params[i], std::make_pair(std::get<0>(ret->params[i]), std::get<2>(ret->params[i]))); } - EXPECT_EQ(GetAccountParamsForTesting(absl::nullopt, ins_type), + EXPECT_EQ(GetAccountParamsForTesting(std::nullopt, ins_type), ret->account_params); // Skip when testing typescript impl without passing the optional key diff --git a/components/brave_wallet/browser/solana_instruction_decoded_data.cc b/components/brave_wallet/browser/solana_instruction_decoded_data.cc index 8300379e3cb..0a73200b036 100644 --- a/components/brave_wallet/browser/solana_instruction_decoded_data.cc +++ b/components/brave_wallet/browser/solana_instruction_decoded_data.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_wallet/browser/solana_instruction_decoded_data.h" +#include + namespace brave_wallet { SolanaInstructionDecodedData::SolanaInstructionDecodedData() = default; @@ -26,31 +28,31 @@ bool SolanaInstructionDecodedData::operator==( } // static -absl::optional +std::optional SolanaInstructionDecodedData::FromMojom( const std::string& program_id, const mojom::DecodedSolanaInstructionDataPtr& mojom_decoded_data) { SolanaInstructionDecodedData decoded_data; if (!mojom_decoded_data) { - return absl::nullopt; + return std::nullopt; } if (program_id != mojom::kSolanaSystemProgramId && program_id != mojom::kSolanaTokenProgramId) { - return absl::nullopt; + return std::nullopt; } if (program_id == mojom::kSolanaSystemProgramId) { if (mojom_decoded_data->instruction_type > static_cast(mojom::SolanaSystemInstruction::kMaxValue)) { - return absl::nullopt; + return std::nullopt; } decoded_data.sys_ins_type = static_cast( mojom_decoded_data->instruction_type); } else { // token program if (mojom_decoded_data->instruction_type > static_cast(mojom::SolanaTokenInstruction::kMaxValue)) { - return absl::nullopt; + return std::nullopt; } decoded_data.token_ins_type = static_cast( mojom_decoded_data->instruction_type); @@ -97,12 +99,12 @@ mojom::DecodedSolanaInstructionDataPtr SolanaInstructionDecodedData::ToMojom() } // static -absl::optional +std::optional SolanaInstructionDecodedData::FromValue(const base::Value::Dict& value) { const std::string* sys_ins_type_str = value.FindString("sys_ins_type"); const std::string* token_ins_type_str = value.FindString("token_ins_type"); if (!sys_ins_type_str == !token_ins_type_str) { // Both true or both false. - return absl::nullopt; + return std::nullopt; } SolanaInstructionDecodedData decoded_data; @@ -111,7 +113,7 @@ SolanaInstructionDecodedData::FromValue(const base::Value::Dict& value) { if (!base::StringToUint(*sys_ins_type_str, &sys_ins_type) || sys_ins_type > static_cast(mojom::SolanaSystemInstruction::kMaxValue)) { - return absl::nullopt; + return std::nullopt; } decoded_data.sys_ins_type = static_cast(sys_ins_type); @@ -120,7 +122,7 @@ SolanaInstructionDecodedData::FromValue(const base::Value::Dict& value) { if (!base::StringToUint(*token_ins_type_str, &token_ins_type) || token_ins_type > static_cast(mojom::SolanaTokenInstruction::kMaxValue)) { - return absl::nullopt; + return std::nullopt; } decoded_data.token_ins_type = static_cast(token_ins_type); @@ -128,24 +130,24 @@ SolanaInstructionDecodedData::FromValue(const base::Value::Dict& value) { const base::Value::List* param_list = value.FindList("params"); if (!param_list) { - return absl::nullopt; + return std::nullopt; } for (const auto& param_value : *param_list) { if (!param_value.is_dict()) { - return absl::nullopt; + return std::nullopt; } const auto* name = param_value.GetDict().FindString("name"); if (!name) { - return absl::nullopt; + return std::nullopt; } const auto* localized_name = param_value.GetDict().FindString("localized_name"); if (!localized_name) { - return absl::nullopt; + return std::nullopt; } const auto* value_local = param_value.GetDict().FindString("value"); if (!value_local) { - return absl::nullopt; + return std::nullopt; } mojom::SolanaInstructionParamType type = @@ -165,16 +167,16 @@ SolanaInstructionDecodedData::FromValue(const base::Value::Dict& value) { value.FindList("account_params"); for (const auto& param_value : *account_param_list) { if (!param_value.is_dict()) { - return absl::nullopt; + return std::nullopt; } const auto* name = param_value.GetDict().FindString("name"); if (!name) { - return absl::nullopt; + return std::nullopt; } const auto* localized_name = param_value.GetDict().FindString("localized_name"); if (!localized_name) { - return absl::nullopt; + return std::nullopt; } decoded_data.account_params.emplace_back( std::make_pair(*name, *localized_name)); @@ -183,10 +185,9 @@ SolanaInstructionDecodedData::FromValue(const base::Value::Dict& value) { return decoded_data; } -absl::optional SolanaInstructionDecodedData::ToValue() - const { +std::optional SolanaInstructionDecodedData::ToValue() const { if (!IsValid()) { - return absl::nullopt; + return std::nullopt; } base::Value::Dict dict; diff --git a/components/brave_wallet/browser/solana_instruction_decoded_data.h b/components/brave_wallet/browser/solana_instruction_decoded_data.h index 3ecd70b63a4..df9bdb8cc1b 100644 --- a/components/brave_wallet/browser/solana_instruction_decoded_data.h +++ b/components/brave_wallet/browser/solana_instruction_decoded_data.h @@ -6,13 +6,13 @@ #ifndef BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_SOLANA_INSTRUCTION_DECODED_DATA_H_ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_SOLANA_INSTRUCTION_DECODED_DATA_H_ +#include #include #include #include #include #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_wallet { @@ -24,8 +24,8 @@ using InsParamTuple = std::tuple; using InsTypeAndParamTuple = - std::tuple, - absl::optional, + std::tuple, + std::optional, std::vector, // Instruction params in data. std::vector>; // Account params. @@ -39,20 +39,20 @@ struct SolanaInstructionDecodedData { bool operator==(const SolanaInstructionDecodedData&) const; - static absl::optional FromMojom( + static std::optional FromMojom( const std::string& program_id, const mojom::DecodedSolanaInstructionDataPtr& mojom_decoded_data); mojom::DecodedSolanaInstructionDataPtr ToMojom() const; - static absl::optional FromValue( + static std::optional FromValue( const base::Value::Dict& value); - absl::optional ToValue() const; + std::optional ToValue() const; // There should be only one type that has value. bool IsValid() const { return !sys_ins_type != !token_ins_type; } - absl::optional sys_ins_type; - absl::optional token_ins_type; + std::optional sys_ins_type; + std::optional token_ins_type; std::vector params; std::vector account_params; }; diff --git a/components/brave_wallet/browser/solana_instruction_decoded_data_unittest.cc b/components/brave_wallet/browser/solana_instruction_decoded_data_unittest.cc index 2f729790746..b290ce96f6f 100644 --- a/components/brave_wallet/browser/solana_instruction_decoded_data_unittest.cc +++ b/components/brave_wallet/browser/solana_instruction_decoded_data_unittest.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/solana_instruction_decoded_data.h" +#include #include #include #include @@ -28,7 +29,7 @@ TEST(SolanaInstructionDecodedDataUnitTest, FromToMojom) { auto mojom_decoded_data = mojom::DecodedSolanaInstructionData::New( static_cast(mojom::SolanaSystemInstruction::kTransfer), solana_ins_data_decoder::GetMojomAccountParamsForTesting( - mojom::SolanaSystemInstruction::kTransfer, absl::nullopt), + mojom::SolanaSystemInstruction::kTransfer, std::nullopt), std::move(mojom_params)); auto decoded_data = SolanaInstructionDecodedData::FromMojom( @@ -45,7 +46,7 @@ TEST(SolanaInstructionDecodedDataUnitTest, FromToMojom) { mojom::SolanaInstructionParamType::kPublicKey}}); auto expect_account_params = solana_ins_data_decoder::GetAccountParamsForTesting( - mojom::SolanaSystemInstruction::kTransfer, absl::nullopt); + mojom::SolanaSystemInstruction::kTransfer, std::nullopt); EXPECT_EQ(decoded_data->params, expect_params); EXPECT_EQ(decoded_data->account_params, expect_account_params); EXPECT_EQ(decoded_data->ToMojom(), mojom_decoded_data); @@ -54,9 +55,9 @@ TEST(SolanaInstructionDecodedDataUnitTest, FromToMojom) { static_cast(mojom::SolanaTokenInstruction::kApprove); mojom_decoded_data->account_params = solana_ins_data_decoder::GetMojomAccountParamsForTesting( - absl::nullopt, mojom::SolanaTokenInstruction::kApprove); + std::nullopt, mojom::SolanaTokenInstruction::kApprove); expect_account_params = solana_ins_data_decoder::GetAccountParamsForTesting( - absl::nullopt, mojom::SolanaTokenInstruction::kApprove); + std::nullopt, mojom::SolanaTokenInstruction::kApprove); decoded_data = SolanaInstructionDecodedData::FromMojom( mojom::kSolanaTokenProgramId, mojom_decoded_data.Clone()); ASSERT_TRUE(decoded_data); diff --git a/components/brave_wallet/browser/solana_instruction_unittest.cc b/components/brave_wallet/browser/solana_instruction_unittest.cc index c95ee222c90..f4c3753f3fa 100644 --- a/components/brave_wallet/browser/solana_instruction_unittest.cc +++ b/components/brave_wallet/browser/solana_instruction_unittest.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/solana_instruction.h" +#include #include #include @@ -35,7 +36,7 @@ namespace brave_wallet { TEST(SolanaInstructionUnitTest, FromToCompiledInstruction) { SolanaInstruction expected_ins( mojom::kSolanaSystemProgramId, - {SolanaAccountMeta(kAccount1, absl::nullopt, true, false), + {SolanaAccountMeta(kAccount1, std::nullopt, true, false), SolanaAccountMeta(kAccount2, 1, false, true), SolanaAccountMeta(kAccount4, 3, false, true), SolanaAccountMeta(kAccount3, 1, false, false)}, @@ -97,10 +98,10 @@ TEST(SolanaInstructionUnitTest, FromToCompiledInstruction) { // Test all possible is_signer and is_writable values. SolanaInstruction expected_ins2( mojom::kSolanaSystemProgramId, - {SolanaAccountMeta(kAccount1, absl::nullopt, true, true), - SolanaAccountMeta(kAccount2, absl::nullopt, true, false), - SolanaAccountMeta(kAccount3, absl::nullopt, false, true), - SolanaAccountMeta(kAccount4, absl::nullopt, false, false), + {SolanaAccountMeta(kAccount1, std::nullopt, true, true), + SolanaAccountMeta(kAccount2, std::nullopt, true, false), + SolanaAccountMeta(kAccount3, std::nullopt, false, true), + SolanaAccountMeta(kAccount4, std::nullopt, false, false), SolanaAccountMeta(kAccount5, 2, false, true), SolanaAccountMeta(kAccount5, 6, false, false)}, {}); @@ -146,8 +147,8 @@ TEST(SolanaInstructionUnitTest, FromToValue) { // Program ID mojom::kSolanaSystemProgramId, // Accounts - {SolanaAccountMeta(from_account, absl::nullopt, true, true), - SolanaAccountMeta(to_account, absl::nullopt, false, true)}, + {SolanaAccountMeta(from_account, std::nullopt, true, true), + SolanaAccountMeta(to_account, std::nullopt, false, true)}, data); base::Value::Dict value = instruction.ToValue(); @@ -229,7 +230,7 @@ TEST(SolanaInstructionUnitTest, FromMojomSolanaInstructions) { auto mojom_decoded_data = mojom::DecodedSolanaInstructionData::New( static_cast(mojom::SolanaSystemInstruction::kTransfer), solana_ins_data_decoder::GetMojomAccountParamsForTesting( - mojom::SolanaSystemInstruction::kTransfer, absl::nullopt), + mojom::SolanaSystemInstruction::kTransfer, std::nullopt), std::move(mojom_params)); const std::string config_program = @@ -251,14 +252,14 @@ TEST(SolanaInstructionUnitTest, FromMojomSolanaInstructions) { EXPECT_EQ(std::vector( {SolanaInstruction( mojom::kSolanaSystemProgramId, - {SolanaAccountMeta(pubkey1, absl::nullopt, true, false), - SolanaAccountMeta(pubkey2, absl::nullopt, false, true)}, + {SolanaAccountMeta(pubkey1, std::nullopt, true, false), + SolanaAccountMeta(pubkey2, std::nullopt, false, true)}, data), SolanaInstruction( config_program, - {SolanaAccountMeta(pubkey2, absl::nullopt, false, true), - SolanaAccountMeta(pubkey1, absl::nullopt, true, false)}, - data, absl::nullopt)}), + {SolanaAccountMeta(pubkey2, std::nullopt, false, true), + SolanaAccountMeta(pubkey1, std::nullopt, true, false)}, + data, std::nullopt)}), instructions); } @@ -269,8 +270,8 @@ TEST(SolanaInstructionUnitTest, ToMojomSolanaInstruction) { SolanaInstruction instruction( mojom::kSolanaSystemProgramId, - {SolanaAccountMeta(pubkey1, absl::nullopt, true, false), - SolanaAccountMeta(pubkey2, absl::nullopt, false, true)}, + {SolanaAccountMeta(pubkey1, std::nullopt, true, false), + SolanaAccountMeta(pubkey2, std::nullopt, false, true)}, data); auto mojom_instruction = instruction.ToMojomSolanaInstruction(); @@ -291,7 +292,7 @@ TEST(SolanaInstructionUnitTest, ToMojomSolanaInstruction) { mojom::DecodedSolanaInstructionData::New( static_cast(mojom::SolanaSystemInstruction::kTransfer), solana_ins_data_decoder::GetMojomAccountParamsForTesting( - mojom::SolanaSystemInstruction::kTransfer, absl::nullopt), + mojom::SolanaSystemInstruction::kTransfer, std::nullopt), std::move(mojom_params))); } diff --git a/components/brave_wallet/browser/solana_keyring.cc b/components/brave_wallet/browser/solana_keyring.cc index 8c1434d36bf..f928ed3e8e0 100644 --- a/components/brave_wallet/browser/solana_keyring.cc +++ b/components/brave_wallet/browser/solana_keyring.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_wallet/browser/solana_keyring.h" #include +#include #include #include "brave/components/brave_wallet/browser/internal/hd_key_ed25519.h" @@ -75,23 +76,23 @@ std::string SolanaKeyring::GetAddressInternal(HDKeyBase* hd_key_base) const { // Create a valid program derived address without searching for a bump seed. // https://docs.rs/solana-program/latest/solana_program/pubkey/struct.Pubkey.html#method.create_program_address // static -absl::optional SolanaKeyring::CreateProgramDerivedAddress( +std::optional SolanaKeyring::CreateProgramDerivedAddress( const std::vector>& seeds, const std::string& program_id) { const std::string pda_marker = "ProgramDerivedAddress"; std::vector program_id_bytes; if (!Base58Decode(program_id, &program_id_bytes, kSolanaPubkeySize)) { - return absl::nullopt; + return std::nullopt; } if (seeds.size() > kMaxSeeds) { - return absl::nullopt; + return std::nullopt; } for (const auto& seed : seeds) { if (seed.size() > kMaxSeedLen) { - return absl::nullopt; + return std::nullopt; } } @@ -109,7 +110,7 @@ absl::optional SolanaKeyring::CreateProgramDerivedAddress( // Invalid because program derived addresses have to be off-curve. if (bytes_are_curve25519_point( rust::Slice{hash_vec.data(), hash_vec.size()})) { - return absl::nullopt; + return std::nullopt; } return Base58Encode(hash_vec); @@ -118,7 +119,7 @@ absl::optional SolanaKeyring::CreateProgramDerivedAddress( // Find a valid program derived address and its corresponding bump seed. // https://docs.rs/solana-program/latest/solana_program/pubkey/struct.Pubkey.html#method.find_program_address // static -absl::optional SolanaKeyring::FindProgramDerivedAddress( +std::optional SolanaKeyring::FindProgramDerivedAddress( const std::vector>& seeds, const std::string& program_id, uint8_t* ret_bump_seed) { @@ -140,14 +141,14 @@ absl::optional SolanaKeyring::FindProgramDerivedAddress( --bump_seed[0]; } - return absl::nullopt; + return std::nullopt; } // Derives the associated token account address for the given wallet address and // token mint. // https://docs.rs/spl-associated-token-account/1.0.3/spl_associated_token_account/fn.get_associated_token_address.html // static -absl::optional SolanaKeyring::GetAssociatedTokenAccount( +std::optional SolanaKeyring::GetAssociatedTokenAccount( const std::string& spl_token_mint_address, const std::string& wallet_address) { std::vector> seeds; @@ -160,7 +161,7 @@ absl::optional SolanaKeyring::GetAssociatedTokenAccount( kSolanaPubkeySize) || !Base58Decode(spl_token_mint_address, &spl_token_mint_address_bytes, kSolanaPubkeySize)) { - return absl::nullopt; + return std::nullopt; } seeds.push_back(std::move(wallet_address_bytes)); @@ -175,7 +176,7 @@ absl::optional SolanaKeyring::GetAssociatedTokenAccount( // Derive metadata account using metadata seed constant, token metadata program // id, and the mint address as the seeds. // https://docs.metaplex.com/programs/token-metadata/accounts#metadata -absl::optional SolanaKeyring::GetAssociatedMetadataAccount( +std::optional SolanaKeyring::GetAssociatedMetadataAccount( const std::string& token_mint_address) { std::vector> seeds; const std::string metadata_seed_constant = "metadata"; @@ -188,7 +189,7 @@ absl::optional SolanaKeyring::GetAssociatedMetadataAccount( kSolanaPubkeySize) || !Base58Decode(token_mint_address, &token_mint_address_bytes, kSolanaPubkeySize)) { - return absl::nullopt; + return std::nullopt; } seeds.push_back(std::move(metaplex_seed_constant_bytes)); diff --git a/components/brave_wallet/browser/solana_keyring.h b/components/brave_wallet/browser/solana_keyring.h index d60bbe853ce..2fbcf205c5c 100644 --- a/components/brave_wallet/browser/solana_keyring.h +++ b/components/brave_wallet/browser/solana_keyring.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_SOLANA_KEYRING_H_ #include +#include #include #include @@ -29,20 +30,20 @@ class SolanaKeyring : public HDKeyring { std::vector SignMessage(const std::string& address, const std::vector& message); - static absl::optional CreateProgramDerivedAddress( + static std::optional CreateProgramDerivedAddress( const std::vector>& seeds, const std::string& program_id); - static absl::optional FindProgramDerivedAddress( + static std::optional FindProgramDerivedAddress( const std::vector>& seeds, const std::string& program_id, uint8_t* bump_seed = nullptr); - static absl::optional GetAssociatedTokenAccount( + static std::optional GetAssociatedTokenAccount( const std::string& spl_token_mint_address, const std::string& wallet_address); - static absl::optional GetAssociatedMetadataAccount( + static std::optional GetAssociatedMetadataAccount( const std::string& token_mint_address); private: diff --git a/components/brave_wallet/browser/solana_message.cc b/components/brave_wallet/browser/solana_message.cc index b64420486ea..1027e597f63 100644 --- a/components/brave_wallet/browser/solana_message.cc +++ b/components/brave_wallet/browser/solana_message.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_wallet/browser/solana_message.h" #include +#include #include #include @@ -51,12 +52,12 @@ bool MaybeAddVersionPrefix(mojom::SolanaMessageVersion version, // Deserialize message header from a serialized message. // Returns the bytes_index after message header part, deserialized version and // message header. -absl::optional< +std::optional< std::tuple> DeserializeMessageHeader(const std::vector& bytes) { // Check version if (bytes.size() < 1) { - return absl::nullopt; + return std::nullopt; } mojom::SolanaMessageVersion version; if (bytes[0] == (bytes[0] & kVersionPrefixMask)) { @@ -64,12 +65,12 @@ DeserializeMessageHeader(const std::vector& bytes) { } else if (bytes[0] == kV0MessagePrefix) { version = mojom::SolanaMessageVersion::kV0; } else { - return absl::nullopt; + return std::nullopt; } size_t bytes_index = version == mojom::SolanaMessageVersion::kLegacy ? 0 : 1; if (bytes_index + 3 > bytes.size()) { // Message header length. - return absl::nullopt; + return std::nullopt; } // Message header @@ -81,14 +82,14 @@ DeserializeMessageHeader(const std::vector& bytes) { return std::make_tuple(bytes_index, version, message_header); } -absl::optional> +std::optional> DeserializeAddressTableLookups(const std::vector& bytes, size_t* bytes_index) { DCHECK(bytes_index); auto ret = CompactU16Decode(bytes, *bytes_index); if (!ret) { - return absl::nullopt; + return std::nullopt; } *bytes_index += std::get<1>(*ret); size_t num_of_addr_table_lookups = std::get<0>(*ret); @@ -98,7 +99,7 @@ DeserializeAddressTableLookups(const std::vector& bytes, auto addr_table_lookup = SolanaMessageAddressTableLookup::Deserialize(bytes, bytes_index); if (!addr_table_lookup) { - return absl::nullopt; + return std::nullopt; } addr_table_lookups.emplace_back(std::move(*addr_table_lookup)); } @@ -127,7 +128,7 @@ SolanaMessage::SolanaMessage( address_table_lookups_(std::move(address_table_lookups)) {} // static -absl::optional SolanaMessage::CreateLegacyMessage( +std::optional SolanaMessage::CreateLegacyMessage( const std::string& recent_blockhash, uint64_t last_valid_block_height, const std::string& fee_payer, @@ -140,12 +141,12 @@ absl::optional SolanaMessage::CreateLegacyMessage( std::vector static_accounts; for (const auto& meta : unique_account_metas) { if (meta.address_table_lookup_index) { // Not legacy. - return absl::nullopt; + return std::nullopt; } auto addr = SolanaAddress::FromBase58(meta.pubkey); if (!addr) { - return absl::nullopt; + return std::nullopt; } if (meta.is_signer) { @@ -162,7 +163,7 @@ absl::optional SolanaMessage::CreateLegacyMessage( num_readonly_signed_accounts > UINT8_MAX || num_readonly_unsigned_accounts > UINT8_MAX || static_accounts.size() == UINT8_MAX) { - return absl::nullopt; + return std::nullopt; } static_accounts.emplace_back(*addr); @@ -212,7 +213,7 @@ void SolanaMessage::GetUniqueAccountMetas( // Get accounts from each instruction. for (const auto& instruction : instructions) { account_metas.emplace_back( - SolanaAccountMeta(instruction.GetProgramId(), absl::nullopt, + SolanaAccountMeta(instruction.GetProgramId(), std::nullopt, false /* is_signer */, false /* is_writable */)); account_metas.insert(account_metas.end(), instruction.GetAccounts().begin(), instruction.GetAccounts().end()); @@ -237,7 +238,7 @@ void SolanaMessage::GetUniqueAccountMetas( // Fee payer will always be placed at first. unique_account_metas->push_back(SolanaAccountMeta( - fee_payer, absl::nullopt, true /* is_signer */, true /* is_writable */)); + fee_payer, std::nullopt, true /* is_signer */, true /* is_writable */)); // Remove duplicate accounts. is_writable is updated if later account meta // with the same pubkey is writable. @@ -259,11 +260,11 @@ void SolanaMessage::GetUniqueAccountMetas( // See // https://docs.solana.com/developing/programming-model/transactions#message-format // for details. -absl::optional> SolanaMessage::Serialize( +std::optional> SolanaMessage::Serialize( std::vector* signers) const { if (recent_blockhash_.empty() || instructions_.empty() || fee_payer_.empty()) { - return absl::nullopt; + return std::nullopt; } // Calculate read and write indexes size. @@ -273,7 +274,7 @@ absl::optional> SolanaMessage::Serialize( num_of_write_indexes += address_table_lookup.write_indexes().size(); num_of_read_indexes += address_table_lookup.read_indexes().size(); if (num_of_write_indexes > UINT8_MAX || num_of_read_indexes > UINT8_MAX) { - return absl::nullopt; + return std::nullopt; } } @@ -283,7 +284,7 @@ absl::optional> SolanaMessage::Serialize( // limited to UINT8_MAX. if ((static_account_keys_.size() + num_of_write_indexes + num_of_read_indexes) > UINT8_MAX) { - return absl::nullopt; + return std::nullopt; } if (signers) { @@ -293,7 +294,7 @@ absl::optional> SolanaMessage::Serialize( // Version prefix. std::vector message_bytes; if (!MaybeAddVersionPrefix(version_, &message_bytes)) { - return absl::nullopt; + return std::nullopt; } // Message header. @@ -317,7 +318,7 @@ absl::optional> SolanaMessage::Serialize( std::vector recent_blockhash_bytes(kSolanaBlockhashSize); if (!Base58Decode(recent_blockhash_, &recent_blockhash_bytes, recent_blockhash_bytes.size())) { - return absl::nullopt; + return std::nullopt; } message_bytes.insert(message_bytes.end(), recent_blockhash_bytes.begin(), recent_blockhash_bytes.end()); @@ -329,7 +330,7 @@ absl::optional> SolanaMessage::Serialize( instruction, static_account_keys_, address_table_lookups_, num_of_write_indexes); if (!compiled_instruction) { - return absl::nullopt; + return std::nullopt; } compiled_instruction->Serialize(&message_bytes); } @@ -345,12 +346,12 @@ absl::optional> SolanaMessage::Serialize( return message_bytes; } -absl::optional> +std::optional> SolanaMessage::GetSignerAccountsFromSerializedMessage( const std::vector& serialized_message) { auto tuple = DeserializeMessageHeader(serialized_message); if (!tuple) { - return absl::nullopt; + return std::nullopt; } size_t index = std::get<0>(*tuple); SolanaMessageHeader message_header = std::get<2>(*tuple); @@ -358,14 +359,14 @@ SolanaMessage::GetSignerAccountsFromSerializedMessage( // Consume length of account array. auto ret = CompactU16Decode(serialized_message, index); if (!ret) { - return absl::nullopt; + return std::nullopt; } index += std::get<1>(*ret); std::vector signers; for (size_t i = 0; i < message_header.num_required_signatures; ++i) { if (index + kSolanaPubkeySize > serialized_message.size()) { - return absl::nullopt; + return std::nullopt; } const std::vector address_bytes( @@ -379,11 +380,11 @@ SolanaMessage::GetSignerAccountsFromSerializedMessage( } // static -absl::optional SolanaMessage::Deserialize( +std::optional SolanaMessage::Deserialize( const std::vector& bytes) { auto tuple = DeserializeMessageHeader(bytes); if (!tuple) { - return absl::nullopt; + return std::nullopt; } size_t bytes_index = std::get<0>(*tuple); mojom::SolanaMessageVersion version = std::get<1>(*tuple); @@ -392,23 +393,23 @@ absl::optional SolanaMessage::Deserialize( // Compact array of account addresses auto ret = CompactU16Decode(bytes, bytes_index); if (!ret) { - return absl::nullopt; + return std::nullopt; } const uint16_t num_of_accounts = std::get<0>(*ret); if (num_of_accounts == 0 || num_of_accounts > UINT8_MAX) { - return absl::nullopt; + return std::nullopt; } bytes_index += std::get<1>(*ret); std::vector accounts; for (size_t i = 0; i < num_of_accounts; ++i) { if (bytes_index + kSolanaPubkeySize > bytes.size()) { - return absl::nullopt; + return std::nullopt; } auto account_key = SolanaAddress::FromBytes( base::make_span(bytes).subspan(bytes_index, kSolanaPubkeySize)); if (!account_key) { - return absl::nullopt; + return std::nullopt; } accounts.emplace_back(*account_key); bytes_index += kSolanaPubkeySize; @@ -417,7 +418,7 @@ absl::optional SolanaMessage::Deserialize( // Blockhash if (bytes_index + kSolanaBlockhashSize > bytes.size()) { - return absl::nullopt; + return std::nullopt; } const std::vector blockhash_bytes( bytes.begin() + bytes_index, @@ -428,7 +429,7 @@ absl::optional SolanaMessage::Deserialize( // Instructions length ret = CompactU16Decode(bytes, bytes_index); if (!ret) { - return absl::nullopt; + return std::nullopt; } bytes_index += std::get<1>(*ret); size_t num_of_instructions = std::get<0>(*ret); @@ -438,23 +439,23 @@ absl::optional SolanaMessage::Deserialize( auto compiled_instruction = SolanaCompiledInstruction::Deserialize(bytes, &bytes_index); if (!compiled_instruction) { - return absl::nullopt; + return std::nullopt; } compiled_instructions.emplace_back(std::move(*compiled_instruction)); } - absl::optional> + std::optional> addr_table_lookups = std::vector(); if (version == mojom::SolanaMessageVersion::kV0) { addr_table_lookups = DeserializeAddressTableLookups(bytes, &bytes_index); if (!addr_table_lookups) { - return absl::nullopt; + return std::nullopt; } } // Byte array needs to be exact without any left over bytes. if (bytes_index != bytes.size()) { - return absl::nullopt; + return std::nullopt; } // Size of combined array of static_accounts_array, write_indexes_array, @@ -465,12 +466,12 @@ absl::optional SolanaMessage::Deserialize( num_of_write_indexes += addr_table_lookup.write_indexes().size(); num_of_read_indexes += addr_table_lookup.read_indexes().size(); if (num_of_write_indexes > UINT8_MAX || num_of_read_indexes > UINT8_MAX) { - return absl::nullopt; + return std::nullopt; } } if ((accounts.size() + num_of_write_indexes + num_of_read_indexes) > UINT8_MAX) { - return absl::nullopt; + return std::nullopt; } // Convert compiled_instructions to instructions. @@ -480,7 +481,7 @@ absl::optional SolanaMessage::Deserialize( compiled_instruction, message_header, accounts, *addr_table_lookups, num_of_write_indexes, num_of_read_indexes); if (!ins) { - return absl::nullopt; + return std::nullopt; } instructions.emplace_back(std::move(*ins)); } @@ -547,17 +548,17 @@ base::Value::Dict SolanaMessage::ToValue() const { } // static -absl::optional SolanaMessage::FromValue( +std::optional SolanaMessage::FromValue( const base::Value::Dict& value) { auto version = value.FindInt(kVersion); if (!version || !mojom::IsKnownEnumValue( static_cast(*version))) { - return absl::nullopt; + return std::nullopt; } const std::string* recent_blockhash = value.FindString(kRecentBlockhash); if (!recent_blockhash) { - return absl::nullopt; + return std::nullopt; } const std::string* last_valid_block_height_string = @@ -566,55 +567,55 @@ absl::optional SolanaMessage::FromValue( if (!last_valid_block_height_string || !base::StringToUint64(*last_valid_block_height_string, &last_valid_block_height)) { - return absl::nullopt; + return std::nullopt; } const std::string* fee_payer = value.FindString(kFeePayer); if (!fee_payer) { - return absl::nullopt; + return std::nullopt; } const base::Value::Dict* message_header_dict = value.FindDict(kMessageHeader); if (!message_header_dict) { - return absl::nullopt; + return std::nullopt; } auto message_header = SolanaMessageHeader::FromValue(*message_header_dict); if (!message_header) { - return absl::nullopt; + return std::nullopt; } const base::Value::List* static_account_key_list = value.FindList(kStaticAccountKeys); if (!static_account_key_list) { - return absl::nullopt; + return std::nullopt; } std::vector static_account_keys; for (const auto& static_account_key_value : *static_account_key_list) { if (!static_account_key_value.is_string()) { - return absl::nullopt; + return std::nullopt; } auto address = SolanaAddress::FromBase58(static_account_key_value.GetString()); if (!address) { - return absl::nullopt; + return std::nullopt; } static_account_keys.emplace_back(*address); } const base::Value::List* instruction_list = value.FindList(kInstructions); if (!instruction_list) { - return absl::nullopt; + return std::nullopt; } std::vector instructions; for (const auto& instruction_value : *instruction_list) { if (!instruction_value.is_dict()) { - return absl::nullopt; + return std::nullopt; } - absl::optional instruction = + std::optional instruction = SolanaInstruction::FromValue(instruction_value.GetDict()); if (!instruction) { - return absl::nullopt; + return std::nullopt; } instructions.emplace_back(std::move(instruction.value())); } @@ -622,19 +623,19 @@ absl::optional SolanaMessage::FromValue( const base::Value::List* address_table_lookup_list = value.FindList(kAddressTableLookups); if (!address_table_lookup_list) { - return absl::nullopt; + return std::nullopt; } std::vector address_table_lookups; for (const auto& address_table_lookup_value : *address_table_lookup_list) { if (!address_table_lookup_value.is_dict()) { - return absl::nullopt; + return std::nullopt; } - absl::optional address_table_lookup = + std::optional address_table_lookup = SolanaMessageAddressTableLookup::FromValue( address_table_lookup_value.GetDict()); if (!address_table_lookup) { - return absl::nullopt; + return std::nullopt; } address_table_lookups.emplace_back(std::move(address_table_lookup.value())); } @@ -647,11 +648,11 @@ absl::optional SolanaMessage::FromValue( } // static -absl::optional SolanaMessage::FromDeprecatedLegacyValue( +std::optional SolanaMessage::FromDeprecatedLegacyValue( const base::Value::Dict& value) { const std::string* recent_blockhash = value.FindString(kRecentBlockhash); if (!recent_blockhash) { - return absl::nullopt; + return std::nullopt; } const std::string* last_valid_block_height_string = @@ -660,28 +661,28 @@ absl::optional SolanaMessage::FromDeprecatedLegacyValue( if (!last_valid_block_height_string || !base::StringToUint64(*last_valid_block_height_string, &last_valid_block_height)) { - return absl::nullopt; + return std::nullopt; } const std::string* fee_payer = value.FindString(kFeePayer); if (!fee_payer) { - return absl::nullopt; + return std::nullopt; } const base::Value::List* instruction_list = value.FindList(kInstructions); if (!instruction_list) { - return absl::nullopt; + return std::nullopt; } std::vector instructions; for (const auto& instruction_value : *instruction_list) { if (!instruction_value.is_dict()) { - return absl::nullopt; + return std::nullopt; } - absl::optional instruction = + std::optional instruction = SolanaInstruction::FromValue(instruction_value.GetDict()); if (!instruction) { - return absl::nullopt; + return std::nullopt; } instructions.emplace_back(std::move(instruction.value())); } diff --git a/components/brave_wallet/browser/solana_message.h b/components/brave_wallet/browser/solana_message.h index 3ccb16b6c0d..1647f13025a 100644 --- a/components/brave_wallet/browser/solana_message.h +++ b/components/brave_wallet/browser/solana_message.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_SOLANA_MESSAGE_H_ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_SOLANA_MESSAGE_H_ +#include #include #include #include @@ -15,7 +16,6 @@ #include "brave/components/brave_wallet/browser/solana_message_address_table_lookup.h" #include "brave/components/brave_wallet/browser/solana_message_header.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace base { class Value; @@ -41,18 +41,18 @@ class SolanaMessage { ~SolanaMessage(); bool operator==(const SolanaMessage&) const; - static absl::optional CreateLegacyMessage( + static std::optional CreateLegacyMessage( const std::string& recent_blockhash, uint64_t last_valid_block_height, const std::string& fee_payer, std::vector&& instructions); - absl::optional> Serialize( + std::optional> Serialize( std::vector* signers) const; - static absl::optional Deserialize( + static std::optional Deserialize( const std::vector& bytes); - static absl::optional> + static std::optional> GetSignerAccountsFromSerializedMessage( const std::vector& serialized_message); @@ -70,9 +70,8 @@ class SolanaMessage { mojom::SolanaTxDataPtr ToSolanaTxData() const; base::Value::Dict ToValue() const; - static absl::optional FromValue( - const base::Value::Dict& value); - static absl::optional FromDeprecatedLegacyValue( + static std::optional FromValue(const base::Value::Dict& value); + static std::optional FromDeprecatedLegacyValue( const base::Value::Dict& value); void SetInstructionsForTesting( diff --git a/components/brave_wallet/browser/solana_message_address_table_lookup.cc b/components/brave_wallet/browser/solana_message_address_table_lookup.cc index 5e7b1fcd0ca..20165914b7e 100644 --- a/components/brave_wallet/browser/solana_message_address_table_lookup.cc +++ b/components/brave_wallet/browser/solana_message_address_table_lookup.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_wallet/browser/solana_message_address_table_lookup.h" +#include + #include "base/base64.h" #include "brave/components/brave_wallet/common/brave_wallet_constants.h" #include "brave/components/brave_wallet/common/solana_utils.h" @@ -15,12 +17,12 @@ constexpr char kAccountKey[] = "account_key"; constexpr char kBase64EncodedWriteIndexes[] = "base64_encoded_write_indexes"; constexpr char kBase64EncodedReadIndexes[] = "base64_encoded_read_indexes"; -absl::optional> GetIndexesFromBase64EncodedStringDict( +std::optional> GetIndexesFromBase64EncodedStringDict( const base::Value::Dict& value, const std::string& dict_key) { const std::string* base64_encoded_indexes = value.FindString(dict_key); if (!base64_encoded_indexes) { - return absl::nullopt; + return std::nullopt; } return base::Base64Decode(*base64_encoded_indexes); } @@ -65,33 +67,33 @@ void SolanaMessageAddressTableLookup::Serialize( } // static -absl::optional +std::optional SolanaMessageAddressTableLookup::Deserialize(const std::vector& bytes, size_t* bytes_index) { DCHECK(bytes_index); if (*bytes_index >= bytes.size()) { - return absl::nullopt; + return std::nullopt; } // Account key. if (*bytes_index + kSolanaPubkeySize > bytes.size()) { - return absl::nullopt; + return std::nullopt; } auto account_key = SolanaAddress::FromBytes( base::make_span(bytes).subspan(*bytes_index, kSolanaPubkeySize)); if (!account_key) { - return absl::nullopt; + return std::nullopt; } *bytes_index += kSolanaPubkeySize; auto write_indexes = CompactArrayDecode(bytes, bytes_index); if (!write_indexes || write_indexes->size() > UINT8_MAX) { - return absl::nullopt; + return std::nullopt; } auto read_indexes = CompactArrayDecode(bytes, bytes_index); if (!read_indexes || read_indexes->size() > UINT8_MAX) { - return absl::nullopt; + return std::nullopt; } return SolanaMessageAddressTableLookup(*account_key, *write_indexes, @@ -107,27 +109,27 @@ base::Value::Dict SolanaMessageAddressTableLookup::ToValue() const { } // static -absl::optional +std::optional SolanaMessageAddressTableLookup::FromValue(const base::Value::Dict& value) { const std::string* account_key_str = value.FindString(kAccountKey); if (!account_key_str) { - return absl::nullopt; + return std::nullopt; } auto account_key = SolanaAddress::FromBase58(*account_key_str); if (!account_key) { - return absl::nullopt; + return std::nullopt; } auto write_indexes = GetIndexesFromBase64EncodedStringDict(value, kBase64EncodedWriteIndexes); if (!write_indexes) { - return absl::nullopt; + return std::nullopt; } auto read_indexes = GetIndexesFromBase64EncodedStringDict(value, kBase64EncodedReadIndexes); if (!read_indexes) { - return absl::nullopt; + return std::nullopt; } return SolanaMessageAddressTableLookup(*account_key, *write_indexes, @@ -148,7 +150,7 @@ SolanaMessageAddressTableLookup::ToMojomArray( } // static -absl::optional> +std::optional> SolanaMessageAddressTableLookup::FromMojomArray( const std::vector& mojom_lookups) { @@ -156,7 +158,7 @@ SolanaMessageAddressTableLookup::FromMojomArray( for (const auto& mojom_lookup : mojom_lookups) { auto account_key = SolanaAddress::FromBase58(mojom_lookup->account_key); if (!account_key) { - return absl::nullopt; + return std::nullopt; } ret_arr.emplace_back(SolanaMessageAddressTableLookup( *account_key, mojom_lookup->write_indexes, mojom_lookup->read_indexes)); diff --git a/components/brave_wallet/browser/solana_message_address_table_lookup.h b/components/brave_wallet/browser/solana_message_address_table_lookup.h index 19d89953646..14933240778 100644 --- a/components/brave_wallet/browser/solana_message_address_table_lookup.h +++ b/components/brave_wallet/browser/solana_message_address_table_lookup.h @@ -6,13 +6,13 @@ #ifndef BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_SOLANA_MESSAGE_ADDRESS_TABLE_LOOKUP_H_ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_SOLANA_MESSAGE_ADDRESS_TABLE_LOOKUP_H_ +#include #include #include #include "base/values.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" #include "brave/components/brave_wallet/common/solana_address.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_wallet { @@ -36,17 +36,17 @@ class SolanaMessageAddressTableLookup { bool operator==(const SolanaMessageAddressTableLookup&) const; void Serialize(std::vector* bytes) const; - static absl::optional Deserialize( + static std::optional Deserialize( const std::vector& bytes, size_t* bytes_index); base::Value::Dict ToValue() const; - static absl::optional FromValue( + static std::optional FromValue( const base::Value::Dict& value); static std::vector ToMojomArray( const std::vector& address_table_lookups); - static absl::optional> + static std::optional> FromMojomArray(const std::vector& mojom_lookups); diff --git a/components/brave_wallet/browser/solana_message_header.cc b/components/brave_wallet/browser/solana_message_header.cc index 05acc2be11d..7125c819b05 100644 --- a/components/brave_wallet/browser/solana_message_header.cc +++ b/components/brave_wallet/browser/solana_message_header.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_wallet/browser/solana_message_header.h" +#include + #include "base/strings/string_number_conversions.h" #include "brave/components/brave_wallet/common/solana_utils.h" @@ -45,24 +47,24 @@ base::Value::Dict SolanaMessageHeader::ToValue() const { } // static -absl::optional SolanaMessageHeader::FromValue( +std::optional SolanaMessageHeader::FromValue( const base::Value::Dict& value) { auto num_required_signatures = GetUint8FromStringDict(value, kNumRequiredSignatures); if (!num_required_signatures) { - return absl::nullopt; + return std::nullopt; } auto num_readonly_signed_accounts = GetUint8FromStringDict(value, kNumReadonlySignedAccounts); if (!num_readonly_signed_accounts) { - return absl::nullopt; + return std::nullopt; } auto num_readonly_unsigned_accounts = GetUint8FromStringDict(value, kNumReadonlyUnsignedAccounts); if (!num_readonly_unsigned_accounts) { - return absl::nullopt; + return std::nullopt; } return SolanaMessageHeader(*num_required_signatures, diff --git a/components/brave_wallet/browser/solana_message_header.h b/components/brave_wallet/browser/solana_message_header.h index 0b97b1d7b83..c2802c37d0d 100644 --- a/components/brave_wallet/browser/solana_message_header.h +++ b/components/brave_wallet/browser/solana_message_header.h @@ -7,10 +7,10 @@ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_SOLANA_MESSAGE_HEADER_H_ #include +#include #include "base/values.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_wallet { @@ -24,7 +24,7 @@ struct SolanaMessageHeader { bool operator==(const SolanaMessageHeader&) const; base::Value::Dict ToValue() const; - static absl::optional FromValue( + static std::optional FromValue( const base::Value::Dict& value); mojom::SolanaMessageHeaderPtr ToMojom() const; static SolanaMessageHeader FromMojom( diff --git a/components/brave_wallet/browser/solana_message_unittest.cc b/components/brave_wallet/browser/solana_message_unittest.cc index cc6fa7eb844..232294ca7ab 100644 --- a/components/brave_wallet/browser/solana_message_unittest.cc +++ b/components/brave_wallet/browser/solana_message_unittest.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/solana_message.h" +#include #include #include @@ -33,8 +34,8 @@ SolanaMessage GetTestLegacyMessage() { // Program ID mojom::kSolanaSystemProgramId, // Accounts - {SolanaAccountMeta(kFromAccount, absl::nullopt, true, true), - SolanaAccountMeta(kToAccount, absl::nullopt, false, true)}, + {SolanaAccountMeta(kFromAccount, std::nullopt, true, true), + SolanaAccountMeta(kToAccount, std::nullopt, false, true)}, data); auto message = SolanaMessage::CreateLegacyMessage( kRecentBlockhash, kLastValidBlockHeight, kFromAccount, {instruction}); @@ -47,7 +48,7 @@ SolanaMessage GetTestV0Message() { {3, 1}, {2, 4}); SolanaInstruction instruction( mojom::kSolanaSystemProgramId, - {SolanaAccountMeta(kFromAccount, absl::nullopt, true, true), + {SolanaAccountMeta(kFromAccount, std::nullopt, true, true), SolanaAccountMeta(kToAccount, 1, false, true)}, data); std::vector lookups; @@ -175,8 +176,8 @@ TEST(SolanaMessageUnitTest, SerializeDeserialize) { // Program ID mojom::kSolanaSystemProgramId, // Accounts - {SolanaAccountMeta(kFromAccount, absl::nullopt, true, true), - SolanaAccountMeta(kToAccount, absl::nullopt, false, true)}, + {SolanaAccountMeta(kFromAccount, std::nullopt, true, true), + SolanaAccountMeta(kToAccount, std::nullopt, false, true)}, // Data {2, 0, 0, 0, 128, 150, 152, 0, 0, 0, 0, 0}); auto message_without_blockhash = @@ -188,9 +189,9 @@ TEST(SolanaMessageUnitTest, SerializeDeserialize) { TEST(SolanaMessageUnitTest, GetSignerAccountsFromSerializedMessageLegacy) { SolanaInstruction ins( mojom::kSolanaSystemProgramId, - {SolanaAccountMeta(kFromAccount, absl::nullopt, true, true), - SolanaAccountMeta(kToAccount, absl::nullopt, true, true), - SolanaAccountMeta(kTestAccount, absl::nullopt, false, true)}, + {SolanaAccountMeta(kFromAccount, std::nullopt, true, true), + SolanaAccountMeta(kToAccount, std::nullopt, true, true), + SolanaAccountMeta(kTestAccount, std::nullopt, false, true)}, {}); auto msg = SolanaMessage::CreateLegacyMessage(kRecentBlockhash, 0, kFromAccount, {ins}); @@ -280,12 +281,12 @@ TEST(SolanaMessageUnitTest, GetUniqueAccountMetas) { std::string account4 = "GcdayuLaLyrdmUu324nahyv33G5poQdLUEZ1nEytDeP"; std::string account5 = "LX3EUdRUBUa3TbsYXLEUdj9J3prXkWXvLYSWyYyc2Jj"; - SolanaAccountMeta account1_fee_payer(account1, absl::nullopt, true, true); - SolanaAccountMeta program1_non_signer_readonly(program1, absl::nullopt, false, + SolanaAccountMeta account1_fee_payer(account1, std::nullopt, true, true); + SolanaAccountMeta program1_non_signer_readonly(program1, std::nullopt, false, false); // Test instructions with duplicate pubkeys. - SolanaAccountMeta account2_non_signer_readonly(account2, absl::nullopt, false, + SolanaAccountMeta account2_non_signer_readonly(account2, std::nullopt, false, false); SolanaInstruction instruction1(program1, {account2_non_signer_readonly}, {}); SolanaMessage::GetUniqueAccountMetas(account1, {instruction1, instruction1}, @@ -299,13 +300,13 @@ TEST(SolanaMessageUnitTest, GetUniqueAccountMetas) { // Test account order. // signer-read-write -> signer-readonly -> non-signer-read-write -> // non-signer-readonly - SolanaAccountMeta account3_non_signer_read_write(account3, absl::nullopt, + SolanaAccountMeta account3_non_signer_read_write(account3, std::nullopt, false, true); - SolanaAccountMeta account4_signer_readonly(account4, absl::nullopt, true, + SolanaAccountMeta account4_signer_readonly(account4, std::nullopt, true, false); - SolanaAccountMeta account5_signer_read_write(account5, absl::nullopt, true, + SolanaAccountMeta account5_signer_read_write(account5, std::nullopt, true, true); - SolanaAccountMeta program2_non_signer_readonly(program2, absl::nullopt, false, + SolanaAccountMeta program2_non_signer_readonly(program2, std::nullopt, false, false); SolanaInstruction instruction2( program1, {account3_non_signer_read_write, account4_signer_readonly}, {}); @@ -322,15 +323,15 @@ TEST(SolanaMessageUnitTest, GetUniqueAccountMetas) { // Test writable being updated when readonly and read-write both present for // the same account pubkey. - SolanaAccountMeta account2_signer_read_write(account2, absl::nullopt, true, + SolanaAccountMeta account2_signer_read_write(account2, std::nullopt, true, true); - SolanaAccountMeta account3_non_signer_readonly(account3, absl::nullopt, false, + SolanaAccountMeta account3_non_signer_readonly(account3, std::nullopt, false, false); - SolanaAccountMeta account4_non_signer_read_write(account4, absl::nullopt, + SolanaAccountMeta account4_non_signer_read_write(account4, std::nullopt, false, true); - SolanaAccountMeta account4_signer_read_write(account4, absl::nullopt, true, + SolanaAccountMeta account4_signer_read_write(account4, std::nullopt, true, true); - SolanaAccountMeta account5_signer_readonly(account5, absl::nullopt, true, + SolanaAccountMeta account5_signer_readonly(account5, std::nullopt, true, false); instruction1 = SolanaInstruction( @@ -494,7 +495,7 @@ TEST(SolanaMessageUnitTest, FromToValue) { R"({"fee_payer": "fee payer", "instructions": []})"}; for (const auto& invalid_value_string : invalid_value_strings) { - absl::optional invalid_value = + std::optional invalid_value = base::JSONReader::Read(invalid_value_string); ASSERT_TRUE(invalid_value) << ":" << invalid_value_string; EXPECT_FALSE(SolanaMessage::FromValue(invalid_value->GetDict())) diff --git a/components/brave_wallet/browser/solana_provider_impl.cc b/components/brave_wallet/browser/solana_provider_impl.cc index 236cc8dcdae..2133e33bd39 100644 --- a/components/brave_wallet/browser/solana_provider_impl.cc +++ b/components/brave_wallet/browser/solana_provider_impl.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/solana_provider_impl.h" +#include #include #include "base/notreached.h" @@ -72,7 +73,7 @@ void SolanaProviderImpl::Init( } } -void SolanaProviderImpl::Connect(absl::optional arg, +void SolanaProviderImpl::Connect(std::optional arg, ConnectCallback callback) { DCHECK(delegate_); if (delegate_->IsPermissionDenied(mojom::CoinType::SOL)) { @@ -187,18 +188,18 @@ void SolanaProviderImpl::GetPublicKey(GetPublicKeyCallback callback) { } } -absl::optional>> +std::optional>> SolanaProviderImpl::GetDeserializedMessage( const std::string& encoded_serialized_msg) { std::vector message_bytes; if (!Base58Decode(encoded_serialized_msg, &message_bytes, kSolanaMaxTxSize, false)) { - return absl::nullopt; + return std::nullopt; } auto msg = SolanaMessage::Deserialize(message_bytes); if (!msg) { - return absl::nullopt; + return std::nullopt; } // Note: We cannot check Base58Encode(msg->Serialize()) is equal to the @@ -244,12 +245,12 @@ void SolanaProviderImpl::SignTransaction( &SolanaProviderImpl::ContinueSignTransaction, weak_factory_.GetWeakPtr(), std::move(msg_pair), std::move(param), account.Clone(), chain_id, std::move(callback)); - json_rpc_service_->IsSolanaBlockhashValid(chain_id, blockhash, absl::nullopt, + json_rpc_service_->IsSolanaBlockhashValid(chain_id, blockhash, std::nullopt, std::move(internal_callback)); } void SolanaProviderImpl::ContinueSignTransaction( - absl::optional>> msg_pair, + std::optional>> msg_pair, mojom::SolanaSignTransactionParamPtr param, const mojom::AccountInfoPtr& account, const std::string& chain_id, @@ -288,7 +289,7 @@ void SolanaProviderImpl::OnSignTransactionRequestProcessed( SignTransactionCallback callback, bool approved, mojom::ByteArrayStringUnionPtr signature, - const absl::optional& error) { + const std::optional& error) { if (error && !error->empty()) { std::move(callback).Run(mojom::SolanaProviderError::kInternalError, *error, std::vector(), @@ -304,7 +305,7 @@ void SolanaProviderImpl::OnSignTransactionRequestProcessed( return; } - absl::optional> signed_tx; + std::optional> signed_tx; if (account->account_id->kind != mojom::AccountKind::kHardware) { signed_tx = tx->GetSignedTransactionBytes(keyring_service_); } else if (signature && signature->is_bytes()) { // hardware @@ -382,7 +383,7 @@ void SolanaProviderImpl::SignAllTransactions( std::move(callback))); for (const auto& blockhash : blockhashs) { json_rpc_service_->IsSolanaBlockhashValid( - chain_id, blockhash, absl::nullopt, + chain_id, blockhash, std::nullopt, base::BindOnce( [](base::OnceCallback barrier_callback, bool is_valid, mojom::SolanaProviderError error, @@ -431,8 +432,8 @@ void SolanaProviderImpl::OnSignAllTransactionsRequestProcessed( mojom::AccountInfoPtr account, SignAllTransactionsCallback callback, bool approved, - absl::optional> signatures, - const absl::optional& error) { + std::optional> signatures, + const std::optional& error) { if (error && !error->empty()) { std::move(callback).Run(mojom::SolanaProviderError::kInternalError, *error, std::vector>(), @@ -463,7 +464,7 @@ void SolanaProviderImpl::OnSignAllTransactionsRequestProcessed( std::vector> signed_txs; std::vector versions; for (size_t i = 0; i < txs.size(); ++i) { - absl::optional> signed_tx; + std::optional> signed_tx; if (!is_hardware_account) { signed_tx = txs[i]->GetSignedTransactionBytes(keyring_service_); } else if (signatures->at(i) && signatures->at(i)->is_bytes()) { @@ -490,7 +491,7 @@ void SolanaProviderImpl::OnSignAllTransactionsRequestProcessed( void SolanaProviderImpl::SignAndSendTransaction( mojom::SolanaSignTransactionParamPtr param, - absl::optional send_options, + std::optional send_options, SignAndSendTransactionCallback callback) { auto account = keyring_service_->GetSelectedSolanaDappAccount(); if (!account) { @@ -602,7 +603,7 @@ void SolanaProviderImpl::OnContentSettingChanged( void SolanaProviderImpl::SignMessage( const std::vector& blob_msg, - const absl::optional& display_encoding, + const std::optional& display_encoding, SignMessageCallback callback) { auto account = keyring_service_->GetSelectedSolanaDappAccount(); if (!account) { @@ -669,7 +670,7 @@ void SolanaProviderImpl::Request(base::Value::Dict arg, } if (*method == solana::kConnect) { - absl::optional option = absl::nullopt; + std::optional option = std::nullopt; if (params) { option = std::move(*params); } @@ -704,7 +705,7 @@ void SolanaProviderImpl::Request(base::Value::Dict arg, return; } base::Value::Dict* options_dict = params->FindDict(kOptions); - absl::optional options = absl::nullopt; + std::optional options = std::nullopt; if (options_dict) { options = std::move(*options_dict); } @@ -745,7 +746,7 @@ void SolanaProviderImpl::Request(base::Value::Dict arg, return; } const std::string* display_str = params->FindString("display"); - absl::optional display = absl::nullopt; + std::optional display = std::nullopt; if (display_str) { display = *display_str; } @@ -766,7 +767,7 @@ void SolanaProviderImpl::OnConnect( const std::vector& requested_accounts, ConnectCallback callback, RequestPermissionsError error, - const absl::optional>& allowed_accounts) { + const std::optional>& allowed_accounts) { if (error == RequestPermissionsError::kInternal) { std::move(callback).Run(mojom::SolanaProviderError::kInternalError, l10n_util::GetStringUTF8(IDS_WALLET_INTERNAL_ERROR), @@ -817,7 +818,7 @@ void SolanaProviderImpl::OnSignMessageRequestProcessed( SignMessageCallback callback, bool approved, mojom::ByteArrayStringUnionPtr signature, - const absl::optional& error) { + const std::optional& error) { base::Value::Dict result; if (error && !error->empty()) { std::move(callback).Run(mojom::SolanaProviderError::kInternalError, *error, @@ -833,7 +834,7 @@ void SolanaProviderImpl::OnSignMessageRequestProcessed( return; } - absl::optional> sig_bytes; + std::optional> sig_bytes; if (account->account_id->kind != mojom::AccountKind::kHardware) { sig_bytes = keyring_service_->SignMessageBySolanaKeyring( *account->account_id, blob_msg); @@ -923,7 +924,7 @@ void SolanaProviderImpl::SelectedDappAccountChanged( if (account && IsAccountConnected(*account)) { events_listener_->AccountChangedEvent(account->address); } else { - events_listener_->AccountChangedEvent(absl::nullopt); + events_listener_->AccountChangedEvent(std::nullopt); } } diff --git a/components/brave_wallet/browser/solana_provider_impl.h b/components/brave_wallet/browser/solana_provider_impl.h index cb575c5faea..5ff297f7b68 100644 --- a/components/brave_wallet/browser/solana_provider_impl.h +++ b/components/brave_wallet/browser/solana_provider_impl.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_SOLANA_PROVIDER_IMPL_H_ #include +#include #include #include #include @@ -22,7 +23,6 @@ #include "mojo/public/cpp/bindings/pending_remote.h" #include "mojo/public/cpp/bindings/receiver.h" #include "mojo/public/cpp/bindings/remote.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_wallet { @@ -53,7 +53,7 @@ class SolanaProviderImpl final : public mojom::SolanaProvider, void Init(mojo::PendingRemote events_listener) override; - void Connect(absl::optional arg, + void Connect(std::optional arg, ConnectCallback callback) override; void Disconnect() override; void IsConnected(IsConnectedCallback callback) override; @@ -64,10 +64,10 @@ class SolanaProviderImpl final : public mojom::SolanaProvider, std::vector params, SignAllTransactionsCallback callback) override; void SignAndSendTransaction(mojom::SolanaSignTransactionParamPtr param, - absl::optional send_options, + std::optional send_options, SignAndSendTransactionCallback callback) override; void SignMessage(const std::vector& blob_msg, - const absl::optional& display_encoding, + const std::optional& display_encoding, SignMessageCallback callback) override; void Request(base::Value::Dict arg, RequestCallback callback) override; @@ -81,16 +81,16 @@ class SolanaProviderImpl final : public mojom::SolanaProvider, const std::vector& requested_accounts, ConnectCallback callback, RequestPermissionsError error, - const absl::optional>& allowed_accounts); + const std::optional>& allowed_accounts); void OnSignMessageRequestProcessed(const std::vector& blob_msg, const mojom::AccountInfoPtr& account, SignMessageCallback callback, bool approved, mojom::ByteArrayStringUnionPtr signature, - const absl::optional& error); + const std::optional& error); void ContinueSignTransaction( - absl::optional>> msg_pair, + std::optional>> msg_pair, mojom::SolanaSignTransactionParamPtr param, const mojom::AccountInfoPtr& account, const std::string& chain_id, @@ -104,7 +104,7 @@ class SolanaProviderImpl final : public mojom::SolanaProvider, SignTransactionCallback callback, bool approved, mojom::ByteArrayStringUnionPtr signature, - const absl::optional& error); + const std::optional& error); void ContinueSignAllTransactions( std::vector tx_datas, std::vector> txs, @@ -118,15 +118,15 @@ class SolanaProviderImpl final : public mojom::SolanaProvider, mojom::AccountInfoPtr account, SignAllTransactionsCallback callback, bool approved, - absl::optional> signatures, - const absl::optional& error); + std::optional> signatures, + const std::optional& error); void OnAddUnapprovedTransaction(SignAndSendTransactionCallback callback, bool success, const std::string& tx_meta_id, const std::string& error_message); // Returns a pair of SolanaMessage and a raw message byte array. - absl::optional>> + std::optional>> GetDeserializedMessage(const std::string& encoded_serialized_msg); void OnRequestConnect(RequestCallback callback, @@ -165,7 +165,7 @@ class SolanaProviderImpl final : public mojom::SolanaProvider, sign_and_send_tx_callbacks_; // Pending callback and arg are for waiting user unlock before connect ConnectCallback pending_connect_callback_; - absl::optional pending_connect_arg_; + std::optional pending_connect_arg_; const raw_ref host_content_settings_map_; bool account_creation_shown_ = false; diff --git a/components/brave_wallet/browser/solana_requests.cc b/components/brave_wallet/browser/solana_requests.cc index fcc5368b343..e6b89ea8f4d 100644 --- a/components/brave_wallet/browser/solana_requests.cc +++ b/components/brave_wallet/browser/solana_requests.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/solana_requests.h" +#include #include #include "base/strings/string_number_conversions.h" @@ -26,7 +27,7 @@ std::string getTokenAccountBalance(const std::string& pubkey) { std::string sendTransaction( const std::string& signed_tx, - absl::optional options) { + std::optional options) { base::Value::List params; params.Append(signed_tx); @@ -127,7 +128,7 @@ std::string getTokenAccountsByOwner(const std::string& pubkey, } std::string isBlockhashValid(const std::string& blockhash, - const absl::optional& commitment) { + const std::optional& commitment) { CHECK(!commitment || IsValidCommitmentString(*commitment)); base::Value::List params; params.Append(blockhash); diff --git a/components/brave_wallet/browser/solana_requests.h b/components/brave_wallet/browser/solana_requests.h index cdbcc98500a..5ddc8b7fdf0 100644 --- a/components/brave_wallet/browser/solana_requests.h +++ b/components/brave_wallet/browser/solana_requests.h @@ -6,11 +6,11 @@ #ifndef BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_SOLANA_REQUESTS_H_ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_SOLANA_REQUESTS_H_ +#include #include #include #include "brave/components/brave_wallet/browser/solana_transaction.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_wallet { @@ -20,7 +20,7 @@ std::string getBalance(const std::string& pubkey); std::string getTokenAccountBalance(const std::string& pubkey); std::string sendTransaction( const std::string& signed_tx, - absl::optional options); + std::optional options); std::string getLatestBlockhash(); std::string getSignatureStatuses(const std::vector& tx_signatures); std::string getAccountInfo(const std::string& pubkey); @@ -29,7 +29,7 @@ std::string getBlockHeight(); std::string getTokenAccountsByOwner(const std::string& pubkey, const std::string& encoding); std::string isBlockhashValid(const std::string& blockhash, - const absl::optional& commitment); + const std::optional& commitment); } // namespace solana diff --git a/components/brave_wallet/browser/solana_requests_unittest.cc b/components/brave_wallet/browser/solana_requests_unittest.cc index 53c922231af..4e371d167f5 100644 --- a/components/brave_wallet/browser/solana_requests_unittest.cc +++ b/components/brave_wallet/browser/solana_requests_unittest.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_wallet/browser/solana_requests.h" +#include + #include "base/json/json_reader.h" #include "base/strings/stringprintf.h" #include "base/test/gtest_util.h" @@ -35,7 +37,7 @@ TEST(SolanaRequestsUnitTest, getTokenAccountBalance) { TEST(SolanaRequestsUnitTest, sendTransaction) { ASSERT_EQ( - sendTransaction("signed_tx", absl::nullopt), + sendTransaction("signed_tx", std::nullopt), R"({"id":1,"jsonrpc":"2.0","method":"sendTransaction","params":["signed_tx",{"encoding":"base64"}]})"); std::string expected_json_string = R"( @@ -146,7 +148,7 @@ TEST(SolanaRequestsUnitTest, getTokenAccountsByOwner) { TEST(SolanaRequestsUnitTest, isBlockhashValid) { EXPECT_EQ( - base::test::ParseJsonDict(isBlockhashValid(kBlockhash, absl::nullopt)), + base::test::ParseJsonDict(isBlockhashValid(kBlockhash, std::nullopt)), base::test::ParseJsonDict( R"({"id": 1, "jsonrpc": "2.0", diff --git a/components/brave_wallet/browser/solana_response_parser.cc b/components/brave_wallet/browser/solana_response_parser.cc index 12f12717cd5..93f14398b36 100644 --- a/components/brave_wallet/browser/solana_response_parser.cc +++ b/components/brave_wallet/browser/solana_response_parser.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_wallet/browser/solana_response_parser.h" #include +#include #include #include "base/base64.h" @@ -109,41 +110,41 @@ bool ParseGetTokenAccountBalance(const base::Value& json_value, return true; } -absl::optional> ParseGetSPLTokenBalances( +std::optional> ParseGetSPLTokenBalances( const base::Value& json_value) { auto result = ParseResultDict(json_value); if (!result) { - return absl::nullopt; + return std::nullopt; } auto* value = result->FindList("value"); if (!value) { - return absl::nullopt; + return std::nullopt; } std::vector balances; for (const auto& account_value : *value) { if (!account_value.is_dict()) { - return absl::nullopt; + return std::nullopt; } const auto& account_dict = account_value.GetDict(); auto* mint = account_dict.FindStringByDottedPath("account.data.parsed.info.mint"); if (!mint) { - return absl::nullopt; + return std::nullopt; } auto* tokenAmount = account_dict.FindDictByDottedPath( "account.data.parsed.info.tokenAmount"); if (!tokenAmount) { - return absl::nullopt; + return std::nullopt; } auto parsed_amount = ParseAmountDict(*tokenAmount); if (!parsed_amount) { - return absl::nullopt; + return std::nullopt; } // Skip zero-value amounts. @@ -194,7 +195,7 @@ bool ParseGetLatestBlockhash(const base::Value& json_value, bool ParseGetSignatureStatuses( const base::Value& json_value, - std::vector>* statuses) { + std::vector>* statuses) { DCHECK(statuses); statuses->clear(); @@ -211,7 +212,7 @@ bool ParseGetSignatureStatuses( for (const auto& item : *value) { const auto* status_value = item.GetIfDict(); if (!status_value) { - statuses->push_back(absl::nullopt); + statuses->push_back(std::nullopt); continue; } @@ -219,13 +220,13 @@ bool ParseGetSignatureStatuses( if (!GetUint64FromDictValue(*status_value, "slot", false, &status.slot) || !GetUint64FromDictValue(*status_value, "confirmations", true, &status.confirmations)) { - statuses->push_back(absl::nullopt); + statuses->push_back(std::nullopt); continue; } const base::Value* err_value = status_value->Find("err"); if (!err_value || (!err_value->is_dict() && !err_value->is_none())) { - statuses->push_back(absl::nullopt); + statuses->push_back(std::nullopt); continue; } if (err_value->is_none()) { @@ -239,7 +240,7 @@ bool ParseGetSignatureStatuses( if (!confirmation_status_value || (!confirmation_status_value->is_string() && !confirmation_status_value->is_none())) { - statuses->push_back(absl::nullopt); + statuses->push_back(std::nullopt); } else if (confirmation_status_value->is_none()) { status.confirmation_status = ""; } else { // is_string @@ -256,7 +257,7 @@ bool ParseGetSignatureStatuses( } bool ParseGetAccountInfo(const base::Value& json_value, - absl::optional* account_info_out) { + std::optional* account_info_out) { DCHECK(account_info_out); auto response = json_rpc_responses::RPCResponse::FromValue(json_value); @@ -274,7 +275,7 @@ bool ParseGetAccountInfo(const base::Value& json_value, } if (value->is_none()) { - *account_info_out = absl::nullopt; + *account_info_out = std::nullopt; return true; } @@ -287,7 +288,7 @@ bool ParseGetAccountInfo(const base::Value& json_value, bool ParseGetAccountInfoPayload( const base::Value::Dict& value_dict, - absl::optional* account_info_out) { + std::optional* account_info_out) { SolanaAccountInfo account_info; if (!GetUint64FromDictValue(value_dict, "lamports", false, &account_info.lamports)) { @@ -383,7 +384,7 @@ bool ParseGetTokenAccountsByOwner(const base::Value& json_value, return false; } - absl::optional account_info; + std::optional account_info; if (!ParseGetAccountInfoPayload(account_value->GetDict(), &account_info)) { return false; } @@ -396,28 +397,28 @@ bool ParseGetTokenAccountsByOwner(const base::Value& json_value, return true; } -absl::optional ParseIsBlockhashValid(const base::Value& json_value) { +std::optional ParseIsBlockhashValid(const base::Value& json_value) { auto result = ParseResultDict(json_value); if (!result) { - return absl::nullopt; + return std::nullopt; } auto is_valid = result->FindBool("value"); if (!is_valid) { - return absl::nullopt; + return std::nullopt; } return *is_valid; } -base::OnceCallback(const std::string& raw_response)> +base::OnceCallback(const std::string& raw_response)> ConverterForGetAccountInfo() { return base::BindOnce(&ConvertMultiUint64ToString, std::vector({"/result/value/lamports", "/result/value/rentEpoch"})); } -base::OnceCallback(const std::string& raw_response)> +base::OnceCallback(const std::string& raw_response)> ConverterForGetProrgamAccounts() { return base::BindOnce( &ConvertMultiUint64ToString, diff --git a/components/brave_wallet/browser/solana_response_parser.h b/components/brave_wallet/browser/solana_response_parser.h index 7f501289878..2c1b0a649a2 100644 --- a/components/brave_wallet/browser/solana_response_parser.h +++ b/components/brave_wallet/browser/solana_response_parser.h @@ -6,15 +6,15 @@ #ifndef BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_SOLANA_RESPONSE_PARSER_H_ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_SOLANA_RESPONSE_PARSER_H_ +#include #include #include #include "base/functional/callback.h" #include "base/values.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" -#include "third_party/abseil-cpp/absl/types/optional.h" -// TODO(apaymyshev): refactor utility methods to return absl::optional instead +// TODO(apaymyshev): refactor utility methods to return std::optional instead // of bool + out-parameter. namespace brave_wallet { @@ -35,25 +35,25 @@ bool ParseGetLatestBlockhash(const base::Value& json_value, uint64_t* last_valid_block_height); bool ParseGetSignatureStatuses( const base::Value& json_value, - std::vector>* statuses); + std::vector>* statuses); bool ParseGetAccountInfo(const base::Value& json_value, - absl::optional* account_info_out); + std::optional* account_info_out); bool ParseGetAccountInfoPayload( const base::Value::Dict& value_dict, - absl::optional* account_info_out); + std::optional* account_info_out); bool ParseGetFeeForMessage(const base::Value& json_value, uint64_t* fee); bool ParseGetBlockHeight(const base::Value& json_value, uint64_t* block_height); bool ParseGetTokenAccountsByOwner(const base::Value& json_value, std::vector* accounts); -absl::optional ParseIsBlockhashValid(const base::Value& json_value); +std::optional ParseIsBlockhashValid(const base::Value& json_value); -absl::optional> ParseGetSPLTokenBalances( +std::optional> ParseGetSPLTokenBalances( const base::Value& json_value); -base::OnceCallback(const std::string& raw_response)> +base::OnceCallback(const std::string& raw_response)> ConverterForGetAccountInfo(); -base::OnceCallback(const std::string& raw_response)> +base::OnceCallback(const std::string& raw_response)> ConverterForGetProrgamAccounts(); } // namespace solana diff --git a/components/brave_wallet/browser/solana_response_parser_unittest.cc b/components/brave_wallet/browser/solana_response_parser_unittest.cc index 8bb17684ef9..07bda66f0f2 100644 --- a/components/brave_wallet/browser/solana_response_parser_unittest.cc +++ b/components/brave_wallet/browser/solana_response_parser_unittest.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/solana_response_parser.h" +#include #include #include "base/strings/stringprintf.h" @@ -294,15 +295,15 @@ TEST(SolanaResponseParserUnitTest, ParseGetSignatureStatuses) { } )"; - std::vector> statuses; + std::vector> statuses; ASSERT_TRUE(ParseGetSignatureStatuses(ParseJson(json), &statuses)); - std::vector> expected_statuses( + std::vector> expected_statuses( {SolanaSignatureStatus(UINT64_MAX, 10u, "", "confirmed"), SolanaSignatureStatus(72u, UINT64_MAX, "", "confirmed"), SolanaSignatureStatus( 1092u, 0u, R"({"InstructionError":[0,{"Custom":1}]})", "finalized"), - SolanaSignatureStatus(11u, 0u, "", ""), absl::nullopt}); + SolanaSignatureStatus(11u, 0u, "", ""), std::nullopt}); EXPECT_EQ(statuses, expected_statuses); @@ -330,7 +331,7 @@ TEST(SolanaResponseParserUnitTest, ParseGetSignatureStatuses) { } )"; expected_statuses = - std::vector>(4, absl::nullopt); + std::vector>(4, std::nullopt); ASSERT_TRUE(ParseGetSignatureStatuses(ParseJson(invalid), &statuses)); EXPECT_EQ(expected_statuses, statuses); } @@ -359,7 +360,7 @@ TEST(SolanaResponseParserUnitTest, ParseGetAccountInfo) { expected_info.executable = false; expected_info.rent_epoch = UINT64_MAX; - absl::optional info; + std::optional info; ASSERT_TRUE(ParseGetAccountInfo(ParseJson(json), &info)); EXPECT_EQ(*info, expected_info); diff --git a/components/brave_wallet/browser/solana_transaction.cc b/components/brave_wallet/browser/solana_transaction.cc index 4ba36383074..a241c9ffc52 100644 --- a/components/brave_wallet/browser/solana_transaction.cc +++ b/components/brave_wallet/browser/solana_transaction.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_wallet/browser/solana_transaction.h" +#include + #include "base/base64.h" #include "base/check.h" #include "base/strings/string_number_conversions.h" @@ -40,9 +42,9 @@ SolanaTransaction::SendOptions::~SendOptions() = default; SolanaTransaction::SendOptions::SendOptions( const SolanaTransaction::SendOptions&) = default; SolanaTransaction::SendOptions::SendOptions( - absl::optional max_retries_param, - absl::optional preflight_commitment_param, - absl::optional skip_preflight_param) + std::optional max_retries_param, + std::optional preflight_commitment_param, + std::optional skip_preflight_param) : max_retries(std::move(max_retries_param)), preflight_commitment(std::move(preflight_commitment_param)), skip_preflight(std::move(skip_preflight_param)) {} @@ -60,17 +62,17 @@ bool SolanaTransaction::SendOptions::operator!=( } // static -absl::optional +std::optional SolanaTransaction::SendOptions::FromValue( - absl::optional value) { + std::optional value) { if (!value) { - return absl::nullopt; + return std::nullopt; } return FromValue(*value); } // static -absl::optional +std::optional SolanaTransaction::SendOptions::FromValue(const base::Value::Dict& dict) { SolanaTransaction::SendOptions options; @@ -114,11 +116,11 @@ base::Value::Dict SolanaTransaction::SendOptions::ToValue() const { } // static -absl::optional +std::optional SolanaTransaction::SendOptions::FromMojomSendOptions( mojom::SolanaSendTransactionOptionsPtr mojom_options) { if (!mojom_options) { - return absl::nullopt; + return std::nullopt; } SendOptions options; @@ -199,13 +201,13 @@ bool SolanaTransaction::operator!=(const SolanaTransaction& tx) const { // Get serialized message bytes and array of signers. // Serialized message will be the result of decoding // sign_tx_param_->encoded_serialized_msg if exists. -absl::optional, std::vector>> +std::optional, std::vector>> SolanaTransaction::GetSerializedMessage() const { if (!sign_tx_param_) { std::vector signers; auto message_bytes = message_.Serialize(&signers); if (!message_bytes || signers.empty()) { - return absl::nullopt; + return std::nullopt; } return std::make_pair(std::move(*message_bytes), std::move(signers)); @@ -216,12 +218,12 @@ SolanaTransaction::GetSerializedMessage() const { std::vector message_bytes; if (!Base58Decode(sign_tx_param_->encoded_serialized_msg, &message_bytes, kSolanaMaxTxSize, false)) { - return absl::nullopt; + return std::nullopt; } auto signers = SolanaMessage::GetSignerAccountsFromSerializedMessage(message_bytes); if (!signers || signers->empty()) { - return absl::nullopt; + return std::nullopt; } return std::make_pair(std::move(message_bytes), std::move(*signers)); @@ -232,22 +234,22 @@ SolanaTransaction::GetSerializedMessage() const { // A compact-array is serialized as the array length, followed by each array // item. The array length is a special multi-byte encoding called compact-u16. // See https://docs.solana.com/developing/programming-model/transactions. -absl::optional> +std::optional> SolanaTransaction::GetSignedTransactionBytes( KeyringService* keyring_service, const std::vector* selected_account_signature) const { if (!keyring_service && !selected_account_signature) { - return absl::nullopt; + return std::nullopt; } if (selected_account_signature && selected_account_signature->size() != kSolanaSignatureSize) { - return absl::nullopt; + return std::nullopt; } auto message_signers_pair = GetSerializedMessage(); if (!message_signers_pair) { - return absl::nullopt; + return std::nullopt; } auto& message_bytes = message_signers_pair->first; auto& signers = message_signers_pair->second; @@ -255,13 +257,13 @@ SolanaTransaction::GetSignedTransactionBytes( // Preparing signatures. std::vector transaction_bytes; if (signers.size() > UINT8_MAX) { - return absl::nullopt; + return std::nullopt; } CompactU16Encode(signers.size(), &transaction_bytes); const auto selected_account = keyring_service->GetSelectedSolanaDappAccount(); if (!selected_account) { - return absl::nullopt; + return std::nullopt; } // Assign selected account's signature, and keep signatures for other signers @@ -316,7 +318,7 @@ SolanaTransaction::GetSignedTransactionBytes( message_bytes.end()); if (transaction_bytes.size() > kSolanaMaxTxSize) { - return absl::nullopt; + return std::nullopt; } return transaction_bytes; } @@ -413,7 +415,7 @@ std::unique_ptr SolanaTransaction::FromValue( return nullptr; } - absl::optional message = + std::optional message = SolanaMessage::FromValue(*message_dict); if (!message) { return nullptr; diff --git a/components/brave_wallet/browser/solana_transaction.h b/components/brave_wallet/browser/solana_transaction.h index 5d4994c1e38..10a8b88e54e 100644 --- a/components/brave_wallet/browser/solana_transaction.h +++ b/components/brave_wallet/browser/solana_transaction.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_SOLANA_TRANSACTION_H_ #include +#include #include #include #include @@ -14,7 +15,6 @@ #include "base/gtest_prod_util.h" #include "brave/components/brave_wallet/browser/solana_message.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace base { class Value; @@ -31,25 +31,24 @@ class SolanaTransaction { SendOptions(); ~SendOptions(); SendOptions(const SendOptions&); - SendOptions(absl::optional max_retries_param, - absl::optional preflight_commitment_param, - absl::optional skip_preflight_param); + SendOptions(std::optional max_retries_param, + std::optional preflight_commitment_param, + std::optional skip_preflight_param); bool operator==(const SolanaTransaction::SendOptions&) const; bool operator!=(const SolanaTransaction::SendOptions&) const; - static absl::optional FromValue( - const base::Value::Dict& value); - static absl::optional FromValue( - absl::optional value); + static std::optional FromValue(const base::Value::Dict& value); + static std::optional FromValue( + std::optional value); base::Value::Dict ToValue() const; - static absl::optional FromMojomSendOptions( + static std::optional FromMojomSendOptions( mojom::SolanaSendTransactionOptionsPtr mojom_options); mojom::SolanaSendTransactionOptionsPtr ToMojomSendOptions() const; - absl::optional max_retries; - absl::optional preflight_commitment; - absl::optional skip_preflight; + std::optional max_retries; + std::optional preflight_commitment; + std::optional skip_preflight; }; explicit SolanaTransaction(SolanaMessage&& message); @@ -78,12 +77,12 @@ class SolanaTransaction { std::string GetSignedTransaction(KeyringService* keyring_service) const; // Serialize and encode the message in Base64. std::string GetBase64EncodedMessage() const; - absl::optional> GetSignedTransactionBytes( + std::optional> GetSignedTransactionBytes( KeyringService* keyring_service, const std::vector* selected_account_signature = nullptr) const; // Returns message bytes and signer addresses (public keys). - absl::optional, std::vector>> + std::optional, std::vector>> GetSerializedMessage() const; mojom::SolanaTxDataPtr ToSolanaTxData() const; @@ -103,7 +102,7 @@ class SolanaTransaction { uint64_t amount() const { return amount_; } SolanaMessage* message() { return &message_; } const std::vector& raw_signatures() const { return raw_signatures_; } - absl::optional send_options() const { + std::optional send_options() const { return send_options_; } @@ -116,7 +115,7 @@ class SolanaTransaction { void set_tx_type(mojom::TransactionType tx_type); void set_lamports(uint64_t lamports) { lamports_ = lamports; } void set_amount(uint64_t amount) { amount_ = amount; } - void set_send_options(absl::optional options) { + void set_send_options(std::optional options) { send_options_ = options; } void set_sign_tx_param(mojom::SolanaSignTransactionParamPtr sign_tx_param) { @@ -149,7 +148,7 @@ class SolanaTransaction { // Currently might be specified by solana.signAndSendTransaction provider // API as the options to be passed to sendTransaction RPC call. - absl::optional send_options_; + std::optional send_options_; }; } // namespace brave_wallet diff --git a/components/brave_wallet/browser/solana_transaction_unittest.cc b/components/brave_wallet/browser/solana_transaction_unittest.cc index 4ba784d2777..a75a48e3820 100644 --- a/components/brave_wallet/browser/solana_transaction_unittest.cc +++ b/components/brave_wallet/browser/solana_transaction_unittest.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_wallet/browser/solana_transaction.h" #include +#include #include #include "base/base64.h" @@ -114,8 +115,8 @@ TEST_F(SolanaTransactionUnitTest, GetSignedTransaction) { // Program ID mojom::kSolanaSystemProgramId, // Accounts - {SolanaAccountMeta(kFromAccount, absl::nullopt, true, true), - SolanaAccountMeta(kToAccount, absl::nullopt, false, true)}, + {SolanaAccountMeta(kFromAccount, std::nullopt, true, true), + SolanaAccountMeta(kToAccount, std::nullopt, false, true)}, // Data {2, 0, 0, 0, 128, 150, 152, 0, 0, 0, 0, 0}); auto msg = SolanaMessage::CreateLegacyMessage( @@ -171,15 +172,15 @@ TEST_F(SolanaTransactionUnitTest, GetSignedTransaction) { // signer/signature order in the passed in message. instruction = SolanaInstruction( mojom::kSolanaSystemProgramId, - {SolanaAccountMeta(kFromAccount, absl::nullopt, true, true), - SolanaAccountMeta(kToAccount, absl::nullopt, true, true), - SolanaAccountMeta(kTestAccount, absl::nullopt, true, true)}, + {SolanaAccountMeta(kFromAccount, std::nullopt, true, true), + SolanaAccountMeta(kToAccount, std::nullopt, true, true), + SolanaAccountMeta(kTestAccount, std::nullopt, true, true)}, {}); SolanaInstruction instruction2( mojom::kSolanaSystemProgramId, - {SolanaAccountMeta(kFromAccount, absl::nullopt, true, true), - SolanaAccountMeta(kTestAccount, absl::nullopt, true, true), - SolanaAccountMeta(kToAccount, absl::nullopt, true, true)}, + {SolanaAccountMeta(kFromAccount, std::nullopt, true, true), + SolanaAccountMeta(kTestAccount, std::nullopt, true, true), + SolanaAccountMeta(kToAccount, std::nullopt, true, true)}, {}); auto msg2 = SolanaMessage::CreateLegacyMessage( kRecentBlockhash, last_valid_block_height, kFromAccount, {instruction}); @@ -198,7 +199,7 @@ TEST_F(SolanaTransactionUnitTest, GetSignedTransaction) { std::vector test_sig1(64, 1); std::vector test_sig2(64, 2); sign_tx_param->signatures.push_back( - mojom::SignaturePubkeyPair::New(absl::nullopt, kFromAccount)); + mojom::SignaturePubkeyPair::New(std::nullopt, kFromAccount)); sign_tx_param->signatures.push_back( mojom::SignaturePubkeyPair::New(test_sig1, kToAccount)); sign_tx_param->signatures.push_back( @@ -257,8 +258,8 @@ TEST_F(SolanaTransactionUnitTest, GetSignedTransaction) { // Program ID mojom::kSolanaSystemProgramId, // Accounts - {SolanaAccountMeta(kFromAccount, absl::nullopt, true, true), - SolanaAccountMeta(kToAccount, absl::nullopt, false, true)}, + {SolanaAccountMeta(kFromAccount, std::nullopt, true, true), + SolanaAccountMeta(kToAccount, std::nullopt, false, true)}, oversized_data); auto msg4 = SolanaMessage::CreateLegacyMessage( kRecentBlockhash, last_valid_block_height, kFromAccount, {instruction}); @@ -343,8 +344,8 @@ TEST_F(SolanaTransactionUnitTest, FromSignedTransactionBytes) { // Program ID mojom::kSolanaSystemProgramId, // Accounts - {SolanaAccountMeta(from_account, absl::nullopt, true, true), - SolanaAccountMeta(to_account, absl::nullopt, true, true)}, + {SolanaAccountMeta(from_account, std::nullopt, true, true), + SolanaAccountMeta(to_account, std::nullopt, true, true)}, // Data {2, 0, 0, 0, 128, 150, 152, 0, 0, 0, 0, 0}); auto msg = SolanaMessage::CreateLegacyMessage( @@ -378,8 +379,8 @@ TEST_F(SolanaTransactionUnitTest, FromToSolanaTxData) { // Program ID mojom::kSolanaSystemProgramId, // Accounts - {SolanaAccountMeta(from_account, absl::nullopt, true, true), - SolanaAccountMeta(to_account, absl::nullopt, false, true), + {SolanaAccountMeta(from_account, std::nullopt, true, true), + SolanaAccountMeta(to_account, std::nullopt, false, true), SolanaAccountMeta(kTestAccount, 2, false, true), SolanaAccountMeta(kTestAccount2, 3, false, false)}, data); @@ -412,7 +413,7 @@ TEST_F(SolanaTransactionUnitTest, FromToSolanaTxData) { auto sign_tx_param = mojom::SolanaSignTransactionParam::New(); sign_tx_param->encoded_serialized_msg = "encoded_serialized_message"; sign_tx_param->signatures.push_back( - mojom::SignaturePubkeyPair::New(absl::nullopt, "public_key1")); + mojom::SignaturePubkeyPair::New(std::nullopt, "public_key1")); sign_tx_param->signatures.push_back(mojom::SignaturePubkeyPair::New( std::vector(kSolanaSignatureSize, 1), "public_key2")); transaction.set_sign_tx_param(sign_tx_param->Clone()); @@ -488,8 +489,8 @@ TEST_F(SolanaTransactionUnitTest, FromToValue) { // Program ID mojom::kSolanaSystemProgramId, // Accounts - {SolanaAccountMeta(from_account, absl::nullopt, true, true), - SolanaAccountMeta(to_account, absl::nullopt, false, true), + {SolanaAccountMeta(from_account, std::nullopt, true, true), + SolanaAccountMeta(to_account, std::nullopt, false, true), SolanaAccountMeta(kTestAccount, 2, false, true), SolanaAccountMeta(kTestAccount2, 3, false, false)}, data); @@ -518,7 +519,7 @@ TEST_F(SolanaTransactionUnitTest, FromToValue) { auto sign_tx_param = mojom::SolanaSignTransactionParam::New(); sign_tx_param->encoded_serialized_msg = "encoded_serialized_message"; sign_tx_param->signatures.push_back( - mojom::SignaturePubkeyPair::New(absl::nullopt, "public_key1")); + mojom::SignaturePubkeyPair::New(std::nullopt, "public_key1")); sign_tx_param->signatures.push_back(mojom::SignaturePubkeyPair::New( std::vector(2, 1), "public_key2")); transaction.set_sign_tx_param(sign_tx_param->Clone()); @@ -696,8 +697,8 @@ TEST_F(SolanaTransactionUnitTest, GetBase64EncodedMessage) { // Program ID mojom::kSolanaSystemProgramId, // Accounts - {SolanaAccountMeta(from_account, absl::nullopt, true, true), - SolanaAccountMeta(to_account, absl::nullopt, false, true)}, + {SolanaAccountMeta(from_account, std::nullopt, true, true), + SolanaAccountMeta(to_account, std::nullopt, false, true)}, // Data {2, 0, 0, 0, 128, 150, 152, 0, 0, 0, 0, 0}); auto msg = @@ -729,15 +730,15 @@ TEST_F(SolanaTransactionUnitTest, GetBase64EncodedMessage) { TEST_F(SolanaTransactionUnitTest, GetSerializedMessage) { SolanaInstruction ins1( mojom::kSolanaSystemProgramId, - {SolanaAccountMeta(kFromAccount, absl::nullopt, true, true), - SolanaAccountMeta(kToAccount, absl::nullopt, true, true), - SolanaAccountMeta(kTestAccount, absl::nullopt, true, true)}, + {SolanaAccountMeta(kFromAccount, std::nullopt, true, true), + SolanaAccountMeta(kToAccount, std::nullopt, true, true), + SolanaAccountMeta(kTestAccount, std::nullopt, true, true)}, {}); SolanaInstruction ins2( mojom::kSolanaSystemProgramId, - {SolanaAccountMeta(kFromAccount, absl::nullopt, true, true), - SolanaAccountMeta(kTestAccount, absl::nullopt, true, true), - SolanaAccountMeta(kToAccount, absl::nullopt, true, true)}, + {SolanaAccountMeta(kFromAccount, std::nullopt, true, true), + SolanaAccountMeta(kTestAccount, std::nullopt, true, true), + SolanaAccountMeta(kToAccount, std::nullopt, true, true)}, {}); auto msg1 = SolanaMessage::CreateLegacyMessage(kRecentBlockhash, 0, @@ -791,13 +792,13 @@ TEST_F(SolanaTransactionUnitTest, GetSignedTransactionBytes) { SolanaMessageHeader(), {}, {}, {}); EXPECT_EQ(transaction.GetSignedTransactionBytes(keyring_service(), &signature_bytes), - absl::nullopt); + std::nullopt); // Valid SolanaInstruction instruction_one_signer( mojom::kSolanaSystemProgramId, - {SolanaAccountMeta(kFromAccount, absl::nullopt, true, true), - SolanaAccountMeta(kTestAccount2, absl::nullopt, false, true)}, + {SolanaAccountMeta(kFromAccount, std::nullopt, true, true), + SolanaAccountMeta(kTestAccount2, std::nullopt, false, true)}, {2, 0, 0, 0, 128, 150, 152, 0, 0, 0, 0, 0}); auto message = SolanaMessage::CreateLegacyMessage( "9sHcv6xwn9YkB8nxTUGKDwPwNnmqVp5oAXxU8Fdkm4J6", 0, kFromAccount, @@ -806,20 +807,20 @@ TEST_F(SolanaTransactionUnitTest, GetSignedTransactionBytes) { SolanaTransaction transaction2(std::move(*message)); EXPECT_NE(transaction2.GetSignedTransactionBytes(keyring_service(), &signature_bytes), - absl::nullopt); + std::nullopt); // Empty signature is invalid std::vector empty_signature_bytes; EXPECT_EQ(transaction2.GetSignedTransactionBytes(keyring_service(), &empty_signature_bytes), - absl::nullopt); + std::nullopt); // Test empty signature will be appended for non-selected-account signers. SolanaInstruction instruction_three_signers( mojom::kSolanaSystemProgramId, - {SolanaAccountMeta(kFromAccount, absl::nullopt, true, true), - SolanaAccountMeta(kTestAccount2, absl::nullopt, true, true), - SolanaAccountMeta(kToAccount, absl::nullopt, true, true)}, + {SolanaAccountMeta(kFromAccount, std::nullopt, true, true), + SolanaAccountMeta(kTestAccount2, std::nullopt, true, true), + SolanaAccountMeta(kToAccount, std::nullopt, true, true)}, {2, 0, 0, 0, 128, 150, 152, 0, 0, 0, 0, 0}); message = SolanaMessage::CreateLegacyMessage( "9sHcv6xwn9YkB8nxTUGKDwPwNnmqVp5oAXxU8Fdkm4J6", 0, kFromAccount, @@ -828,9 +829,9 @@ TEST_F(SolanaTransactionUnitTest, GetSignedTransactionBytes) { SolanaTransaction transaction3(std::move(*message)); std::vector sig_key_pairs; sig_key_pairs.emplace_back( - mojom::SignaturePubkeyPair::New(absl::nullopt, kFromAccount)); + mojom::SignaturePubkeyPair::New(std::nullopt, kFromAccount)); sig_key_pairs.emplace_back( - mojom::SignaturePubkeyPair::New(absl::nullopt, kTestAccount2)); + mojom::SignaturePubkeyPair::New(std::nullopt, kTestAccount2)); sig_key_pairs.emplace_back( mojom::SignaturePubkeyPair::New(signature_bytes, kToAccount)); auto seriazlied_msg = transaction3.message()->Serialize(nullptr); @@ -869,8 +870,8 @@ TEST_F(SolanaTransactionUnitTest, GetSignedTransactionBytes) { // Test selected account is not the fee payer. SolanaInstruction ins_not_fee_payer( mojom::kSolanaSystemProgramId, - {SolanaAccountMeta(kTestAccount, absl::nullopt, true, true), - SolanaAccountMeta(kFromAccount, absl::nullopt, true, true)}, + {SolanaAccountMeta(kTestAccount, std::nullopt, true, true), + SolanaAccountMeta(kFromAccount, std::nullopt, true, true)}, {2, 0, 0, 0, 128, 150, 152, 0, 0, 0, 0, 0}); message = SolanaMessage::CreateLegacyMessage( kRecentBlockhash, 0, kTestAccount, {ins_not_fee_payer}); @@ -881,7 +882,7 @@ TEST_F(SolanaTransactionUnitTest, GetSignedTransactionBytes) { sig_key_pairs.emplace_back( mojom::SignaturePubkeyPair::New(passed_sig_bytes, kTestAccount)); sig_key_pairs.emplace_back( - mojom::SignaturePubkeyPair::New(absl::nullopt, kFromAccount)); + mojom::SignaturePubkeyPair::New(std::nullopt, kFromAccount)); seriazlied_msg = transaction4.message()->Serialize(nullptr); ASSERT_TRUE(seriazlied_msg); transaction4.set_sign_tx_param(mojom::SolanaSignTransactionParam::New( diff --git a/components/brave_wallet/browser/solana_tx_manager.cc b/components/brave_wallet/browser/solana_tx_manager.cc index dc8f0a55520..8ec3861f407 100644 --- a/components/brave_wallet/browser/solana_tx_manager.cc +++ b/components/brave_wallet/browser/solana_tx_manager.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_wallet/browser/solana_tx_manager.h" #include +#include #include #include @@ -59,7 +60,7 @@ void SolanaTxManager::AddUnapprovedTransaction( const std::string& chain_id, mojom::TxDataUnionPtr tx_data_union, const mojom::AccountIdPtr& from, - const absl::optional& origin, + const std::optional& origin, AddUnapprovedTransactionCallback callback) { DCHECK(tx_data_union->is_solana_tx_data()); @@ -226,7 +227,7 @@ void SolanaTxManager::OnSendSolanaTransaction( } void SolanaTxManager::UpdatePendingTransactions( - const absl::optional& chain_id) { + const std::optional& chain_id) { std::set pending_chain_ids; if (chain_id.has_value()) { pending_chain_ids = pending_chain_ids_; @@ -236,7 +237,7 @@ void SolanaTxManager::UpdatePendingTransactions( weak_ptr_factory_.GetWeakPtr(), *chain_id)); } else { auto pending_transactions = tx_state_manager_->GetTransactionsByStatus( - absl::nullopt, mojom::TransactionStatus::Submitted, absl::nullopt); + std::nullopt, mojom::TransactionStatus::Submitted, std::nullopt); for (const auto& pending_transaction : pending_transactions) { const auto& pending_chain_id = pending_transaction->chain_id(); json_rpc_service_->GetSolanaBlockHeight( @@ -258,7 +259,7 @@ void SolanaTxManager::OnGetBlockHeight(const std::string& chain_id, } auto pending_transactions = tx_state_manager_->GetTransactionsByStatus( - chain_id, mojom::TransactionStatus::Submitted, absl::nullopt); + chain_id, mojom::TransactionStatus::Submitted, std::nullopt); std::vector tx_meta_ids; std::vector tx_signatures; for (const auto& pending_transaction : pending_transactions) { @@ -276,8 +277,7 @@ void SolanaTxManager::OnGetSignatureStatuses( const std::string& chain_id, const std::vector& tx_meta_ids, uint64_t block_height, - const std::vector>& - signature_statuses, + const std::vector>& signature_statuses, mojom::SolanaProviderError error, const std::string& error_message) { if (error != mojom::SolanaProviderError::kSuccess) { @@ -382,7 +382,7 @@ void SolanaTxManager::MakeSystemProgramTransferTxData( return; } - absl::optional instruction = + std::optional instruction = solana::system_program::Transfer(from, to, lamports); if (!instruction) { std::move(callback).Run( @@ -429,10 +429,10 @@ void SolanaTxManager::MakeTokenProgramTransferTxData( return; } - absl::optional from_associated_token_account = + std::optional from_associated_token_account = SolanaKeyring::GetAssociatedTokenAccount(spl_token_mint_address, from_wallet_address); - absl::optional to_associated_token_account = + std::optional to_associated_token_account = SolanaKeyring::GetAssociatedTokenAccount(spl_token_mint_address, to_wallet_address); if (!from_associated_token_account || !to_associated_token_account) { @@ -457,7 +457,7 @@ void SolanaTxManager::MakeTxDataFromBase64EncodedTransaction( const mojom::TransactionType tx_type, mojom::SolanaSendTransactionOptionsPtr send_options, MakeTxDataFromBase64EncodedTransactionCallback callback) { - absl::optional> transaction_bytes = + std::optional> transaction_bytes = base::Base64Decode(encoded_transaction); if (!transaction_bytes || transaction_bytes->empty() || transaction_bytes->size() > kSolanaMaxTxSize) { @@ -499,7 +499,7 @@ void SolanaTxManager::OnGetAccountInfo( const std::string& to_associated_token_account, uint64_t amount, MakeTokenProgramTransferTxDataCallback callback, - absl::optional account_info, + std::optional account_info, mojom::SolanaProviderError error, const std::string& error_message) { if (error != mojom::SolanaProviderError::kSuccess) { @@ -510,7 +510,7 @@ void SolanaTxManager::OnGetAccountInfo( bool create_associated_token_account = false; std::vector instructions; if (!account_info || account_info->owner != mojom::kSolanaTokenProgramId) { - absl::optional create_associated_token_instruction = + std::optional create_associated_token_instruction = solana::spl_associated_token_account_program:: CreateAssociatedTokenAccount(from_wallet_address, to_wallet_address, to_associated_token_account, @@ -525,7 +525,7 @@ void SolanaTxManager::OnGetAccountInfo( create_associated_token_account = true; } - absl::optional transfer_instruction = + std::optional transfer_instruction = solana::spl_token_program::Transfer( mojom::kSolanaTokenProgramId, from_associated_token_account, to_associated_token_account, from_wallet_address, @@ -652,7 +652,7 @@ void SolanaTxManager::ProcessSolanaHardwareSignature( l10n_util::GetStringUTF8(IDS_BRAVE_WALLET_TRANSACTION_NOT_FOUND)); return; } - absl::optional> transaction_bytes = + std::optional> transaction_bytes = meta->tx()->GetSignedTransactionBytes(keyring_service_, &signature_bytes); if (!transaction_bytes) { std::move(callback).Run( diff --git a/components/brave_wallet/browser/solana_tx_manager.h b/components/brave_wallet/browser/solana_tx_manager.h index 651d687d543..d9695387429 100644 --- a/components/brave_wallet/browser/solana_tx_manager.h +++ b/components/brave_wallet/browser/solana_tx_manager.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_SOLANA_TX_MANAGER_H_ #include +#include #include #include @@ -14,7 +15,6 @@ #include "base/memory/weak_ptr.h" #include "brave/components/brave_wallet/browser/solana_block_tracker.h" #include "brave/components/brave_wallet/browser/tx_manager.h" -#include "third_party/abseil-cpp/absl/types/optional.h" class PrefService; @@ -45,7 +45,7 @@ class SolanaTxManager : public TxManager, public SolanaBlockTracker::Observer { void AddUnapprovedTransaction(const std::string& chain_id, mojom::TxDataUnionPtr tx_data_union, const mojom::AccountIdPtr& from, - const absl::optional& origin, + const std::optional& origin, AddUnapprovedTransactionCallback) override; void ApproveTransaction(const std::string& chain_id, const std::string& tx_meta_id, @@ -114,7 +114,7 @@ class SolanaTxManager : public TxManager, public SolanaBlockTracker::Observer { // TxManager void UpdatePendingTransactions( - const absl::optional& chain_id) override; + const std::optional& chain_id) override; void OnGetBlockHeight(const std::string& chain_id, uint64_t block_height, @@ -144,7 +144,7 @@ class SolanaTxManager : public TxManager, public SolanaBlockTracker::Observer { const std::string& chain_id, const std::vector& tx_meta_ids, uint64_t block_height, - const std::vector>& + const std::vector>& signature_statuses, mojom::SolanaProviderError error, const std::string& error_message); @@ -155,7 +155,7 @@ class SolanaTxManager : public TxManager, public SolanaBlockTracker::Observer { const std::string& to_associated_token_account, uint64_t amount, MakeTokenProgramTransferTxDataCallback callback, - absl::optional account_info, + std::optional account_info, mojom::SolanaProviderError error, const std::string& error_message); void OnGetLatestBlockhashForGetEstimatedTxFee( diff --git a/components/brave_wallet/browser/solana_tx_manager_unittest.cc b/components/brave_wallet/browser/solana_tx_manager_unittest.cc index 23033df6131..e8a82a7fcd7 100644 --- a/components/brave_wallet/browser/solana_tx_manager_unittest.cc +++ b/components/brave_wallet/browser/solana_tx_manager_unittest.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_wallet/browser/solana_tx_manager.h" #include +#include #include #include @@ -250,7 +251,7 @@ class SolanaTxManagerUnitTest : public testing::Test { void AddUnapprovedTransaction(const std::string& chain_id, mojom::SolanaTxDataPtr solana_tx_data, const mojom::AccountIdPtr& from, - const absl::optional& origin, + const std::optional& origin, std::string* meta_id) { auto tx_data_union = mojom::TxDataUnion::NewSolanaTxData(std::move(solana_tx_data)); @@ -394,7 +395,7 @@ class SolanaTxManagerUnitTest : public testing::Test { void TestGetTransactionMessageToSign( const std::string& chain_id, const std::string& tx_meta_id, - absl::optional> expected_tx_message) { + std::optional> expected_tx_message) { base::RunLoop run_loop; solana_tx_manager()->GetTransactionMessageToSign( chain_id, tx_meta_id, @@ -403,7 +404,7 @@ class SolanaTxManagerUnitTest : public testing::Test { EXPECT_EQ(!!tx_message, expected_tx_message.has_value()); if (expected_tx_message.has_value()) { ASSERT_TRUE(tx_message->is_message_bytes()); - absl::optional> message_bytes = + std::optional> message_bytes = tx_message->get_message_bytes(); EXPECT_EQ(message_bytes, expected_tx_message); } @@ -598,7 +599,7 @@ TEST_F(SolanaTxManagerUnitTest, WalletOrigin) { std::string meta_id; AddUnapprovedTransaction(mojom::kSolanaMainnet, - std::move(system_transfer_data), from, absl::nullopt, + std::move(system_transfer_data), from, std::nullopt, &meta_id); auto tx_meta = @@ -652,7 +653,7 @@ TEST_F(SolanaTxManagerUnitTest, MakeSystemProgramTransferTxData) { auto mojom_decoded_data = mojom::DecodedSolanaInstructionData::New( static_cast(mojom::SolanaSystemInstruction::kTransfer), solana_ins_data_decoder::GetMojomAccountParamsForTesting( - mojom::SolanaSystemInstruction::kTransfer, absl::nullopt), + mojom::SolanaSystemInstruction::kTransfer, std::nullopt), std::move(mojom_params)); auto mojom_instruction = mojom::SolanaInstruction::New( @@ -723,7 +724,7 @@ TEST_F(SolanaTxManagerUnitTest, MakeTokenProgramTransferTxData) { auto mojom_decoded_data = mojom::DecodedSolanaInstructionData::New( static_cast(mojom::SolanaTokenInstruction::kTransfer), solana_ins_data_decoder::GetMojomAccountParamsForTesting( - absl::nullopt, mojom::SolanaTokenInstruction::kTransfer), + std::nullopt, mojom::SolanaTokenInstruction::kTransfer), std::move(mojom_params)); auto mojom_transfer_instruction = mojom::SolanaInstruction::New( @@ -904,7 +905,7 @@ TEST_F(SolanaTxManagerUnitTest, MakeTxDataFromBase64EncodedTransaction) { auto mojom_decoded_data = mojom::DecodedSolanaInstructionData::New( static_cast(mojom::SolanaSystemInstruction::kTransfer), solana_ins_data_decoder::GetMojomAccountParamsForTesting( - mojom::SolanaSystemInstruction::kTransfer, absl::nullopt), + mojom::SolanaSystemInstruction::kTransfer, std::nullopt), std::move(mojom_params)); auto mojom_instruction = mojom::SolanaInstruction::New( @@ -919,7 +920,7 @@ TEST_F(SolanaTxManagerUnitTest, MakeTxDataFromBase64EncodedTransaction) { std::vector instructions; instructions.push_back(std::move(mojom_instruction)); auto send_options = - SolanaTransaction::SendOptions(absl::nullopt, absl::nullopt, true); + SolanaTransaction::SendOptions(std::nullopt, std::nullopt, true); auto tx_data = mojom::SolanaTxData::New( recent_blockhash, 0, from_account, "", "", 0, 0, mojom::TransactionType::SolanaSwap, std::move(instructions), @@ -1046,7 +1047,7 @@ TEST_F(SolanaTxManagerUnitTest, DropTxWithInvalidBlockhash) { auto pending_transactions = solana_tx_manager()->GetSolanaTxStateManager()->GetTransactionsByStatus( mojom::kSolanaMainnet, mojom::TransactionStatus::Submitted, - absl::nullopt); + std::nullopt); EXPECT_EQ(pending_transactions.size(), 2u); auto tx1 = solana_tx_manager()->GetTxForTesting(mojom::kSolanaMainnet, meta_id1); @@ -1078,14 +1079,14 @@ TEST_F(SolanaTxManagerUnitTest, DropTxWithInvalidBlockhash) { auto dropped_transactions = solana_tx_manager()->GetSolanaTxStateManager()->GetTransactionsByStatus( mojom::kSolanaMainnet, mojom::TransactionStatus::Dropped, - absl::nullopt); + std::nullopt); ASSERT_EQ(dropped_transactions.size(), 1u); EXPECT_EQ(dropped_transactions[0]->id(), meta_id1); pending_transactions = solana_tx_manager()->GetSolanaTxStateManager()->GetTransactionsByStatus( mojom::kSolanaMainnet, mojom::TransactionStatus::Submitted, - absl::nullopt); + std::nullopt); ASSERT_EQ(pending_transactions.size(), 1u); EXPECT_EQ(pending_transactions[0]->id(), meta_id2); } @@ -1093,7 +1094,7 @@ TEST_F(SolanaTxManagerUnitTest, DropTxWithInvalidBlockhash) { TEST_F(SolanaTxManagerUnitTest, GetTransactionMessageToSign) { // Unknown tx_meta_id yields null message TestGetTransactionMessageToSign(mojom::kSolanaMainnet, "Unknown", - absl::nullopt); + std::nullopt); std::vector hw_infos; hw_infos.push_back(mojom::HardwareWalletAccount::New( "89DzXVKJ79xf9MkzTxatQESh5fcvsqBo9fCsbAXkCaZE", "path", "name 1", @@ -1115,11 +1116,11 @@ TEST_F(SolanaTxManagerUnitTest, GetTransactionMessageToSign) { // Invalid latest blockhash yields null message SetInterceptor("", 0, ""); TestGetTransactionMessageToSign(mojom::kSolanaMainnet, - system_transfer_meta_id, absl::nullopt); + system_transfer_meta_id, std::nullopt); // Valid latest blockhash yields valid transaction message to sign SetInterceptor(latest_blockhash1_, last_valid_block_height1_, ""); - absl::optional> message = base::Base64Decode( + std::optional> message = base::Base64Decode( "AQABA2odJRVUDnxVZv71pBNy0DZ/" "ui6dv1N37VgGEA+" "aezhZAMzywrLOSju1o9VJQ5KaB2lsblgqvdjtkDFlmZHz4KQAAAAAAAAAAAAAAAAAAAAAAAA" diff --git a/components/brave_wallet/browser/solana_tx_meta.cc b/components/brave_wallet/browser/solana_tx_meta.cc index a5c398fb804..5aa735449a1 100644 --- a/components/brave_wallet/browser/solana_tx_meta.cc +++ b/components/brave_wallet/browser/solana_tx_meta.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/solana_tx_meta.h" +#include #include #include @@ -46,7 +47,7 @@ mojom::TransactionInfoPtr SolanaTxMeta::ToTransactionInfo() const { base::Milliseconds(submitted_time_.InMillisecondsSinceUnixEpoch()), base::Milliseconds(confirmed_time_.InMillisecondsSinceUnixEpoch()), origin_.has_value() ? MakeOriginInfo(*origin_) : nullptr, chain_id_, - absl::nullopt); + std::nullopt); } } // namespace brave_wallet diff --git a/components/brave_wallet/browser/solana_tx_meta_unittest.cc b/components/brave_wallet/browser/solana_tx_meta_unittest.cc index e24a30a77b8..14bde6bb197 100644 --- a/components/brave_wallet/browser/solana_tx_meta_unittest.cc +++ b/components/brave_wallet/browser/solana_tx_meta_unittest.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_wallet/browser/solana_tx_meta.h" #include +#include #include #include @@ -36,8 +37,8 @@ TEST(SolanaTxMetaUnitTest, ToTransactionInfo) { // Program ID mojom::kSolanaSystemProgramId, // Accounts - {SolanaAccountMeta(from_account, absl::nullopt, true, true), - SolanaAccountMeta(to_account, absl::nullopt, false, true)}, + {SolanaAccountMeta(from_account, std::nullopt, true, true), + SolanaAccountMeta(to_account, std::nullopt, false, true)}, data); auto msg = SolanaMessage::CreateLegacyMessage( @@ -102,7 +103,7 @@ TEST(SolanaTxMetaUnitTest, ToTransactionInfo) { auto mojom_decoded_data = mojom::DecodedSolanaInstructionData::New( static_cast(mojom::SolanaSystemInstruction::kTransfer), solana_ins_data_decoder::GetMojomAccountParamsForTesting( - mojom::SolanaSystemInstruction::kTransfer, absl::nullopt), + mojom::SolanaSystemInstruction::kTransfer, std::nullopt), std::move(mojom_params)); auto mojom_instruction = mojom::SolanaInstruction::New( mojom::kSolanaSystemProgramId, std::move(account_metas), data, @@ -140,8 +141,8 @@ TEST(SolanaTxMetaUnitTest, ToValue) { // Program ID mojom::kSolanaSystemProgramId, // Accounts - {SolanaAccountMeta(from_account, absl::nullopt, true, true), - SolanaAccountMeta(to_account, absl::nullopt, false, true)}, + {SolanaAccountMeta(from_account, std::nullopt, true, true), + SolanaAccountMeta(to_account, std::nullopt, false, true)}, data); auto msg = SolanaMessage::CreateLegacyMessage( recent_blockhash, last_valid_block_height, from_account, diff --git a/components/brave_wallet/browser/solana_tx_state_manager.cc b/components/brave_wallet/browser/solana_tx_state_manager.cc index 679a941420a..a1a8933ece8 100644 --- a/components/brave_wallet/browser/solana_tx_state_manager.cc +++ b/components/brave_wallet/browser/solana_tx_state_manager.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/solana_tx_state_manager.h" +#include #include #include "base/strings/strcat.h" @@ -56,7 +57,7 @@ std::unique_ptr SolanaTxStateManager::ValueToTxMeta( if (!signature_status_value) { return nullptr; } - absl::optional signature_status = + std::optional signature_status = SolanaSignatureStatus::FromValue(*signature_status_value); if (!signature_status) { return nullptr; @@ -67,7 +68,7 @@ std::unique_ptr SolanaTxStateManager::ValueToTxMeta( } std::string SolanaTxStateManager::GetTxPrefPathPrefix( - const absl::optional& chain_id) { + const std::optional& chain_id) { if (chain_id.has_value()) { return base::StrCat( {kSolanaPrefKey, ".", diff --git a/components/brave_wallet/browser/solana_tx_state_manager.h b/components/brave_wallet/browser/solana_tx_state_manager.h index f91773dee99..35d265a34de 100644 --- a/components/brave_wallet/browser/solana_tx_state_manager.h +++ b/components/brave_wallet/browser/solana_tx_state_manager.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_SOLANA_TX_STATE_MANAGER_H_ #include +#include #include #include "base/gtest_prod_util.h" @@ -46,7 +47,7 @@ class SolanaTxStateManager : public TxStateManager { std::unique_ptr ValueToTxMeta( const base::Value::Dict& value) override; std::string GetTxPrefPathPrefix( - const absl::optional& chain_id) override; + const std::optional& chain_id) override; }; } // namespace brave_wallet diff --git a/components/brave_wallet/browser/solana_tx_state_manager_unittest.cc b/components/brave_wallet/browser/solana_tx_state_manager_unittest.cc index 3f8b5baade9..4f715c9918a 100644 --- a/components/brave_wallet/browser/solana_tx_state_manager_unittest.cc +++ b/components/brave_wallet/browser/solana_tx_state_manager_unittest.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_wallet/browser/solana_tx_state_manager.h" #include +#include #include #include @@ -70,8 +71,8 @@ TEST_F(SolanaTxStateManagerUnitTest, SolanaTxMetaAndValue) { // Program ID mojom::kSolanaSystemProgramId, // Accounts - {SolanaAccountMeta(from_account, absl::nullopt, true, true), - SolanaAccountMeta(to_account, absl::nullopt, false, true)}, + {SolanaAccountMeta(from_account, std::nullopt, true, true), + SolanaAccountMeta(to_account, std::nullopt, false, true)}, data); auto msg = SolanaMessage::CreateLegacyMessage( recent_blockhash, last_valid_block_height, from_account, @@ -110,7 +111,7 @@ TEST_F(SolanaTxStateManagerUnitTest, GetTxPrefPathPrefix) { "solana.http://localhost:8899/", solana_tx_state_manager_->GetTxPrefPathPrefix(mojom::kLocalhostChainId)); EXPECT_EQ("solana", - solana_tx_state_manager_->GetTxPrefPathPrefix(absl::nullopt)); + solana_tx_state_manager_->GetTxPrefPathPrefix(std::nullopt)); } } // namespace brave_wallet diff --git a/components/brave_wallet/browser/swap_request_helper.cc b/components/brave_wallet/browser/swap_request_helper.cc index 417f0e1f8f3..0ab1717fc1c 100644 --- a/components/brave_wallet/browser/swap_request_helper.cc +++ b/components/brave_wallet/browser/swap_request_helper.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/swap_request_helper.h" +#include #include #include "base/strings/string_number_conversions.h" @@ -17,7 +18,7 @@ namespace brave_wallet { -absl::optional EncodeJupiterTransactionParams( +std::optional EncodeJupiterTransactionParams( mojom::JupiterSwapParamsPtr params, bool has_fee) { DCHECK(params); @@ -26,11 +27,11 @@ absl::optional EncodeJupiterTransactionParams( // The code below does the following two things: // - compute the ATA address that should be used to receive fees // - verify if output_mint is a valid address - absl::optional associated_token_account = + std::optional associated_token_account = SolanaKeyring::GetAssociatedTokenAccount( params->output_mint, brave_wallet::kSolanaFeeRecipient); if (!associated_token_account) { - return absl::nullopt; + return std::nullopt; } // If the if-condition below is false, associated_token_account is unused, diff --git a/components/brave_wallet/browser/swap_request_helper.h b/components/brave_wallet/browser/swap_request_helper.h index be06ec12017..ca13929cdad 100644 --- a/components/brave_wallet/browser/swap_request_helper.h +++ b/components/brave_wallet/browser/swap_request_helper.h @@ -6,12 +6,14 @@ #ifndef BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_SWAP_REQUEST_HELPER_H_ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_SWAP_REQUEST_HELPER_H_ +#include #include + #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" namespace brave_wallet { -absl::optional EncodeJupiterTransactionParams( +std::optional EncodeJupiterTransactionParams( mojom::JupiterSwapParamsPtr params, bool has_fee); diff --git a/components/brave_wallet/browser/swap_request_helper_unittest.cc b/components/brave_wallet/browser/swap_request_helper_unittest.cc index 8883993e153..5f4fc8be1e4 100644 --- a/components/brave_wallet/browser/swap_request_helper_unittest.cc +++ b/components/brave_wallet/browser/swap_request_helper_unittest.cc @@ -3,13 +3,15 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include "brave/components/brave_wallet/browser/swap_request_helper.h" + +#include #include #include "base/strings/stringprintf.h" #include "base/test/gtest_util.h" #include "base/test/values_test_util.h" #include "brave/components/brave_wallet/browser/json_rpc_requests_helper.h" -#include "brave/components/brave_wallet/browser/swap_request_helper.h" #include "brave/components/brave_wallet/browser/swap_response_parser.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" #include "testing/gtest/include/gtest/gtest.h" @@ -110,7 +112,7 @@ TEST(SwapRequestHelperUnitTest, EncodeJupiterTransactionParams) { // OK: Jupiter transaction params with feeAccount auto expected_params_value = ParseJson(expected_params); - ASSERT_NE(encoded_params, absl::nullopt); + ASSERT_NE(encoded_params, std::nullopt); ASSERT_EQ(*encoded_params, GetJSON(expected_params_value)); // OK: Jupiter transaction params WITHOUT feeAccount @@ -152,7 +154,7 @@ TEST(SwapRequestHelperUnitTest, EncodeJupiterTransactionParams) { "userPublicKey": "mockPubKey" })"; expected_params_value = ParseJson(expected_params); - ASSERT_NE(encoded_params, absl::nullopt); + ASSERT_NE(encoded_params, std::nullopt); ASSERT_EQ(*encoded_params, GetJSON(expected_params_value)); // KO: empty params @@ -162,8 +164,8 @@ TEST(SwapRequestHelperUnitTest, EncodeJupiterTransactionParams) { // KO: invalid output mint params.output_mint = "invalid output mint"; encoded_params = EncodeJupiterTransactionParams(params.Clone(), true); - ASSERT_EQ(encoded_params, absl::nullopt); + ASSERT_EQ(encoded_params, std::nullopt); encoded_params = EncodeJupiterTransactionParams(params.Clone(), false); - ASSERT_EQ(encoded_params, absl::nullopt); + ASSERT_EQ(encoded_params, std::nullopt); } } // namespace brave_wallet diff --git a/components/brave_wallet/browser/swap_response_parser.cc b/components/brave_wallet/browser/swap_response_parser.cc index 8bbc81df9c8..c078bc15ebb 100644 --- a/components/brave_wallet/browser/swap_response_parser.cc +++ b/components/brave_wallet/browser/swap_response_parser.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/swap_response_parser.h" +#include #include #include @@ -24,7 +25,7 @@ constexpr char kInsufficientAssetLiquidity[] = "INSUFFICIENT_ASSET_LIQUIDITY"; constexpr char kJupiterNoRoutesMessage[] = "No routes found for the input and output mints"; -absl::optional ParsePriceImpactPct(const base::Value& value) { +std::optional ParsePriceImpactPct(const base::Value& value) { // null value is considered as 0 price impact. if (value.is_none()) { return 0.0; @@ -33,13 +34,13 @@ absl::optional ParsePriceImpactPct(const base::Value& value) { double result; if (value.is_string()) { if (!base::StringToDouble(value.GetString(), &result)) { - return absl::nullopt; + return std::nullopt; } return result; } - return absl::nullopt; + return std::nullopt; } } // namespace @@ -402,11 +403,11 @@ mojom::JupiterErrorResponsePtr ParseJupiterErrorResponse( // Function to convert all numbers in JSON string to strings. // // For sample JSON response, refer to ParseJupiterQuote. -absl::optional ConvertAllNumbersToString(const std::string& json) { +std::optional ConvertAllNumbersToString(const std::string& json) { auto converted_json = std::string(json::convert_all_numbers_to_string(json, "")); if (converted_json.empty()) { - return absl::nullopt; + return std::nullopt; } return converted_json; diff --git a/components/brave_wallet/browser/swap_response_parser.h b/components/brave_wallet/browser/swap_response_parser.h index f4771b241d5..9d1b134ba51 100644 --- a/components/brave_wallet/browser/swap_response_parser.h +++ b/components/brave_wallet/browser/swap_response_parser.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_SWAP_RESPONSE_PARSER_H_ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_SWAP_RESPONSE_PARSER_H_ +#include #include #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" @@ -22,7 +23,7 @@ mojom::JupiterSwapTransactionsPtr ParseJupiterSwapTransactions( const base::Value& json_value); mojom::JupiterErrorResponsePtr ParseJupiterErrorResponse( const base::Value& json_value); -absl::optional ConvertAllNumbersToString(const std::string& json); +std::optional ConvertAllNumbersToString(const std::string& json); } // namespace brave_wallet #endif // BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_SWAP_RESPONSE_PARSER_H_ diff --git a/components/brave_wallet/browser/swap_service.cc b/components/brave_wallet/browser/swap_service.cc index 8d7aa11a3c8..b8aaab80991 100644 --- a/components/brave_wallet/browser/swap_service.cc +++ b/components/brave_wallet/browser/swap_service.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/swap_service.h" +#include #include #include "base/strings/string_number_conversions.h" @@ -67,7 +68,7 @@ bool HasRFQTLiquidity(const std::string& chain_id) { chain_id == brave_wallet::mojom::kPolygonMainnetChainId); } -absl::optional GetFeePercentage(const std::string& chain_id) { +std::optional GetFeePercentage(const std::string& chain_id) { if (IsEVMNetworkSupported(chain_id)) { return brave_wallet::k0xBuyTokenFeePercentage; } @@ -76,7 +77,7 @@ absl::optional GetFeePercentage(const std::string& chain_id) { return brave_wallet::kSolanaBuyTokenFeePercentage; } - return absl::nullopt; + return std::nullopt; } std::string GetAffiliateAddress(const std::string& chain_id) { diff --git a/components/brave_wallet/browser/tx_manager.cc b/components/brave_wallet/browser/tx_manager.cc index 73b53116d52..bbf8c4c4b92 100644 --- a/components/brave_wallet/browser/tx_manager.cc +++ b/components/brave_wallet/browser/tx_manager.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_wallet/browser/tx_manager.h" #include +#include #include #include @@ -56,10 +57,10 @@ void TxManager::GetTransactionInfo(const std::string& chain_id, } std::vector TxManager::GetAllTransactionInfo( - const absl::optional& chain_id, - const absl::optional& from) { + const std::optional& chain_id, + const std::optional& from) { auto metas = - tx_state_manager_->GetTransactionsByStatus(chain_id, absl::nullopt, from); + tx_state_manager_->GetTransactionsByStatus(chain_id, std::nullopt, from); // Convert vector of TxMeta to vector of TransactionInfo std::vector tis(metas.size()); @@ -122,7 +123,7 @@ void TxManager::Locked() { } void TxManager::Unlocked() { - UpdatePendingTransactions(absl::nullopt); + UpdatePendingTransactions(std::nullopt); } void TxManager::WalletReset() { diff --git a/components/brave_wallet/browser/tx_manager.h b/components/brave_wallet/browser/tx_manager.h index 7aa2d3d943e..d676c75d045 100644 --- a/components/brave_wallet/browser/tx_manager.h +++ b/components/brave_wallet/browser/tx_manager.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_TX_MANAGER_H_ #include +#include #include #include #include @@ -51,7 +52,7 @@ class TxManager : public TxStateManager::Observer, const std::string& chain_id, mojom::TxDataUnionPtr tx_data_union, const mojom::AccountIdPtr& from, - const absl::optional& origin, + const std::optional& origin, AddUnapprovedTransactionCallback) = 0; virtual void ApproveTransaction(const std::string& chain_id, const std::string& tx_meta_id, @@ -63,8 +64,8 @@ class TxManager : public TxStateManager::Observer, const std::string& tx_meta_id, GetTransactionInfoCallback); std::vector GetAllTransactionInfo( - const absl::optional& chain_id, - const absl::optional& from); + const std::optional& chain_id, + const std::optional& from); virtual void SpeedupOrCancelTransaction( const std::string& chain_id, @@ -86,7 +87,7 @@ class TxManager : public TxStateManager::Observer, void CheckIfBlockTrackerShouldRun( const std::set& new_pending_chain_ids); virtual void UpdatePendingTransactions( - const absl::optional& chain_id) = 0; + const std::optional& chain_id) = 0; std::unique_ptr tx_state_manager_; std::unique_ptr block_tracker_; diff --git a/components/brave_wallet/browser/tx_meta.h b/components/brave_wallet/browser/tx_meta.h index e10a379aa01..061ad6b4ca3 100644 --- a/components/brave_wallet/browser/tx_meta.h +++ b/components/brave_wallet/browser/tx_meta.h @@ -6,11 +6,11 @@ #ifndef BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_TX_META_H_ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_TX_META_H_ +#include #include #include "base/time/time.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/origin.h" namespace base { @@ -36,7 +36,7 @@ class TxMeta { base::Time submitted_time() const { return submitted_time_; } base::Time confirmed_time() const { return confirmed_time_; } const std::string& tx_hash() const { return tx_hash_; } - const absl::optional& origin() const { return origin_; } + const std::optional& origin() const { return origin_; } const std::string& chain_id() const { return chain_id_; } void set_id(const std::string& id) { id_ = id; } @@ -52,7 +52,7 @@ class TxMeta { confirmed_time_ = confirmed_time; } void set_tx_hash(const std::string& tx_hash) { tx_hash_ = tx_hash; } - void set_origin(const absl::optional& origin) { + void set_origin(const std::optional& origin) { origin_ = origin; } void set_chain_id(const std::string& chain_id) { chain_id_ = chain_id; } @@ -67,7 +67,7 @@ class TxMeta { base::Time submitted_time_; base::Time confirmed_time_; std::string tx_hash_; - absl::optional origin_; + std::optional origin_; std::string chain_id_; }; diff --git a/components/brave_wallet/browser/tx_service.cc b/components/brave_wallet/browser/tx_service.cc index 86785373d5d..7dfb8745812 100644 --- a/components/brave_wallet/browser/tx_service.cc +++ b/components/brave_wallet/browser/tx_service.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/tx_service.h" +#include #include #include "base/notreached.h" @@ -210,7 +211,7 @@ void TxService::AddUnapprovedTransaction( mojom::AccountIdPtr from, AddUnapprovedTransactionCallback callback) { AddUnapprovedTransactionWithOrigin(std::move(tx_data_union), chain_id, - std::move(from), absl::nullopt, + std::move(from), std::nullopt, std::move(callback)); } @@ -218,7 +219,7 @@ void TxService::AddUnapprovedTransactionWithOrigin( mojom::TxDataUnionPtr tx_data_union, const std::string& chain_id, mojom::AccountIdPtr from, - const absl::optional& origin, + const std::optional& origin, AddUnapprovedTransactionCallback callback) { if (!account_resolver_delegate_->ValidateAccountId(from)) { std::move(callback).Run( @@ -265,11 +266,11 @@ void TxService::GetTransactionInfo(mojom::CoinType coin_type, void TxService::GetAllTransactionInfo( mojom::CoinType coin_type, - const absl::optional& chain_id, + const std::optional& chain_id, mojom::AccountIdPtr from, GetAllTransactionInfoCallback callback) { - absl::optional from_opt = - from ? std::move(from) : absl::optional(); + std::optional from_opt = + from ? std::move(from) : std::optional(); std::move(callback).Run(GetTxManager(coin_type)->GetAllTransactionInfo( chain_id, std::move(from_opt))); } @@ -284,7 +285,7 @@ uint32_t TxService::GetPendingTransactionsCountSync() { for (auto& tx_manager : tx_manager_map_) { auto transactions = - tx_manager.second->GetAllTransactionInfo(absl::nullopt, absl::nullopt); + tx_manager.second->GetAllTransactionInfo(std::nullopt, std::nullopt); counter += CalculatePendingTxCount(transactions); } diff --git a/components/brave_wallet/browser/tx_service.h b/components/brave_wallet/browser/tx_service.h index 001688c3f62..ffea13bcab6 100644 --- a/components/brave_wallet/browser/tx_service.h +++ b/components/brave_wallet/browser/tx_service.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_TX_SERVICE_H_ #include +#include #include #include @@ -86,7 +87,7 @@ class TxService : public KeyedService, mojom::TxDataUnionPtr tx_data_union, const std::string& chain_id, mojom::AccountIdPtr from, - const absl::optional& origin, + const std::optional& origin, AddUnapprovedTransactionCallback); void ApproveTransaction(mojom::CoinType coin_type, const std::string& chain_id, @@ -101,7 +102,7 @@ class TxService : public KeyedService, const std::string& tx_meta_id, GetTransactionInfoCallback) override; void GetAllTransactionInfo(mojom::CoinType coin_type, - const absl::optional& chain_id, + const std::optional& chain_id, mojom::AccountIdPtr from, GetAllTransactionInfoCallback) override; void GetPendingTransactionsCount( diff --git a/components/brave_wallet/browser/tx_state_manager.cc b/components/brave_wallet/browser/tx_state_manager.cc index b19bb3f7c61..e5eb93f842a 100644 --- a/components/brave_wallet/browser/tx_state_manager.cc +++ b/components/brave_wallet/browser/tx_state_manager.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/tx_state_manager.h" +#include #include #include "base/json/values_util.h" @@ -39,7 +40,7 @@ bool TxStateManager::ValueToBaseTxMeta(const base::Value::Dict& value, } meta->set_id(*id); - absl::optional status = value.FindInt("status"); + std::optional status = value.FindInt("status"); if (!status) { return false; } @@ -57,7 +58,7 @@ bool TxStateManager::ValueToBaseTxMeta(const base::Value::Dict& value, if (!created_time) { return false; } - absl::optional created_time_from_value = + std::optional created_time_from_value = base::ValueToTime(created_time); if (!created_time_from_value) { return false; @@ -68,7 +69,7 @@ bool TxStateManager::ValueToBaseTxMeta(const base::Value::Dict& value, if (!submitted_time) { return false; } - absl::optional submitted_time_from_value = + std::optional submitted_time_from_value = base::ValueToTime(submitted_time); if (!submitted_time_from_value) { return false; @@ -79,7 +80,7 @@ bool TxStateManager::ValueToBaseTxMeta(const base::Value::Dict& value, if (!confirmed_time) { return false; } - absl::optional confirmed_time_from_value = + std::optional confirmed_time_from_value = base::ValueToTime(confirmed_time); if (!confirmed_time_from_value) { return false; @@ -187,24 +188,24 @@ bool TxStateManager::WipeTxs() { } { ScopedTxsUpdate update(delegate_); - update->RemoveByDottedPath(GetTxPrefPathPrefix(absl::nullopt)); + update->RemoveByDottedPath(GetTxPrefPathPrefix(std::nullopt)); } return true; } std::vector> TxStateManager::GetTransactionsByStatus( - const absl::optional& chain_id, - const absl::optional& status, + const std::optional& chain_id, + const std::optional& status, const mojom::AccountIdPtr& from) { DCHECK(from); return GetTransactionsByStatus(chain_id, status, - absl::make_optional(from.Clone())); + std::make_optional(from.Clone())); } std::vector> TxStateManager::GetTransactionsByStatus( - const absl::optional& chain_id, - const absl::optional& status, - const absl::optional& from) { + const std::optional& chain_id, + const std::optional& status, + const std::optional& from) { std::vector> result; if (!delegate_->IsInitialized()) { return result; @@ -249,7 +250,7 @@ void TxStateManager::RetireTxByStatus(const std::string& chain_id, status != mojom::TransactionStatus::Rejected) { return; } - auto tx_metas = GetTransactionsByStatus(chain_id, status, absl::nullopt); + auto tx_metas = GetTransactionsByStatus(chain_id, status, std::nullopt); if (tx_metas.size() > max_num) { TxMeta* oldest_meta = nullptr; for (const auto& tx_meta : tx_metas) { diff --git a/components/brave_wallet/browser/tx_state_manager.h b/components/brave_wallet/browser/tx_state_manager.h index 3032e73ce86..f31c73192fa 100644 --- a/components/brave_wallet/browser/tx_state_manager.h +++ b/components/brave_wallet/browser/tx_state_manager.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_TX_STATE_MANAGER_H_ #include +#include #include #include @@ -16,7 +17,6 @@ #include "base/observer_list.h" #include "base/observer_list_types.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" -#include "third_party/abseil-cpp/absl/types/optional.h" class PrefService; @@ -49,14 +49,14 @@ class TxStateManager { PrefService* prefs); std::vector> GetTransactionsByStatus( - const absl::optional& chain_id, - const absl::optional& status, + const std::optional& chain_id, + const std::optional& status, const mojom::AccountIdPtr& from); std::vector> GetTransactionsByStatus( - const absl::optional& chain_id, - const absl::optional& status, - const absl::optional& from); + const std::optional& chain_id, + const std::optional& status, + const std::optional& from); class Observer : public base::CheckedObserver { public: @@ -98,7 +98,7 @@ class TxStateManager { // ex. ethereum and solana and it will be used to acess all the transactions // across different network for the coin. virtual std::string GetTxPrefPathPrefix( - const absl::optional& chain_id) = 0; + const std::optional& chain_id) = 0; raw_ptr delegate_ = nullptr; raw_ptr account_resolver_delegate_ = nullptr; diff --git a/components/brave_wallet/browser/tx_state_manager_unittest.cc b/components/brave_wallet/browser/tx_state_manager_unittest.cc index 7b490577270..541114d64b8 100644 --- a/components/brave_wallet/browser/tx_state_manager_unittest.cc +++ b/components/brave_wallet/browser/tx_state_manager_unittest.cc @@ -3,11 +3,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include -#include - #include "brave/components/brave_wallet/browser/tx_state_manager.h" +#include +#include +#include + #include "base/files/scoped_temp_dir.h" #include "base/run_loop.h" #include "base/scoped_observation.h" @@ -88,12 +89,12 @@ class TxStateManagerUnitTest : public testing::Test { } } - absl::optional GetTxs() { + std::optional GetTxs() { base::RunLoop run_loop; - absl::optional value_out; + std::optional value_out; delegate_->store_->Get( "transactions", - base::BindLambdaForTesting([&](absl::optional value) { + base::BindLambdaForTesting([&](std::optional value) { value_out = std::move(value); run_loop.Quit(); })); @@ -305,88 +306,88 @@ TEST_F(TxStateManagerUnitTest, GetTransactionsByStatus) { EXPECT_EQ( tx_state_manager_ ->GetTransactionsByStatus( - absl::nullopt, mojom::TransactionStatus::Approved, absl::nullopt) + std::nullopt, mojom::TransactionStatus::Approved, std::nullopt) .size(), 0u); EXPECT_EQ( tx_state_manager_ ->GetTransactionsByStatus( - absl::nullopt, mojom::TransactionStatus::Confirmed, absl::nullopt) + std::nullopt, mojom::TransactionStatus::Confirmed, std::nullopt) .size(), 10u); EXPECT_EQ(tx_state_manager_ ->GetTransactionsByStatus(mojom::kMainnetChainId, mojom::TransactionStatus::Confirmed, - absl::nullopt) + std::nullopt) .size(), 4u); EXPECT_EQ(tx_state_manager_ ->GetTransactionsByStatus(mojom::kGoerliChainId, mojom::TransactionStatus::Confirmed, - absl::nullopt) + std::nullopt) .size(), 6u); EXPECT_EQ( tx_state_manager_ ->GetTransactionsByStatus( - absl::nullopt, mojom::TransactionStatus::Submitted, absl::nullopt) + std::nullopt, mojom::TransactionStatus::Submitted, std::nullopt) .size(), 10u); EXPECT_EQ(tx_state_manager_ ->GetTransactionsByStatus(mojom::kMainnetChainId, mojom::TransactionStatus::Submitted, - absl::nullopt) + std::nullopt) .size(), 1u); EXPECT_EQ(tx_state_manager_ ->GetTransactionsByStatus(mojom::kGoerliChainId, mojom::TransactionStatus::Submitted, - absl::nullopt) + std::nullopt) .size(), 9u); EXPECT_EQ(tx_state_manager_ ->GetTransactionsByStatus( - absl::nullopt, mojom::TransactionStatus::Approved, acc1) + std::nullopt, mojom::TransactionStatus::Approved, acc1) .size(), 0u); EXPECT_EQ( tx_state_manager_ - ->GetTransactionsByStatus(absl::nullopt, absl::nullopt, absl::nullopt) + ->GetTransactionsByStatus(std::nullopt, std::nullopt, std::nullopt) .size(), 20u); EXPECT_EQ(tx_state_manager_ - ->GetTransactionsByStatus(absl::nullopt, absl::nullopt, acc1) + ->GetTransactionsByStatus(std::nullopt, std::nullopt, acc1) .size(), 5u); EXPECT_EQ( tx_state_manager_ - ->GetTransactionsByStatus(mojom::kMainnetChainId, absl::nullopt, acc1) + ->GetTransactionsByStatus(mojom::kMainnetChainId, std::nullopt, acc1) .size(), 2u); EXPECT_EQ( tx_state_manager_ - ->GetTransactionsByStatus(mojom::kGoerliChainId, absl::nullopt, acc1) + ->GetTransactionsByStatus(mojom::kGoerliChainId, std::nullopt, acc1) .size(), 3u); EXPECT_EQ(tx_state_manager_ - ->GetTransactionsByStatus(absl::nullopt, absl::nullopt, acc2) + ->GetTransactionsByStatus(std::nullopt, std::nullopt, acc2) .size(), 2u); EXPECT_EQ( tx_state_manager_ - ->GetTransactionsByStatus(mojom::kMainnetChainId, absl::nullopt, acc2) + ->GetTransactionsByStatus(mojom::kMainnetChainId, std::nullopt, acc2) .size(), 0u); EXPECT_EQ( tx_state_manager_ - ->GetTransactionsByStatus(mojom::kGoerliChainId, absl::nullopt, acc2) + ->GetTransactionsByStatus(mojom::kGoerliChainId, std::nullopt, acc2) .size(), 2u); auto confirmed_addr1 = tx_state_manager_->GetTransactionsByStatus( - absl::nullopt, mojom::TransactionStatus::Confirmed, acc1); + std::nullopt, mojom::TransactionStatus::Confirmed, acc1); EXPECT_EQ(confirmed_addr1.size(), 5u); for (const auto& meta : confirmed_addr1) { unsigned id; @@ -395,7 +396,7 @@ TEST_F(TxStateManagerUnitTest, GetTransactionsByStatus) { } auto submitted_addr2 = tx_state_manager_->GetTransactionsByStatus( - absl::nullopt, mojom::TransactionStatus::Submitted, acc2); + std::nullopt, mojom::TransactionStatus::Submitted, acc2); EXPECT_EQ(submitted_addr2.size(), 2u); for (const auto& meta : submitted_addr2) { unsigned id; @@ -419,27 +420,27 @@ TEST_F(TxStateManagerUnitTest, GetTransactionsByStatus) { // OK: no filter EXPECT_EQ( tx_state_manager_ - ->GetTransactionsByStatus(absl::nullopt, absl::nullopt, absl::nullopt) + ->GetTransactionsByStatus(std::nullopt, std::nullopt, std::nullopt) .size(), 21u); // OK: filter by address EXPECT_EQ(tx_state_manager_ - ->GetTransactionsByStatus(absl::nullopt, absl::nullopt, acc1) + ->GetTransactionsByStatus(std::nullopt, std::nullopt, acc1) .size(), 6u); // OK: filter by chain_id EXPECT_EQ(tx_state_manager_ - ->GetTransactionsByStatus(custom_chain.chain_id, absl::nullopt, - absl::nullopt) + ->GetTransactionsByStatus(custom_chain.chain_id, std::nullopt, + std::nullopt) .size(), 1u); // OK: filter by chain_id and address EXPECT_EQ( tx_state_manager_ - ->GetTransactionsByStatus(custom_chain.chain_id, absl::nullopt, acc1) + ->GetTransactionsByStatus(custom_chain.chain_id, std::nullopt, acc1) .size(), 1u); @@ -447,7 +448,7 @@ TEST_F(TxStateManagerUnitTest, GetTransactionsByStatus) { EXPECT_EQ(tx_state_manager_ ->GetTransactionsByStatus(custom_chain.chain_id, mojom::TransactionStatus::Submitted, - absl::nullopt) + std::nullopt) .size(), 1u); diff --git a/components/brave_wallet/browser/tx_storage_delegate_impl.cc b/components/brave_wallet/browser/tx_storage_delegate_impl.cc index eb439016009..355fcf61406 100644 --- a/components/brave_wallet/browser/tx_storage_delegate_impl.cc +++ b/components/brave_wallet/browser/tx_storage_delegate_impl.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/tx_storage_delegate_impl.h" +#include #include #include "base/files/file_path.h" @@ -63,7 +64,7 @@ void TxStorageDelegateImpl::Initialize() { weak_factory_.GetWeakPtr())); } -void TxStorageDelegateImpl::OnTxsRead(absl::optional txs) { +void TxStorageDelegateImpl::OnTxsRead(std::optional txs) { if (txs) { txs_ = std::move(txs->GetDict()); } diff --git a/components/brave_wallet/browser/tx_storage_delegate_impl.h b/components/brave_wallet/browser/tx_storage_delegate_impl.h index 915634cd9e6..e91f7ae9d71 100644 --- a/components/brave_wallet/browser/tx_storage_delegate_impl.h +++ b/components/brave_wallet/browser/tx_storage_delegate_impl.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_TX_STORAGE_DELEGATE_IMPL_H_ #include +#include #include "base/gtest_prod_util.h" #include "base/memory/scoped_refptr.h" @@ -53,7 +54,7 @@ class TxStorageDelegateImpl final : public TxStorageDelegate { // Read all txs from db void Initialize(); - void OnTxsRead(absl::optional txs); + void OnTxsRead(std::optional txs); bool MigrateTransactionsFromPrefsToDB(PrefService* prefs); diff --git a/components/brave_wallet/browser/tx_storage_delegate_impl_unittest.cc b/components/brave_wallet/browser/tx_storage_delegate_impl_unittest.cc index 9754d85f39c..0087dcd0c58 100644 --- a/components/brave_wallet/browser/tx_storage_delegate_impl_unittest.cc +++ b/components/brave_wallet/browser/tx_storage_delegate_impl_unittest.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/tx_storage_delegate_impl.h" +#include #include #include "base/files/scoped_temp_dir.h" @@ -35,12 +36,12 @@ class TxStorageDelegateImplUnitTest : public testing::Test { factory_ = GetTestValueStoreFactory(temp_dir_); } - absl::optional GetTxsFromDB(TxStorageDelegateImpl* delegate) { + std::optional GetTxsFromDB(TxStorageDelegateImpl* delegate) { base::RunLoop run_loop; - absl::optional value_out; + std::optional value_out; delegate->store_->Get( "transactions", - base::BindLambdaForTesting([&](absl::optional value) { + base::BindLambdaForTesting([&](std::optional value) { value_out = std::move(value); run_loop.Quit(); })); diff --git a/components/brave_wallet/browser/unstoppable_domains_multichain_calls.cc b/components/brave_wallet/browser/unstoppable_domains_multichain_calls.cc index 7db653e6844..7be70100d58 100644 --- a/components/brave_wallet/browser/unstoppable_domains_multichain_calls.cc +++ b/components/brave_wallet/browser/unstoppable_domains_multichain_calls.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/unstoppable_domains_multichain_calls.h" +#include #include #include @@ -146,6 +147,6 @@ void MultichainCalls::SetError(const KeyType& key, template class MultichainCalls; template class MultichainCalls; -template class MultichainCalls>; +template class MultichainCalls>; } // namespace brave_wallet::unstoppable_domains diff --git a/components/brave_wallet/browser/unstoppable_domains_multichain_calls.h b/components/brave_wallet/browser/unstoppable_domains_multichain_calls.h index 430d3f43f34..82ad04d66b4 100644 --- a/components/brave_wallet/browser/unstoppable_domains_multichain_calls.h +++ b/components/brave_wallet/browser/unstoppable_domains_multichain_calls.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_UNSTOPPABLE_DOMAINS_MULTICHAIN_CALLS_H_ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_UNSTOPPABLE_DOMAINS_MULTICHAIN_CALLS_H_ +#include #include #include #include @@ -13,7 +14,6 @@ #include "base/containers/flat_map.h" #include "base/functional/callback.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_wallet::unstoppable_domains { @@ -28,9 +28,9 @@ class MultichainCall { void(const ResultType&, mojom::ProviderError, const std::string&)>; struct Response { - absl::optional result; - absl::optional error; - absl::optional error_message; + std::optional result; + std::optional error; + std::optional error_message; }; MultichainCall() = default; diff --git a/components/brave_wallet/browser/wallet_data_files_installer.cc b/components/brave_wallet/browser/wallet_data_files_installer.cc index e7932862e43..2f70087028a 100644 --- a/components/brave_wallet/browser/wallet_data_files_installer.cc +++ b/components/brave_wallet/browser/wallet_data_files_installer.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_wallet/browser/wallet_data_files_installer.h" #include +#include #include #include #include @@ -22,7 +23,6 @@ #include "components/component_updater/component_installer.h" #include "components/prefs/pref_service.h" #include "crypto/sha2.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_wallet { @@ -44,7 +44,7 @@ const char kComponentId[] = "bbckkcdiepaecefgfnibemejliemjnio"; static_assert(std::size(kWalletDataFilesSha2Hash) == crypto::kSHA256Length, "Wrong hash length"); -absl::optional last_installed_wallet_version; +std::optional last_installed_wallet_version; } // namespace @@ -132,7 +132,7 @@ WalletDataFilesInstallerPolicy::GetInstallerAttributes() const { return update_client::InstallerAttributes(); } -absl::optional GetLastInstalledWalletVersion() { +std::optional GetLastInstalledWalletVersion() { return last_installed_wallet_version; } diff --git a/components/brave_wallet/browser/wallet_data_files_installer.h b/components/brave_wallet/browser/wallet_data_files_installer.h index c26c0e1ca79..d26777d400c 100644 --- a/components/brave_wallet/browser/wallet_data_files_installer.h +++ b/components/brave_wallet/browser/wallet_data_files_installer.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_WALLET_DATA_FILES_INSTALLER_H_ #include +#include #include #include "base/files/file_path.h" @@ -17,7 +18,6 @@ #include "brave/components/brave_wallet/browser/wallet_data_files_installer_delegate.h" #include "components/component_updater/component_updater_service.h" #include "components/update_client/update_client.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace base { class FilePath; @@ -27,7 +27,7 @@ class PrefService; namespace brave_wallet { -absl::optional GetLastInstalledWalletVersion(); +std::optional GetLastInstalledWalletVersion(); void SetLastInstalledWalletVersionForTest(const base::Version& version); class WalletDataFilesInstaller diff --git a/components/brave_wallet/browser/wallet_data_files_installer_unittest.cc b/components/brave_wallet/browser/wallet_data_files_installer_unittest.cc index 6f5245a9446..313aeb243fa 100644 --- a/components/brave_wallet/browser/wallet_data_files_installer_unittest.cc +++ b/components/brave_wallet/browser/wallet_data_files_installer_unittest.cc @@ -3,6 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include "brave/components/brave_wallet/browser/wallet_data_files_installer.h" + +#include #include #include "base/files/file_path.h" @@ -21,7 +24,6 @@ #include "brave/components/brave_wallet/browser/keyring_service.h" #include "brave/components/brave_wallet/browser/pref_names.h" #include "brave/components/brave_wallet/browser/test_utils.h" -#include "brave/components/brave_wallet/browser/wallet_data_files_installer.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" #include "brave/components/brave_wallet/common/features.h" #include "components/component_updater/mock_component_updater_service.h" @@ -159,7 +161,7 @@ class WalletDataFilesInstallerUnitTest : public testing::Test { mojom::ExternalWalletType::MetaMask, kTestWalletPassword, kTestWalletPassword, base::BindLambdaForTesting( - [&run_loop](bool success, const absl::optional& err) { + [&run_loop](bool success, const std::optional& err) { ASSERT_TRUE(success); ASSERT_FALSE(err); run_loop.Quit(); diff --git a/components/brave_wallet/browser/zcash/zcash_block_tracker.cc b/components/brave_wallet/browser/zcash/zcash_block_tracker.cc index 76fb57e146d..f0915b6e29d 100644 --- a/components/brave_wallet/browser/zcash/zcash_block_tracker.cc +++ b/components/brave_wallet/browser/zcash/zcash_block_tracker.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_wallet/browser/zcash/zcash_block_tracker.h" #include +#include #include #include "base/containers/contains.h" @@ -37,10 +38,10 @@ void ZCashBlockTracker::GetBlockHeight(const std::string& chain_id) { weak_ptr_factory_.GetWeakPtr(), chain_id)); } -absl::optional ZCashBlockTracker::GetLatestHeight( +std::optional ZCashBlockTracker::GetLatestHeight( const std::string& chain_id) const { if (!base::Contains(latest_height_map_, chain_id)) { - return absl::nullopt; + return std::nullopt; } return latest_height_map_.at(chain_id); } diff --git a/components/brave_wallet/browser/zcash/zcash_block_tracker.h b/components/brave_wallet/browser/zcash/zcash_block_tracker.h index cac0bf14f31..27b1313bb90 100644 --- a/components/brave_wallet/browser/zcash/zcash_block_tracker.h +++ b/components/brave_wallet/browser/zcash/zcash_block_tracker.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_ZCASH_ZCASH_BLOCK_TRACKER_H_ #include +#include #include #include "base/memory/weak_ptr.h" @@ -15,7 +16,6 @@ #include "base/types/expected.h" #include "brave/components/brave_wallet/browser/block_tracker.h" #include "brave/components/brave_wallet/browser/zcash/protos/zcash_grpc_data.pb.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_wallet { @@ -38,7 +38,7 @@ class ZCashBlockTracker : public BlockTracker { void RemoveObserver(Observer* observer); void Start(const std::string& chain_id, base::TimeDelta interval) override; - absl::optional GetLatestHeight(const std::string& chain_id) const; + std::optional GetLatestHeight(const std::string& chain_id) const; private: void GetBlockHeight(const std::string& chain_id); diff --git a/components/brave_wallet/browser/zcash/zcash_keyring.cc b/components/brave_wallet/browser/zcash/zcash_keyring.cc index becead04bf3..64710fb5fa5 100644 --- a/components/brave_wallet/browser/zcash/zcash_keyring.cc +++ b/components/brave_wallet/browser/zcash/zcash_keyring.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_wallet/browser/zcash/zcash_keyring.h" #include +#include #include #include "base/check.h" @@ -14,11 +15,11 @@ namespace brave_wallet { ZCashKeyring::ZCashKeyring(bool testnet) : testnet_(testnet) {} -absl::optional ZCashKeyring::GetAddress( +std::optional ZCashKeyring::GetAddress( const mojom::ZCashKeyId& key_id) { auto key = DeriveKey(key_id); if (!key) { - return absl::nullopt; + return std::nullopt; } HDKey* hd_key = static_cast(key.get()); @@ -26,11 +27,11 @@ absl::optional ZCashKeyring::GetAddress( return hd_key->GetZCashTransparentAddress(testnet_); } -absl::optional> ZCashKeyring::GetPubkey( +std::optional> ZCashKeyring::GetPubkey( const mojom::ZCashKeyId& key_id) { auto hd_key_base = DeriveKey(key_id); if (!hd_key_base) { - return absl::nullopt; + return std::nullopt; } return hd_key_base->GetPublicKeyBytes(); @@ -69,12 +70,12 @@ std::unique_ptr ZCashKeyring::DeriveKey( return key->DeriveNormalChild(key_id.index); } -absl::optional> ZCashKeyring::SignMessage( +std::optional> ZCashKeyring::SignMessage( const mojom::ZCashKeyId& key_id, base::span message) { auto hd_key_base = DeriveKey(key_id); if (!hd_key_base) { - return absl::nullopt; + return std::nullopt; } auto* hd_key = static_cast(hd_key_base.get()); diff --git a/components/brave_wallet/browser/zcash/zcash_keyring.h b/components/brave_wallet/browser/zcash/zcash_keyring.h index e2420b14000..6efefd7c9d5 100644 --- a/components/brave_wallet/browser/zcash/zcash_keyring.h +++ b/components/brave_wallet/browser/zcash/zcash_keyring.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_ZCASH_ZCASH_KEYRING_H_ #include +#include #include #include @@ -22,12 +23,12 @@ class ZCashKeyring : public HDKeyring { ZCashKeyring(const ZCashKeyring&) = delete; ZCashKeyring& operator=(const ZCashKeyring&) = delete; - absl::optional GetAddress(const mojom::ZCashKeyId& key_id); + std::optional GetAddress(const mojom::ZCashKeyId& key_id); - absl::optional> GetPubkey( + std::optional> GetPubkey( const mojom::ZCashKeyId& key_id); - absl::optional> SignMessage( + std::optional> SignMessage( const mojom::ZCashKeyId& key_id, base::span message); diff --git a/components/brave_wallet/browser/zcash/zcash_rpc.cc b/components/brave_wallet/browser/zcash/zcash_rpc.cc index f0b198ae914..ceadbfb7d62 100644 --- a/components/brave_wallet/browser/zcash/zcash_rpc.cc +++ b/components/brave_wallet/browser/zcash/zcash_rpc.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_wallet/browser/zcash/zcash_rpc.h" +#include + #include "base/big_endian.h" #include "base/functional/bind.h" #include "brave/components/brave_wallet/browser/brave_wallet_utils.h" @@ -177,21 +179,21 @@ std::unique_ptr MakeGRPCLoader( } // Resolves serialized protobuf from length-prefixed string -absl::optional ResolveSerializedMessage( +std::optional ResolveSerializedMessage( const std::string& grpc_response_body) { if (grpc_response_body.size() < 5) { - return absl::nullopt; + return std::nullopt; } if (grpc_response_body[0] != 0) { // Compression is not supported yet - return absl::nullopt; + return std::nullopt; } uint32_t size = 0; base::ReadBigEndian( reinterpret_cast(&(grpc_response_body[1])), &size); if (grpc_response_body.size() != size + 5) { - return absl::nullopt; + return std::nullopt; } return grpc_response_body.substr(5); diff --git a/components/brave_wallet/browser/zcash/zcash_rpc.h b/components/brave_wallet/browser/zcash/zcash_rpc.h index 037523b5e3e..b09ad2cfe18 100644 --- a/components/brave_wallet/browser/zcash/zcash_rpc.h +++ b/components/brave_wallet/browser/zcash/zcash_rpc.h @@ -19,7 +19,6 @@ #include "components/prefs/pref_service.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" namespace brave_wallet { diff --git a/components/brave_wallet/browser/zcash/zcash_transaction.cc b/components/brave_wallet/browser/zcash/zcash_transaction.cc index 42bf42abbf3..0601978c594 100644 --- a/components/brave_wallet/browser/zcash/zcash_transaction.cc +++ b/components/brave_wallet/browser/zcash/zcash_transaction.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/zcash/zcash_transaction.h" +#include #include #include #include @@ -124,21 +125,21 @@ base::Value::Dict ZCashTransaction::Outpoint::ToValue() const { } // static -absl::optional -ZCashTransaction::Outpoint::FromValue(const base::Value::Dict& value) { +std::optional ZCashTransaction::Outpoint::FromValue( + const base::Value::Dict& value) { Outpoint result; auto* txid_hex = value.FindString("txid"); if (!txid_hex) { - return absl::nullopt; + return std::nullopt; } if (!base::HexStringToSpan(*txid_hex, result.txid)) { - return absl::nullopt; + return std::nullopt; } auto index_value = value.FindInt("index"); if (!index_value) { - return absl::nullopt; + return std::nullopt; } result.index = *index_value; @@ -187,46 +188,46 @@ base::Value::Dict ZCashTransaction::TxInput::ToValue() const { } // static -absl::optional ZCashTransaction::TxInput::FromValue( +std::optional ZCashTransaction::TxInput::FromValue( const base::Value::Dict& value) { ZCashTransaction::TxInput result; if (!ReadStringTo(value, "utxo_address", result.utxo_address)) { - return absl::nullopt; + return std::nullopt; } if (!ReadDictTo(value, "utxo_outpoint", result.utxo_outpoint)) { - return absl::nullopt; + return std::nullopt; } if (!ReadUint64StringTo(value, "utxo_value", result.utxo_value)) { - return absl::nullopt; + return std::nullopt; } if (!ReadHexByteArrayTo(value, "script_pub_key", result.script_pub_key)) { - return absl::nullopt; + return std::nullopt; } if (!ReadHexByteArrayTo(value, "script_sig", result.script_sig)) { - return absl::nullopt; + return std::nullopt; } return result; } // static -absl::optional -ZCashTransaction::TxInput::FromRpcUtxo(const std::string& address, - const zcash::ZCashUtxo& utxo) { +std::optional ZCashTransaction::TxInput::FromRpcUtxo( + const std::string& address, + const zcash::ZCashUtxo& utxo) { if (address != utxo.address()) { - return absl::nullopt; + return std::nullopt; } ZCashTransaction::TxInput result; result.utxo_address = utxo.address(); result.script_pub_key.insert(result.script_pub_key.begin(), utxo.script().begin(), utxo.script().end()); if (utxo.txid().size() != 32) { - return absl::nullopt; + return std::nullopt; } std::copy_n(utxo.txid().begin(), 32, result.utxo_outpoint.txid.begin()); result.utxo_outpoint.index = utxo.index(); @@ -275,19 +276,19 @@ base::Value::Dict ZCashTransaction::TxOutput::ToValue() const { } // static -absl::optional -ZCashTransaction::TxOutput::FromValue(const base::Value::Dict& value) { +std::optional ZCashTransaction::TxOutput::FromValue( + const base::Value::Dict& value) { ZCashTransaction::TxOutput result; if (!ReadStringTo(value, "address", result.address)) { - return absl::nullopt; + return std::nullopt; } if (!ReadUint64StringTo(value, "amount", result.amount)) { - return absl::nullopt; + return std::nullopt; } if (!ReadHexByteArrayTo(value, "script_pub_key", result.script_pubkey)) { - return absl::nullopt; + return std::nullopt; } return result; @@ -332,54 +333,54 @@ base::Value::Dict ZCashTransaction::ToValue() const { } // static -absl::optional ZCashTransaction::FromValue( +std::optional ZCashTransaction::FromValue( const base::Value::Dict& value) { ZCashTransaction result; auto* inputs_list = value.FindList("inputs"); if (!inputs_list) { - return absl::nullopt; + return std::nullopt; } for (auto& item : *inputs_list) { if (!item.is_dict()) { - return absl::nullopt; + return std::nullopt; } auto input_opt = ZCashTransaction::TxInput::FromValue(item.GetDict()); if (!input_opt) { - return absl::nullopt; + return std::nullopt; } result.inputs_.push_back(std::move(*input_opt)); } auto* outputs_list = value.FindList("outputs"); if (!outputs_list) { - return absl::nullopt; + return std::nullopt; } for (auto& item : *outputs_list) { if (!item.is_dict()) { - return absl::nullopt; + return std::nullopt; } auto output_opt = ZCashTransaction::TxOutput::FromValue(item.GetDict()); if (!output_opt) { - return absl::nullopt; + return std::nullopt; } result.outputs_.push_back(std::move(*output_opt)); } if (!ReadUint32StringTo(value, "locktime", result.locktime_)) { - return absl::nullopt; + return std::nullopt; } if (!ReadStringTo(value, "to", result.to_)) { - return absl::nullopt; + return std::nullopt; } if (!ReadUint64StringTo(value, "amount", result.amount_)) { - return absl::nullopt; + return std::nullopt; } if (!ReadUint64StringTo(value, "fee", result.fee_)) { - return absl::nullopt; + return std::nullopt; } return result; diff --git a/components/brave_wallet/browser/zcash/zcash_transaction.h b/components/brave_wallet/browser/zcash/zcash_transaction.h index c77ea86c8cb..34d2bdcc76e 100644 --- a/components/brave_wallet/browser/zcash/zcash_transaction.h +++ b/components/brave_wallet/browser/zcash/zcash_transaction.h @@ -7,13 +7,13 @@ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_ZCASH_ZCASH_TRANSACTION_H_ #include +#include #include #include #include #include "brave/components/brave_wallet/browser/zcash/protos/zcash_grpc_data.pb.h" #include "brave/components/brave_wallet/common/hash_utils.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_wallet { @@ -30,7 +30,7 @@ class ZCashTransaction { bool operator!=(const Outpoint& other) const; base::Value::Dict ToValue() const; - static absl::optional FromValue(const base::Value::Dict& value); + static std::optional FromValue(const base::Value::Dict& value); std::array txid; uint32_t index = 0; @@ -48,10 +48,10 @@ class ZCashTransaction { TxInput Clone() const; base::Value::Dict ToValue() const; - static absl::optional FromValue(const base::Value::Dict& value); + static std::optional FromValue(const base::Value::Dict& value); - static absl::optional FromRpcUtxo(const std::string& address, - const zcash::ZCashUtxo& utxo); + static std::optional FromRpcUtxo(const std::string& address, + const zcash::ZCashUtxo& utxo); std::string utxo_address; Outpoint utxo_outpoint; @@ -76,7 +76,7 @@ class ZCashTransaction { TxOutput Clone() const; base::Value::Dict ToValue() const; - static absl::optional FromValue(const base::Value::Dict& value); + static std::optional FromValue(const base::Value::Dict& value); std::string address; std::vector script_pubkey; @@ -94,7 +94,7 @@ class ZCashTransaction { ZCashTransaction Clone() const; base::Value::Dict ToValue() const; - static absl::optional FromValue( + static std::optional FromValue( const base::Value::Dict& value); bool IsSigned() const; diff --git a/components/brave_wallet/browser/zcash/zcash_tx_manager.cc b/components/brave_wallet/browser/zcash/zcash_tx_manager.cc index 48c6b70d24b..50db45fca17 100644 --- a/components/brave_wallet/browser/zcash/zcash_tx_manager.cc +++ b/components/brave_wallet/browser/zcash/zcash_tx_manager.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_wallet/browser/zcash/zcash_tx_manager.h" #include +#include #include #include #include @@ -55,7 +56,7 @@ void ZCashTxManager::AddUnapprovedTransaction( const std::string& chain_id, mojom::TxDataUnionPtr tx_data_union, const mojom::AccountIdPtr& from, - const absl::optional& origin, + const std::optional& origin, AddUnapprovedTransactionCallback callback) { const auto& zec_tx_data = tx_data_union->get_zec_tx_data(); @@ -69,7 +70,7 @@ void ZCashTxManager::AddUnapprovedTransaction( void ZCashTxManager::ContinueAddUnapprovedTransaction( const std::string& chain_id, const mojom::AccountIdPtr& from, - const absl::optional& origin, + const std::optional& origin, AddUnapprovedTransactionCallback callback, base::expected zcash_transaction) { if (!zcash_transaction.has_value()) { @@ -198,9 +199,9 @@ mojom::CoinType ZCashTxManager::GetCoinType() const { } void ZCashTxManager::UpdatePendingTransactions( - const absl::optional& chain_id) { + const std::optional& chain_id) { auto pending_transactions = tx_state_manager_->GetTransactionsByStatus( - chain_id, mojom::TransactionStatus::Submitted, absl::nullopt); + chain_id, mojom::TransactionStatus::Submitted, std::nullopt); std::set pending_chain_ids; for (const auto& pending_transaction : pending_transactions) { auto pending_chain_id = pending_transaction->chain_id(); diff --git a/components/brave_wallet/browser/zcash/zcash_tx_manager.h b/components/brave_wallet/browser/zcash/zcash_tx_manager.h index c8de61b438b..feafeff41d9 100644 --- a/components/brave_wallet/browser/zcash/zcash_tx_manager.h +++ b/components/brave_wallet/browser/zcash/zcash_tx_manager.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_ZCASH_ZCASH_TX_MANAGER_H_ #include +#include #include #include "base/scoped_observation.h" @@ -50,7 +51,7 @@ class ZCashTxManager : public TxManager, public ZCashBlockTracker::Observer { void AddUnapprovedTransaction(const std::string& chain_id, mojom::TxDataUnionPtr tx_data_union, const mojom::AccountIdPtr& from, - const absl::optional& origin, + const std::optional& origin, AddUnapprovedTransactionCallback) override; void ApproveTransaction(const std::string& chain_id, const std::string& tx_meta_id, @@ -70,12 +71,12 @@ class ZCashTxManager : public TxManager, public ZCashBlockTracker::Observer { RetryTransactionCallback callback) override; mojom::CoinType GetCoinType() const override; void UpdatePendingTransactions( - const absl::optional& chain_id) override; + const std::optional& chain_id) override; void ContinueAddUnapprovedTransaction( const std::string& chain_id, const mojom::AccountIdPtr& from, - const absl::optional& origin, + const std::optional& origin, AddUnapprovedTransactionCallback callback, base::expected zcash_transaction); diff --git a/components/brave_wallet/browser/zcash/zcash_tx_meta.cc b/components/brave_wallet/browser/zcash/zcash_tx_meta.cc index 24d3ef9ec9b..ac073766aa7 100644 --- a/components/brave_wallet/browser/zcash/zcash_tx_meta.cc +++ b/components/brave_wallet/browser/zcash/zcash_tx_meta.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/zcash/zcash_tx_meta.h" +#include #include #include @@ -52,7 +53,7 @@ base::Value::Dict ZCashTxMeta::ToValue() const { mojom::TransactionInfoPtr ZCashTxMeta::ToTransactionInfo() const { return mojom::TransactionInfo::New( - id_, absl::nullopt, from_.Clone(), tx_hash_, + id_, std::nullopt, from_.Clone(), tx_hash_, mojom::TxDataUnion::NewZecTxData(ToZecTxData(*tx_)), status_, mojom::TransactionType::Other, std::vector() /* tx_params */, std::vector() /* tx_args */, diff --git a/components/brave_wallet/browser/zcash/zcash_tx_state_manager.cc b/components/brave_wallet/browser/zcash/zcash_tx_state_manager.cc index 2fd3af285af..a39447e2287 100644 --- a/components/brave_wallet/browser/zcash/zcash_tx_state_manager.cc +++ b/components/brave_wallet/browser/zcash/zcash_tx_state_manager.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/zcash/zcash_tx_state_manager.h" +#include #include #include "base/strings/strcat.h" @@ -39,7 +40,7 @@ std::unique_ptr ZCashTxStateManager::ValueToZCashTxMeta( } std::string ZCashTxStateManager::GetTxPrefPathPrefix( - const absl::optional& chain_id) { + const std::optional& chain_id) { if (chain_id.has_value()) { return base::StrCat( {kZCashPrefKey, ".", @@ -63,7 +64,7 @@ std::unique_ptr ZCashTxStateManager::ValueToTxMeta( if (!tx) { return nullptr; } - absl::optional tx_from_value = + std::optional tx_from_value = ZCashTransaction::FromValue(*tx); if (!tx_from_value) { return nullptr; diff --git a/components/brave_wallet/browser/zcash/zcash_tx_state_manager.h b/components/brave_wallet/browser/zcash/zcash_tx_state_manager.h index 1f1cd3193f8..02fb89584fd 100644 --- a/components/brave_wallet/browser/zcash/zcash_tx_state_manager.h +++ b/components/brave_wallet/browser/zcash/zcash_tx_state_manager.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_ZCASH_ZCASH_TX_STATE_MANAGER_H_ #include +#include #include #include @@ -44,7 +45,7 @@ class ZCashTxStateManager : public TxStateManager { std::unique_ptr ValueToTxMeta( const base::Value::Dict& value) override; std::string GetTxPrefPathPrefix( - const absl::optional& chain_id) override; + const std::optional& chain_id) override; }; } // namespace brave_wallet diff --git a/components/brave_wallet/browser/zcash/zcash_wallet_service.cc b/components/brave_wallet/browser/zcash/zcash_wallet_service.cc index a49b841b301..d4473e1e1f3 100644 --- a/components/brave_wallet/browser/zcash/zcash_wallet_service.cc +++ b/components/brave_wallet/browser/zcash/zcash_wallet_service.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/browser/zcash/zcash_wallet_service.h" +#include #include #include @@ -41,7 +42,7 @@ class GetTransparentUtxosContext std::set addresses; ZCashWalletService::UtxoMap utxos; - absl::optional error; + std::optional error; GetUtxosCallback callback; bool ShouldRespond() { return callback && (error || addresses.empty()); } @@ -86,10 +87,10 @@ class CreateTransparentTransactionTask { mojom::AccountIdPtr account_id_; CreateTransactionCallback callback_; - absl::optional chain_height_; + std::optional chain_height_; ZCashWalletService::UtxoMap utxo_map_; - absl::optional error_; + std::optional error_; ZCashTransaction transaction_; base::WeakPtrFactory weak_ptr_factory_{ @@ -292,7 +293,7 @@ ZCashWalletService::ZCashWalletService(KeyringService* keyring_service, ZCashWalletService::~ZCashWalletService() = default; -absl::optional ZCashWalletService::GetUnusedChangeAddress( +std::optional ZCashWalletService::GetUnusedChangeAddress( const mojom::AccountId& account_id) { CHECK(IsZCashAccount(account_id)); // TODO(cypt4): this always returns first change address. Should return @@ -319,7 +320,7 @@ void ZCashWalletService::GetReceiverAddress( } // TODO(cypt4): Return unused receiver address std::move(callback).Run(mojom::ZCashAddress::New(*str_addr, std::move(id)), - absl::nullopt); + std::nullopt); } void ZCashWalletService::GetUtxos(const std::string& chain_id, @@ -508,7 +509,7 @@ void ZCashWalletService::OnUtxosResolvedForBalance( result->total_balance += balance_by_addr; result->balances[by_addr.first] = balance_by_addr; } - std::move(initial_callback).Run(std::move(result), absl::nullopt); + std::move(initial_callback).Run(std::move(result), std::nullopt); } void ZCashWalletService::CreateTransaction(const std::string& chain_id, diff --git a/components/brave_wallet/browser/zcash/zcash_wallet_service.h b/components/brave_wallet/browser/zcash/zcash_wallet_service.h index c36bc68ba24..70050532614 100644 --- a/components/brave_wallet/browser/zcash/zcash_wallet_service.h +++ b/components/brave_wallet/browser/zcash/zcash_wallet_service.h @@ -9,6 +9,7 @@ #include #include #include +#include #include #include @@ -88,7 +89,7 @@ class ZCashWalletService : public KeyedService, friend class CreateTransparentTransactionTask; friend class ZCashTxManager; - absl::optional GetUnusedChangeAddress( + std::optional GetUnusedChangeAddress( const mojom::AccountId& account_id); bool SignTransactionInternal(ZCashTransaction& tx, diff --git a/components/brave_wallet/common/bitcoin_utils.cc b/components/brave_wallet/common/bitcoin_utils.cc index dd1bc3e2a02..5008a6ececf 100644 --- a/components/brave_wallet/common/bitcoin_utils.cc +++ b/components/brave_wallet/common/bitcoin_utils.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_wallet/common/bitcoin_utils.h" +#include #include #include "base/strings/string_util.h" @@ -13,7 +14,6 @@ #include "brave/third_party/bitcoin-core/src/src/base58.h" #include "brave/third_party/bitcoin-core/src/src/bech32.h" #include "brave/third_party/bitcoin-core/src/src/util/strencodings.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace { @@ -36,13 +36,13 @@ namespace { // https://github.com/bitcoin/bips/blob/master/bip-0173.mediawiki#segwit-address-format // https://github.com/bitcoin/bips/blob/master/bip-0350.mediawiki#addresses-for-segregated-witness-outputs -absl::optional DecodeBech32Address( +std::optional DecodeBech32Address( const std::string& address) { auto bech_result = bech32::Decode(address); if (bech_result.encoding != bech32::Encoding::BECH32 && bech_result.encoding != bech32::Encoding::BECH32M) { - return absl::nullopt; + return std::nullopt; } bool testnet = false; @@ -52,11 +52,11 @@ absl::optional DecodeBech32Address( kBech32MainnetHrp)) { testnet = false; } else { - return absl::nullopt; + return std::nullopt; } if (bech_result.data.empty()) { - return absl::nullopt; + return std::nullopt; } std::vector data; @@ -64,18 +64,18 @@ absl::optional DecodeBech32Address( if (!ConvertBits<5, 8, false>([&](unsigned char c) { data.push_back(c); }, bech_result.data.begin() + 1, bech_result.data.end())) { - return absl::nullopt; + return std::nullopt; } auto witness_version = bech_result.data[0]; if (witness_version == 0 && bech_result.encoding != bech32::Encoding::BECH32) { - return absl::nullopt; + return std::nullopt; } if (witness_version != 0 && bech_result.encoding != bech32::Encoding::BECH32M) { - return absl::nullopt; + return std::nullopt; } // https://github.com/bitcoin/bips/blob/master/bip-0141.mediawiki#witness-program @@ -95,18 +95,18 @@ absl::optional DecodeBech32Address( } } - return absl::nullopt; + return std::nullopt; } -absl::optional DecodeBase58Address( +std::optional DecodeBase58Address( const std::string& address) { std::vector decoded(kLegacyAddressLength); if (!DecodeBase58Check(address, decoded, kLegacyAddressLength)) { - return absl::nullopt; + return std::nullopt; } if (decoded.size() != kLegacyAddressLength) { - return absl::nullopt; + return std::nullopt; } std::vector pubkey_hash(decoded.begin() + 1, decoded.end()); @@ -127,7 +127,7 @@ absl::optional DecodeBase58Address( return DecodedBitcoinAddress(BitcoinAddressType::kScriptHash, std::move(pubkey_hash), true); } else { - return absl::nullopt; + return std::nullopt; } } @@ -150,7 +150,7 @@ DecodedBitcoinAddress::DecodedBitcoinAddress(DecodedBitcoinAddress&& other) = DecodedBitcoinAddress& DecodedBitcoinAddress::operator=( DecodedBitcoinAddress&& other) = default; -absl::optional DecodeBitcoinAddress( +std::optional DecodeBitcoinAddress( const std::string& address) { if (base::StartsWith(address, kBech32MainnetHrp, base::CompareCase::INSENSITIVE_ASCII) || diff --git a/components/brave_wallet/common/bitcoin_utils.h b/components/brave_wallet/common/bitcoin_utils.h index f7076143bfd..77ccaedc92f 100644 --- a/components/brave_wallet/common/bitcoin_utils.h +++ b/components/brave_wallet/common/bitcoin_utils.h @@ -8,10 +8,10 @@ #define BRAVE_COMPONENTS_BRAVE_WALLET_COMMON_BITCOIN_UTILS_H_ #include +#include #include #include -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_wallet { @@ -43,7 +43,7 @@ struct DecodedBitcoinAddress { bool testnet = false; }; -absl::optional DecodeBitcoinAddress( +std::optional DecodeBitcoinAddress( const std::string& address); std::string PubkeyToSegwitAddress(const std::vector& pubkey, diff --git a/components/brave_wallet/common/bitcoin_utils_unittest.cc b/components/brave_wallet/common/bitcoin_utils_unittest.cc index 82110c28d08..c2c8569d501 100644 --- a/components/brave_wallet/common/bitcoin_utils_unittest.cc +++ b/components/brave_wallet/common/bitcoin_utils_unittest.cc @@ -6,6 +6,8 @@ #include "brave/components/brave_wallet/common/bitcoin_utils.h" +#include + #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "testing/gtest/include/gtest/gtest.h" @@ -35,7 +37,7 @@ TEST(BitcoinUtilsUnitTest, Bip0173TestVectors2) { const char* address; const char* opcodes; // not relevant parts of scriptpubkey. const char* pubkey_hash_hex; - absl::optional expected_type; + std::optional expected_type; } test_cases[] = { { "BC1QW508D6QEJXTDG4Y5R3ZARVARY0C5XW7KV8F3T4", @@ -55,16 +57,16 @@ TEST(BitcoinUtilsUnitTest, Bip0173TestVectors2) { "5128", "751e76e8199196d454941c45d1b3a323f1433bd6751e76e8199196d454941c45d1b3" "a323f1433bd6", - absl::nullopt, // We don't support unkown witness versions + std::nullopt, // We don't support unkown witness versions }, { "BC1SW50QA3JX3S", "6002", "751e", - absl::nullopt, // We don't support unkown witness versions + std::nullopt, // We don't support unkown witness versions }, { "bc1zw508d6qejxtdg4y5r3zarvaryvg6kdaj", "5210", "751e76e8199196d454941c45d1b3a323", - absl::nullopt, // We don't support unkown witness versions + std::nullopt, // We don't support unkown witness versions }, { "tb1qqqqqp399et2xygdj5xreqhjjvcmzhxw4aywxecjdzew6hylgvsesrxh6hy", @@ -116,7 +118,7 @@ TEST(BitcoinUtilsUnitTest, Bip0173TestVectors2) { // https://github.com/sparrowwallet/drongo/blob/9ae1f68dc42529085edcc8c10d9bcfdbf9639448/src/test/java/com/sparrowwallet/drongo/address/AddressTest.java#L12 TEST(BitcoinUtilsUnitTest, DecodeBitcoinAddress_SparrowWalletTestVectors) { - absl::optional decoded; + std::optional decoded; auto decoded1 = DecodeBitcoinAddress("bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4"); diff --git a/components/brave_wallet/common/brave_wallet_types.cc b/components/brave_wallet/common/brave_wallet_types.cc index 9b14e3dc335..1324b85cc51 100644 --- a/components/brave_wallet/common/brave_wallet_types.cc +++ b/components/brave_wallet/common/brave_wallet_types.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/common/brave_wallet_types.h" +#include #include #include "base/strings/string_number_conversions.h" @@ -82,30 +83,30 @@ base::Value::Dict SolanaSignatureStatus::ToValue() const { } // static -absl::optional SolanaSignatureStatus::FromValue( +std::optional SolanaSignatureStatus::FromValue( const base::Value::Dict& value) { SolanaSignatureStatus status; const std::string* slot_string = value.FindString("slot"); if (!slot_string || !base::StringToUint64(*slot_string, &status.slot)) { - return absl::nullopt; + return std::nullopt; } const std::string* confirmations_string = value.FindString("confirmations"); if (!confirmations_string || !base::StringToUint64(*confirmations_string, &status.confirmations)) { - return absl::nullopt; + return std::nullopt; } const std::string* err = value.FindString("err"); if (!err) { - return absl::nullopt; + return std::nullopt; } status.err = *err; const std::string* confirmation_status = value.FindString("confirmation_status"); if (!confirmation_status) { - return absl::nullopt; + return std::nullopt; } status.confirmation_status = *confirmation_status; @@ -126,9 +127,9 @@ bool ValidSolidityBits(size_t bits) { return bits != 0 && bits % 8 == 0 && bits <= 256; } -absl::optional MaxSolidityUint(size_t bits) { +std::optional MaxSolidityUint(size_t bits) { if (!ValidSolidityBits(bits)) { - return absl::nullopt; + return std::nullopt; } // Max hex for intN value is 0x[ff]... for num bytes uint256_t value = 0; @@ -140,9 +141,9 @@ absl::optional MaxSolidityUint(size_t bits) { return value; } -absl::optional MaxSolidityInt(size_t bits) { +std::optional MaxSolidityInt(size_t bits) { if (!ValidSolidityBits(bits)) { - return absl::nullopt; + return std::nullopt; } // Max hex for intN value is 0x7f[ff]... for num bytes - 1 int256_t value = 0x7f; @@ -154,9 +155,9 @@ absl::optional MaxSolidityInt(size_t bits) { return value; } -absl::optional MinSolidityInt(size_t bits) { +std::optional MinSolidityInt(size_t bits) { if (!ValidSolidityBits(bits)) { - return absl::nullopt; + return std::nullopt; } // Min hex for intN value is 0x80[00]... for num bytes - 1 // A simple bit shift doesn't work quite right because of diff --git a/components/brave_wallet/common/brave_wallet_types.h b/components/brave_wallet/common/brave_wallet_types.h index c4d8deb5776..d82d40d1b9c 100644 --- a/components/brave_wallet/common/brave_wallet_types.h +++ b/components/brave_wallet/common/brave_wallet_types.h @@ -7,12 +7,12 @@ #define BRAVE_COMPONENTS_BRAVE_WALLET_COMMON_BRAVE_WALLET_TYPES_H_ #include +#include #include #include #include "base/values.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_wallet { @@ -51,9 +51,9 @@ constexpr uint64_t kMaxSafeIntegerUint64 = 9007199254740991; // 2^53-1 // This is being used for sign typed data where values are not passed // around. bool ValidSolidityBits(size_t bits); -absl::optional MaxSolidityUint(size_t bits); -absl::optional MaxSolidityInt(size_t bits); -absl::optional MinSolidityInt(size_t bits); +std::optional MaxSolidityUint(size_t bits); +std::optional MaxSolidityInt(size_t bits); +std::optional MinSolidityInt(size_t bits); struct Log { Log(); @@ -119,7 +119,7 @@ struct SolanaSignatureStatus { bool operator!=(const SolanaSignatureStatus&) const; base::Value::Dict ToValue() const; - static absl::optional FromValue( + static std::optional FromValue( const base::Value::Dict& value); // The slot the transaction was processed. diff --git a/components/brave_wallet/common/brave_wallet_types_unittest.cc b/components/brave_wallet/common/brave_wallet_types_unittest.cc index 3448df2587a..053a653eb32 100644 --- a/components/brave_wallet/common/brave_wallet_types_unittest.cc +++ b/components/brave_wallet/common/brave_wallet_types_unittest.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_wallet/common/brave_wallet_types.h" #include +#include #include "base/json/json_reader.h" #include "base/values.h" @@ -28,7 +29,7 @@ TEST(BraveWalletTypesTest, OverflowWorksAsExpected) { } TEST(BraveWalletTypesTest, SolanaSignatureStatusFromValue) { - absl::optional value = base::JSONReader::Read(R"({ + std::optional value = base::JSONReader::Read(R"({ "slot": "18446744073709551615", "confirmations": "10", "err": "", @@ -36,7 +37,7 @@ TEST(BraveWalletTypesTest, SolanaSignatureStatusFromValue) { })"); ASSERT_TRUE(value); - absl::optional status = + std::optional status = SolanaSignatureStatus::FromValue(value->GetDict()); ASSERT_TRUE(status); EXPECT_EQ(std::numeric_limits::max(), status->slot); @@ -60,7 +61,7 @@ TEST(BraveWalletTypesTest, SolanaSignatureStatusFromValue) { R"({"slot": "72", "confirmations": "10", "err": ""})"}; for (const auto& invalid_value_string : invalid_value_strings) { - absl::optional invalid_value = + std::optional invalid_value = base::JSONReader::Read(invalid_value_string); ASSERT_TRUE(invalid_value) << ":" << invalid_value_string; EXPECT_FALSE(SolanaSignatureStatus::FromValue(invalid_value->GetDict())) @@ -94,9 +95,9 @@ TEST(BraveWalletTypesTest, ValidSolidityBits) { std::vector invalid_num_bits = {0, 7, 257}; for (size_t i : invalid_num_bits) { EXPECT_FALSE(ValidSolidityBits(i)); - EXPECT_EQ(MaxSolidityUint(i), absl::nullopt); - EXPECT_EQ(MaxSolidityInt(i), absl::nullopt); - EXPECT_EQ(MinSolidityInt(i), absl::nullopt); + EXPECT_EQ(MaxSolidityUint(i), std::nullopt); + EXPECT_EQ(MaxSolidityInt(i), std::nullopt); + EXPECT_EQ(MinSolidityInt(i), std::nullopt); } } diff --git a/components/brave_wallet/common/eth_abi_utils.cc b/components/brave_wallet/common/eth_abi_utils.cc index 4aa93c3fe0e..adef9553159 100644 --- a/components/brave_wallet/common/eth_abi_utils.cc +++ b/components/brave_wallet/common/eth_abi_utils.cc @@ -8,6 +8,7 @@ #include #include #include +#include #include "base/check.h" #include "base/check_op.h" @@ -16,7 +17,6 @@ #include "base/ranges/algorithm.h" #include "brave/components/brave_wallet/common/brave_wallet_types.h" #include "brave/components/brave_wallet/common/eth_address.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_wallet::eth_abi { namespace { @@ -53,18 +53,18 @@ bool BytesToBool(Span32 data) { return value != 0; } -absl::optional BytesToSize(Span32 data) { +std::optional BytesToSize(Span32 data) { auto result = BytesToUint256(data); if (result > std::numeric_limits::max()) { - return absl::nullopt; + return std::nullopt; } return static_cast(result); } -absl::optional ToSpan32(Span data) { +std::optional ToSpan32(Span data) { if (data.size() != kRowLength) { - return absl::nullopt; + return std::nullopt; } return Span32(data.data(), kRowLength); @@ -85,7 +85,7 @@ Span ExtractRows(Span data, size_t row, size_t row_count) { return data.subspan(row * kRowLength, row_count * kRowLength); } -absl::optional ExtractRow(Span data, size_t row) { +std::optional ExtractRow(Span data, size_t row) { return ToSpan32(ExtractRows(data, row, 1)); } @@ -97,7 +97,7 @@ bool CheckPadding(Span data, size_t padded_data_size) { [](uint8_t b) { return b == 0; }); } -absl::optional ExtractHeadFromTuple(Span data, size_t tuple_pos) { +std::optional ExtractHeadFromTuple(Span data, size_t tuple_pos) { return ExtractRow(data, tuple_pos); } @@ -117,7 +117,7 @@ std::pair ExtractFunctionSelectorAndArgsFromCall(Span data) { return {data.subspan(0, 4), data.subspan(4)}; } -std::pair, Span> ExtractArrayInfo(Span data) { +std::pair, Span> ExtractArrayInfo(Span data) { auto array_size_row = ExtractRow(data, 0); if (!array_size_row) { return {}; @@ -145,15 +145,15 @@ EthAddress ExtractAddressFromTuple(Span data, size_t tuple_pos) { return ExtractAddress(*address_head); } -absl::optional> ExtractBytes(Span bytes_encoded) { +std::optional> ExtractBytes(Span bytes_encoded) { // uint256 size followed by padded bytes. auto bytes_len_row = ExtractRow(bytes_encoded, 0); if (!bytes_len_row) { - return absl::nullopt; + return std::nullopt; } - absl::optional bytes_len = BytesToSize(*bytes_len_row); + std::optional bytes_len = BytesToSize(*bytes_len_row); if (!bytes_len) { - return absl::nullopt; + return std::nullopt; } if (*bytes_len == 0) { return std::vector(); @@ -162,24 +162,24 @@ absl::optional> ExtractBytes(Span bytes_encoded) { Span padded_bytes_data = ExtractRows(bytes_encoded, 1, PaddedRowCount(*bytes_len)); if (*bytes_len > padded_bytes_data.size()) { - return absl::nullopt; + return std::nullopt; } if (!CheckPadding(padded_bytes_data, *bytes_len)) { - return absl::nullopt; + return std::nullopt; } Span bytes_result = padded_bytes_data.subspan(0, *bytes_len); return std::vector{bytes_result.begin(), bytes_result.end()}; } -absl::optional ExtractString(Span string_encoded) { +std::optional ExtractString(Span string_encoded) { // uint256 size followed by padded string bytes. auto string_len_row = ExtractRow(string_encoded, 0); if (!string_len_row) { - return absl::nullopt; + return std::nullopt; } - absl::optional string_len = BytesToSize(*string_len_row); + std::optional string_len = BytesToSize(*string_len_row); if (!string_len) { - return absl::nullopt; + return std::nullopt; } if (*string_len == 0) { return std::string(); @@ -188,25 +188,25 @@ absl::optional ExtractString(Span string_encoded) { Span padded_string_data = ExtractRows(string_encoded, 1, PaddedRowCount(*string_len)); if (*string_len > padded_string_data.size()) { - return absl::nullopt; + return std::nullopt; } if (!CheckPadding(padded_string_data, *string_len)) { - return absl::nullopt; + return std::nullopt; } Span string_result = padded_string_data.subspan(0, *string_len); return std::string{string_result.begin(), string_result.end()}; } -absl::optional> ExtractStringArray(Span string_array) { +std::optional> ExtractStringArray(Span string_array) { // Array is stored as size row and tuple of that size. auto [tuple_size, tuple_header] = ExtractArrayInfo(string_array); if (!tuple_size) { - return absl::nullopt; + return std::nullopt; } // Row count in array is reasonable upper limit. if (*tuple_size > PaddedRowCount(string_array.size())) { - return absl::nullopt; + return std::nullopt; } if (*tuple_size == 0) { return std::vector(); @@ -218,65 +218,65 @@ absl::optional> ExtractStringArray(Span string_array) { // Each tuple head row contains offset to encoded string. auto tuple_element_head = ExtractHeadFromTuple(tuple_header, i); if (!tuple_element_head) { - return absl::nullopt; + return std::nullopt; } auto tuple_element_offset = BytesToSize(*tuple_element_head); if (!tuple_element_offset || *tuple_element_offset > tuple_header.size()) { - return absl::nullopt; + return std::nullopt; } auto string = ExtractString(tuple_header.subspan(*tuple_element_offset)); if (!string) { - return absl::nullopt; + return std::nullopt; } result.emplace_back(std::move(*string)); } return result; } -absl::optional>> ExtractBoolAndBytes( +std::optional>> ExtractBoolAndBytes( Span data) { auto bool_row = ExtractRow(data, 0); if (!bool_row) { - return absl::nullopt; + return std::nullopt; } auto bytes = ExtractBytesFromTuple(data, 1); if (!bytes) { - return absl::nullopt; + return std::nullopt; } return std::make_pair(BytesToBool(*bool_row), std::move(*bytes)); } -absl::optional>>> +std::optional>>> ExtractBoolBytesArrayFromTuple(Span data, size_t tuple_pos) { // Head row contains offset to (bool, bytes)[] start. auto array_head = ExtractHeadFromTuple(data, tuple_pos); if (!array_head) { - return absl::nullopt; + return std::nullopt; } - absl::optional array_offset = BytesToSize(*array_head); + std::optional array_offset = BytesToSize(*array_head); if (!array_offset || *array_offset > data.size()) { - return absl::nullopt; + return std::nullopt; } Span array_data = data.subspan(*array_offset); return ExtractBoolBytesArray(array_data); } -absl::optional>>> +std::optional>>> ExtractBoolBytesArray(Span tuple_array) { // Array is stored as size row and tuple of that size. auto [tuple_size, tuple_header] = ExtractArrayInfo(tuple_array); if (!tuple_size) { - return absl::nullopt; + return std::nullopt; } // Row count in array is reasonable upper limit. if (*tuple_size > PaddedRowCount(tuple_array.size())) { - return absl::nullopt; + return std::nullopt; } if (*tuple_size == 0) { return std::vector>>(); @@ -288,18 +288,18 @@ ExtractBoolBytesArray(Span tuple_array) { // Each tuple head row contains offset to encoded tuple. auto tuple_element_head = ExtractHeadFromTuple(tuple_header, i); if (!tuple_element_head) { - return absl::nullopt; + return std::nullopt; } auto tuple_element_offset = BytesToSize(*tuple_element_head); if (!tuple_element_offset || *tuple_element_offset > tuple_header.size()) { - return absl::nullopt; + return std::nullopt; } auto bool_bytes = ExtractBoolAndBytes(tuple_header.subspan(*tuple_element_offset)); if (!bool_bytes) { - return absl::nullopt; + return std::nullopt; } result.emplace_back(std::move(*bool_bytes)); } @@ -307,73 +307,72 @@ ExtractBoolBytesArray(Span tuple_array) { return result; } -absl::optional ExtractStringFromTuple(Span data, - size_t tuple_pos) { +std::optional ExtractStringFromTuple(Span data, size_t tuple_pos) { // Head contains offset to string start. auto head = ExtractHeadFromTuple(data, tuple_pos); if (!head) { - return absl::nullopt; + return std::nullopt; } - absl::optional offset = BytesToSize(*head); + std::optional offset = BytesToSize(*head); if (!offset || *offset > data.size()) { - return absl::nullopt; + return std::nullopt; } Span string = data.subspan(*offset); return ExtractString(string); } -absl::optional> ExtractStringArrayFromTuple( +std::optional> ExtractStringArrayFromTuple( Span data, size_t tuple_pos) { // Head contains offset to string[] start. auto head = ExtractHeadFromTuple(data, tuple_pos); if (!head) { - return absl::nullopt; + return std::nullopt; } - absl::optional offset = BytesToSize(*head); + std::optional offset = BytesToSize(*head); if (!offset || *offset > data.size()) { - return absl::nullopt; + return std::nullopt; } Span string_array = data.subspan(*offset); return ExtractStringArray(string_array); } -absl::optional> ExtractBytesFromTuple(Span data, - size_t tuple_pos) { +std::optional> ExtractBytesFromTuple(Span data, + size_t tuple_pos) { // Head contains offset to bytes start. auto head = ExtractHeadFromTuple(data, tuple_pos); if (!head) { - return absl::nullopt; + return std::nullopt; } - absl::optional offset = BytesToSize(*head); + std::optional offset = BytesToSize(*head); if (!offset || *offset > data.size()) { - return absl::nullopt; + return std::nullopt; } Span bytes = data.subspan(*offset); return ExtractBytes(bytes); } -absl::optional> +std::optional> ExtractFixedBytesFromTuple(Span data, size_t fixed_size, size_t tuple_pos) { if (fixed_size == 0 || fixed_size > 32) { NOTREACHED(); - return absl::nullopt; + return std::nullopt; } // Head contains bytes itself. auto head = ExtractHeadFromTuple(data, tuple_pos); if (!head) { - return absl::nullopt; + return std::nullopt; } if (!CheckPadding(head->subspan(0), fixed_size)) { - return absl::nullopt; + return std::nullopt; } return std::vector{head->begin(), head->begin() + fixed_size}; diff --git a/components/brave_wallet/common/eth_abi_utils.h b/components/brave_wallet/common/eth_abi_utils.h index c234260967c..8751a5101a7 100644 --- a/components/brave_wallet/common/eth_abi_utils.h +++ b/components/brave_wallet/common/eth_abi_utils.h @@ -7,13 +7,13 @@ #define BRAVE_COMPONENTS_BRAVE_WALLET_COMMON_ETH_ABI_UTILS_H_ #include +#include #include #include #include #include "base/containers/span.h" #include "brave/components/brave_wallet/common/eth_address.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_wallet::eth_abi { constexpr size_t kRowLength = 32; @@ -29,24 +29,24 @@ std::pair ExtractFunctionSelectorAndArgsFromCall(Span data); EthAddress ExtractAddress(Span address_encoded); EthAddress ExtractAddressFromTuple(Span data, size_t tuple_pos); -absl::optional> ExtractBytes(Span bytes_encoded); -absl::optional ExtractString(Span string_encoded); +std::optional> ExtractBytes(Span bytes_encoded); +std::optional ExtractString(Span string_encoded); -absl::optional ExtractStringFromTuple(Span data, size_t tuple_pos); -absl::optional> ExtractStringArray(Span data); -absl::optional> ExtractStringArrayFromTuple( +std::optional ExtractStringFromTuple(Span data, size_t tuple_pos); +std::optional> ExtractStringArray(Span data); +std::optional> ExtractStringArrayFromTuple( Span data, size_t tuple_pos); -absl::optional> ExtractBytesFromTuple(Span data, - size_t tuple_pos); -absl::optional>> ExtractBoolAndBytes( +std::optional> ExtractBytesFromTuple(Span data, + size_t tuple_pos); +std::optional>> ExtractBoolAndBytes( Span data); -absl::optional>>> +std::optional>>> ExtractBoolBytesArray(Span string_array); -absl::optional>>> +std::optional>>> ExtractBoolBytesArrayFromTuple(Span data, size_t tuple_pos); -absl::optional> +std::optional> ExtractFixedBytesFromTuple(Span data, size_t fixed_size, size_t tuple_pos); class TupleEncoder { diff --git a/components/brave_wallet/common/eth_abi_utils_unittest.cc b/components/brave_wallet/common/eth_abi_utils_unittest.cc index 2c320333f3b..63a92ae492a 100644 --- a/components/brave_wallet/common/eth_abi_utils_unittest.cc +++ b/components/brave_wallet/common/eth_abi_utils_unittest.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_wallet/common/eth_abi_utils.h" #include +#include #include #include @@ -540,7 +541,7 @@ TEST(EthAbiUtilsTest, ExtractBytesFromTuple) { TEST(EthAbiUtilsTest, ExtractBoolAndBytes) { // (true, some data) - absl::optional>> result = + std::optional>> result = ExtractBoolAndBytes(ToBytes( "0000000000000000000000000000000000000000000000000000000000000001" "0000000000000000000000000000000000000000000000000000000000000040" @@ -576,7 +577,7 @@ TEST(EthAbiUtilsTest, ExtractBoolAndBytes) { } TEST(EthAbiUtilsTest, ExtractBoolBytesTupleArray) { - absl::optional>>> result = + std::optional>>> result = ExtractBoolBytesArrayFromTuple( ToBytes( // offset of start of the (bool, bytes)[] element in the tuple diff --git a/components/brave_wallet/common/eth_request_helper.cc b/components/brave_wallet/common/eth_request_helper.cc index 2f4aa8aa41d..abd97b4e1d0 100644 --- a/components/brave_wallet/common/eth_request_helper.cc +++ b/components/brave_wallet/common/eth_request_helper.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_wallet/common/eth_request_helper.h" #include +#include #include #include @@ -25,43 +26,43 @@ namespace { -absl::optional GetParamsList(const std::string& json) { +std::optional GetParamsList(const std::string& json) { auto json_value = base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS | base::JSON_ALLOW_TRAILING_COMMAS); if (!json_value || !json_value->is_dict()) { - return absl::nullopt; + return std::nullopt; } auto& value = json_value->GetDict(); auto* params = value.FindListByDottedPath(brave_wallet::kParams); if (!params) { - return absl::nullopt; + return std::nullopt; } return std::move(*params); } -absl::optional GetObjectFromParamsList( +std::optional GetObjectFromParamsList( const std::string& json) { auto list = GetParamsList(json); if (!list || list->size() != 1 || !(*list)[0].is_dict()) { - return absl::nullopt; + return std::nullopt; } return std::move((*list)[0]).TakeDict(); } -absl::optional GetParamsDict(const std::string& json) { +std::optional GetParamsDict(const std::string& json) { auto json_value = base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS | base::JSON_ALLOW_TRAILING_COMMAS); if (!json_value || !json_value->is_dict()) { - return absl::nullopt; + return std::nullopt; } auto* value = json_value->GetDict().FindDict(brave_wallet::kParams); if (!value) { - return absl::nullopt; + return std::nullopt; } return std::move(*value); @@ -229,7 +230,7 @@ bool GetEthJsonRequestInfo(const std::string& json, base::Value* id, std::string* method, std::string* params) { - absl::optional records_v = + std::optional records_v = base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS | base::JSONParserOptions::JSON_PARSE_RFC); if (!records_v) { @@ -273,7 +274,7 @@ bool GetEthJsonRequestInfo(const std::string& json, bool NormalizeEthRequest(const std::string& input_json, std::string* output_json) { CHECK(output_json); - absl::optional records_v = base::JSONReader::Read( + std::optional records_v = base::JSONReader::Read( input_json, base::JSON_PARSE_CHROMIUM_EXTENSIONS | base::JSONParserOptions::JSON_PARSE_RFC); if (!records_v) { @@ -653,7 +654,7 @@ bool ParseWalletWatchAssetParams(const std::string& json, *error_message = ""; // Might be a list from legacy send method. - absl::optional params = GetObjectFromParamsList(json); + std::optional params = GetObjectFromParamsList(json); if (!params) { params = GetParamsDict(json); } diff --git a/components/brave_wallet/common/eth_sign_typed_data_helper.cc b/components/brave_wallet/common/eth_sign_typed_data_helper.cc index 672c04eaa5a..df8ce6ba1a2 100644 --- a/components/brave_wallet/common/eth_sign_typed_data_helper.cc +++ b/components/brave_wallet/common/eth_sign_typed_data_helper.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_wallet/common/eth_sign_typed_data_helper.h" #include +#include #include #include "base/logging.h" @@ -130,12 +131,12 @@ std::vector EthSignTypedDataHelper::GetTypeHash( return std::vector(type_hash.begin(), type_hash.end()); } -absl::optional, base::Value::Dict>> +std::optional, base::Value::Dict>> EthSignTypedDataHelper::HashStruct(const std::string primary_type_name, const base::Value::Dict& data) const { auto encoded_data = EncodeData(primary_type_name, data); if (!encoded_data) { - return absl::nullopt; + return std::nullopt; } return std::make_pair(KeccakHash(encoded_data->first), std::move(encoded_data->second)); @@ -143,12 +144,12 @@ EthSignTypedDataHelper::HashStruct(const std::string primary_type_name, // Encode the json data by the its type defined in json custom types starting // from primary type. See unittests for some examples. -absl::optional, base::Value::Dict>> +std::optional, base::Value::Dict>> EthSignTypedDataHelper::EncodeData(const std::string& primary_type_name, const base::Value::Dict& data) const { const auto* primary_type = types_.FindList(primary_type_name); if (!primary_type) { - return absl::nullopt; + return std::nullopt; } std::vector result; @@ -162,13 +163,13 @@ EthSignTypedDataHelper::EncodeData(const std::string& primary_type_name, const std::string* type_str = field.FindString("type"); const std::string* name_str = field.FindString("name"); if (!type_str || !name_str) { - return absl::nullopt; + return std::nullopt; } const base::Value* value = data.Find(*name_str); if (value) { auto encoded_field = EncodeField(*type_str, *value); if (!encoded_field) { - return absl::nullopt; + return std::nullopt; } result.insert(result.end(), encoded_field->begin(), encoded_field->end()); sanitized_data.Set(*name_str, value->Clone()); @@ -185,7 +186,7 @@ EthSignTypedDataHelper::EncodeData(const std::string& primary_type_name, // Encode each field of a custom type, if a field is also a custom type it // will call EncodeData recursively until it reaches an atomic type -absl::optional> EthSignTypedDataHelper::EncodeField( +std::optional> EthSignTypedDataHelper::EncodeField( const std::string& type, const base::Value& value) const { // ES6 section 20.1.2.6 Number.MAX_SAFE_INTEGER @@ -195,22 +196,22 @@ absl::optional> EthSignTypedDataHelper::EncodeField( if (base::EndsWith(type, "]")) { if (version_ != Version::kV4) { VLOG(0) << "version has to be v4 to support array"; - return absl::nullopt; + return std::nullopt; } if (!value.is_list()) { - return absl::nullopt; + return std::nullopt; } auto type_split = base::SplitString(type, "[", base::KEEP_WHITESPACE, base::SPLIT_WANT_ALL); if (type_split.size() != 2) { - return absl::nullopt; + return std::nullopt; } const std::string array_type = type_split[0]; std::vector array_result; for (const auto& item : value.GetList()) { auto encoded_item = EncodeField(array_type, item); if (!encoded_item) { - return absl::nullopt; + return std::nullopt; } array_result.insert(array_result.end(), encoded_item->begin(), encoded_item->end()); @@ -220,7 +221,7 @@ absl::optional> EthSignTypedDataHelper::EncodeField( } else if (type == "string") { const std::string* value_str = value.GetIfString(); if (!value_str) { - return absl::nullopt; + return std::nullopt; } const std::string encoded_value = KeccakHash(*value_str, false); const std::vector encoded_value_bytes(encoded_value.begin(), @@ -230,7 +231,7 @@ absl::optional> EthSignTypedDataHelper::EncodeField( } else if (type == "bytes") { const std::string* value_str = value.GetIfString(); if (!value_str || (!value_str->empty() && !IsValidHexString(*value_str))) { - return absl::nullopt; + return std::nullopt; } std::vector bytes; if (!value_str->empty()) { @@ -239,9 +240,9 @@ absl::optional> EthSignTypedDataHelper::EncodeField( const std::vector encoded_value = KeccakHash(bytes); result.insert(result.end(), encoded_value.begin(), encoded_value.end()); } else if (type == "bool") { - absl::optional value_bool = value.GetIfBool(); + std::optional value_bool = value.GetIfBool(); if (!value_bool) { - return absl::nullopt; + return std::nullopt; } uint256_t encoded_value = (uint256_t)*value_bool; // Append the encoded value to byte array result in big endian order @@ -251,12 +252,12 @@ absl::optional> EthSignTypedDataHelper::EncodeField( } else if (type == "address") { const std::string* value_str = value.GetIfString(); if (!value_str || !IsValidHexString(*value_str)) { - return absl::nullopt; + return std::nullopt; } std::vector address; CHECK(PrefixedHexStringToBytes(*value_str, &address)); if (address.size() != 20u) { - return absl::nullopt; + return std::nullopt; } for (size_t i = 0; i < 256 - 160; i += 8) { result.push_back(0); @@ -265,16 +266,16 @@ absl::optional> EthSignTypedDataHelper::EncodeField( } else if (base::StartsWith(type, "bytes", base::CompareCase::SENSITIVE)) { unsigned num_bits; if (!base::StringToUint(type.data() + 5, &num_bits) || num_bits > 32) { - return absl::nullopt; + return std::nullopt; } const std::string* value_str = value.GetIfString(); if (!value_str || !IsValidHexString(*value_str)) { - return absl::nullopt; + return std::nullopt; } std::vector bytes; CHECK(PrefixedHexStringToBytes(*value_str, &bytes)); if (bytes.size() > 32) { - return absl::nullopt; + return std::nullopt; } result.insert(result.end(), bytes.begin(), bytes.end()); for (size_t i = 0; i < 32u - bytes.size(); ++i) { @@ -285,30 +286,30 @@ absl::optional> EthSignTypedDataHelper::EncodeField( unsigned num_bits; if (!base::StringToUint(type.data() + 4, &num_bits) || !ValidSolidityBits(num_bits)) { - return absl::nullopt; + return std::nullopt; } - absl::optional value_double = value.GetIfDouble(); + std::optional value_double = value.GetIfDouble(); const std::string* value_str = value.GetIfString(); uint256_t encoded_value = 0; if (value_double) { encoded_value = (uint256_t)(uint64_t)*value_double; if (encoded_value > (uint256_t)kMaxSafeInteger) { - return absl::nullopt; + return std::nullopt; } } else if (value_str) { if (!value_str->empty() && !HexValueToUint256(*value_str, &encoded_value) && !Base10ValueToUint256(*value_str, &encoded_value)) { - return absl::nullopt; + return std::nullopt; } } else { - return absl::nullopt; + return std::nullopt; } - absl::optional max_value = MaxSolidityUint(num_bits); - if (max_value == absl::nullopt || encoded_value > *max_value) { - return absl::nullopt; + std::optional max_value = MaxSolidityUint(num_bits); + if (max_value == std::nullopt || encoded_value > *max_value) { + return std::nullopt; } // Append the encoded value to byte array result in big endian order @@ -320,31 +321,31 @@ absl::optional> EthSignTypedDataHelper::EncodeField( unsigned num_bits; if (!base::StringToUint(type.data() + 3, &num_bits) || !ValidSolidityBits(num_bits)) { - return absl::nullopt; + return std::nullopt; } - absl::optional value_double = value.GetIfDouble(); + std::optional value_double = value.GetIfDouble(); const std::string* value_str = value.GetIfString(); int256_t encoded_value = 0; if (value_double) { encoded_value = (int256_t)(int64_t)*value_double; if (encoded_value > (int256_t)kMaxSafeInteger) { - return absl::nullopt; + return std::nullopt; } } else if (value_str) { if (!value_str->empty() && !HexValueToInt256(*value_str, &encoded_value) && !Base10ValueToInt256(*value_str, &encoded_value)) { - return absl::nullopt; + return std::nullopt; } } else { - return absl::nullopt; + return std::nullopt; } - absl::optional min_value = MinSolidityInt(num_bits); - absl::optional max_value = MaxSolidityInt(num_bits); - if (min_value == absl::nullopt || max_value == absl::nullopt || + std::optional min_value = MinSolidityInt(num_bits); + std::optional max_value = MaxSolidityInt(num_bits); + if (min_value == std::nullopt || max_value == std::nullopt || encoded_value > *max_value || encoded_value < *min_value) { - return absl::nullopt; + return std::nullopt; } // Append the encoded value to byte array result in big endian order @@ -353,11 +354,11 @@ absl::optional> EthSignTypedDataHelper::EncodeField( } } else { if (!value.is_dict()) { - return absl::nullopt; + return std::nullopt; } auto encoded_data = EncodeData(type, value.GetDict()); if (!encoded_data) { - return absl::nullopt; + return std::nullopt; } std::vector encoded_value = KeccakHash(encoded_data->first); @@ -366,13 +367,13 @@ absl::optional> EthSignTypedDataHelper::EncodeField( return result; } -absl::optional, base::Value::Dict>> +std::optional, base::Value::Dict>> EthSignTypedDataHelper::GetTypedDataDomainHash( const base::Value::Dict& domain_separator) const { return HashStruct("EIP712Domain", domain_separator); } -absl::optional, base::Value::Dict>> +std::optional, base::Value::Dict>> EthSignTypedDataHelper::GetTypedDataPrimaryHash( const std::string& primary_type_name, const base::Value::Dict& message) const { @@ -380,12 +381,12 @@ EthSignTypedDataHelper::GetTypedDataPrimaryHash( } // static -absl::optional> +std::optional> EthSignTypedDataHelper::GetTypedDataMessageToSign( const std::vector& domain_hash, const std::vector& primary_hash) { if (domain_hash.empty() || primary_hash.empty()) { - return absl::nullopt; + return std::nullopt; } std::vector encoded_data({0x19, 0x01}); encoded_data.insert(encoded_data.end(), domain_hash.begin(), diff --git a/components/brave_wallet/common/eth_sign_typed_data_helper.h b/components/brave_wallet/common/eth_sign_typed_data_helper.h index 6e838628ee5..f1f4df69c5e 100644 --- a/components/brave_wallet/common/eth_sign_typed_data_helper.h +++ b/components/brave_wallet/common/eth_sign_typed_data_helper.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_WALLET_COMMON_ETH_SIGN_TYPED_DATA_HELPER_H_ #include +#include #include #include #include @@ -14,7 +15,6 @@ #include "base/containers/flat_map.h" #include "base/gtest_prod_util.h" #include "base/values.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_wallet { @@ -34,19 +34,19 @@ class EthSignTypedDataHelper { void SetVersion(Version version); std::vector GetTypeHash(const std::string primary_type_name) const; - absl::optional, base::Value::Dict>> HashStruct( + std::optional, base::Value::Dict>> HashStruct( const std::string primary_type_name, const base::Value::Dict& data) const; - absl::optional, base::Value::Dict>> EncodeData( + std::optional, base::Value::Dict>> EncodeData( const std::string& primary_type_name, const base::Value::Dict& data) const; - static absl::optional> GetTypedDataMessageToSign( + static std::optional> GetTypedDataMessageToSign( const std::vector& domain_hash, const std::vector& primary_hash); - absl::optional, base::Value::Dict>> + std::optional, base::Value::Dict>> GetTypedDataPrimaryHash(const std::string& primary_type_name, const base::Value::Dict& message) const; - absl::optional, base::Value::Dict>> + std::optional, base::Value::Dict>> GetTypedDataDomainHash(const base::Value::Dict& domain_separator) const; private: @@ -65,7 +65,7 @@ class EthSignTypedDataHelper { const std::string& type_name) const; std::string EncodeTypes(const std::string& primary_type_name) const; - absl::optional> EncodeField( + std::optional> EncodeField( const std::string& type, const base::Value& value) const; diff --git a/components/brave_wallet/common/fil_address.cc b/components/brave_wallet/common/fil_address.cc index 70429657cdc..fab5dd67cf6 100644 --- a/components/brave_wallet/common/fil_address.cc +++ b/components/brave_wallet/common/fil_address.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/common/fil_address.h" +#include #include #include "base/logging.h" @@ -28,22 +29,22 @@ constexpr size_t kAddressSizeBLS = 86; constexpr size_t kAddressSizeDelegatedF410 = 44; constexpr size_t kPayloadSizeDelegatedF410 = 20; -absl::optional> BlakeHash( +std::optional> BlakeHash( const std::vector& payload, size_t length) { blake2b_state blakeState; if (blake2b_init(&blakeState, length) != 0) { VLOG(0) << __func__ << ": blake2b_init failed"; - return absl::nullopt; + return std::nullopt; } if (blake2b_update(&blakeState, payload.data(), payload.size()) != 0) { VLOG(0) << __func__ << ": blake2b_update failed"; - return absl::nullopt; + return std::nullopt; } std::vector result(length, 0); if (blake2b_final(&blakeState, result.data(), length) != 0) { VLOG(0) << __func__ << ": blake2b_final failed"; - return absl::nullopt; + return std::nullopt; } return result; } @@ -53,7 +54,7 @@ bool IsValidNetwork(const std::string& network) { network == mojom::kFilecoinMainnet; } -absl::optional ToProtocol(char input) { +std::optional ToProtocol(char input) { if ((input - '0') == static_cast(mojom::FilecoinAddressProtocol::BLS)) { return mojom::FilecoinAddressProtocol::BLS; } else if ((input - '0') == @@ -63,7 +64,7 @@ absl::optional ToProtocol(char input) { static_cast(mojom::FilecoinAddressProtocol::DELEGATED)) { return mojom::FilecoinAddressProtocol::DELEGATED; } - return absl::nullopt; + return std::nullopt; } } // namespace diff --git a/components/brave_wallet/common/hex_utils.cc b/components/brave_wallet/common/hex_utils.cc index 7d185fc46e9..d13c219048f 100644 --- a/components/brave_wallet/common/hex_utils.cc +++ b/components/brave_wallet/common/hex_utils.cc @@ -6,6 +6,7 @@ #include "brave/components/brave_wallet/common/hex_utils.h" #include +#include #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" @@ -186,11 +187,11 @@ bool PrefixedHexStringToBytes(const std::string& input, return true; } -absl::optional> PrefixedHexStringToBytes( +std::optional> PrefixedHexStringToBytes( const std::string& input) { std::vector result; if (!PrefixedHexStringToBytes(input, &result)) { - return absl::nullopt; + return std::nullopt; } return result; diff --git a/components/brave_wallet/common/hex_utils.h b/components/brave_wallet/common/hex_utils.h index c5637c5f5ac..e8559690f2c 100644 --- a/components/brave_wallet/common/hex_utils.h +++ b/components/brave_wallet/common/hex_utils.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_WALLET_COMMON_HEX_UTILS_H_ #define BRAVE_COMPONENTS_BRAVE_WALLET_COMMON_HEX_UTILS_H_ +#include #include #include @@ -58,7 +59,7 @@ std::string Uint256ValueToHex(uint256_t input); // It also clears the output buffer unlike base::HexStringToBytes bool PrefixedHexStringToBytes(const std::string& input, std::vector* bytes); -absl::optional> PrefixedHexStringToBytes( +std::optional> PrefixedHexStringToBytes( const std::string& input); } // namespace brave_wallet diff --git a/components/brave_wallet/common/solana_address.cc b/components/brave_wallet/common/solana_address.cc index a52a71e3aa8..1125e364dbc 100644 --- a/components/brave_wallet/common/solana_address.cc +++ b/components/brave_wallet/common/solana_address.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/common/solana_address.h" +#include #include #include "brave/components/brave_wallet/common/brave_wallet_constants.h" @@ -29,31 +30,31 @@ bool SolanaAddress::operator!=(const SolanaAddress& other) const { } // static -absl::optional SolanaAddress::FromBytes( +std::optional SolanaAddress::FromBytes( base::span bytes) { if (bytes.size() != kSolanaPubkeySize) { - return absl::nullopt; + return std::nullopt; } return SolanaAddress(bytes); } // static -absl::optional SolanaAddress::FromBytes( +std::optional SolanaAddress::FromBytes( std::vector bytes) { if (bytes.size() != kSolanaPubkeySize) { - return absl::nullopt; + return std::nullopt; } return SolanaAddress(std::move(bytes)); } // static -absl::optional SolanaAddress::FromBase58( +std::optional SolanaAddress::FromBase58( const std::string& base58_string) { std::vector bytes; if (!Base58Decode(base58_string, &bytes, kSolanaPubkeySize)) { - return absl::nullopt; + return std::nullopt; } return SolanaAddress(std::move(bytes)); diff --git a/components/brave_wallet/common/solana_address.h b/components/brave_wallet/common/solana_address.h index 08da6215fc2..0e73fa9767c 100644 --- a/components/brave_wallet/common/solana_address.h +++ b/components/brave_wallet/common/solana_address.h @@ -6,11 +6,11 @@ #ifndef BRAVE_COMPONENTS_BRAVE_WALLET_COMMON_SOLANA_ADDRESS_H_ #define BRAVE_COMPONENTS_BRAVE_WALLET_COMMON_SOLANA_ADDRESS_H_ +#include #include #include #include "base/containers/span.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_wallet { @@ -26,10 +26,10 @@ class SolanaAddress { bool operator==(const SolanaAddress& other) const; bool operator!=(const SolanaAddress& other) const; - static absl::optional FromBytes( + static std::optional FromBytes( base::span bytes); - static absl::optional FromBytes(std::vector bytes); - static absl::optional FromBase58( + static std::optional FromBytes(std::vector bytes); + static std::optional FromBase58( const std::string& base58_string); static SolanaAddress ZeroAddress(); diff --git a/components/brave_wallet/common/solana_utils.cc b/components/brave_wallet/common/solana_utils.cc index d883326e2d9..1cd2c8018e3 100644 --- a/components/brave_wallet/common/solana_utils.cc +++ b/components/brave_wallet/common/solana_utils.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_wallet/common/solana_utils.h" +#include + #include "base/check.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" @@ -31,32 +33,32 @@ void CompactU16Encode(uint16_t u16, std::vector* compact_u16) { } } -absl::optional> CompactU16Decode( +std::optional> CompactU16Decode( const std::vector& bytes, size_t start_index) { uint32_t val = 0; for (size_t i = 0; i + start_index < bytes.size(); ++i) { if (i == 3) { // TooLong error. - return absl::nullopt; + return std::nullopt; } uint32_t elem = bytes[i + start_index]; uint32_t elem_val = elem & 0x7f; uint32_t elem_done = (elem & 0x80) == 0; if (i == 2 && !elem_done) { // ByteThreeContinues error. - return absl::nullopt; + return std::nullopt; } // Alias error. if (elem == 0 && i != 0) { - return absl::nullopt; + return std::nullopt; } val |= (elem_val) << (i * 7); // Overflow error. if (val > UINT16_MAX) { - return absl::nullopt; + return std::nullopt; } if (elem_done) { @@ -64,7 +66,7 @@ absl::optional> CompactU16Decode( } } - return absl::nullopt; + return std::nullopt; } bool IsBase58EncodedSolanaPubkey(const std::string& key) { @@ -96,7 +98,7 @@ bool Uint8ArrayDecode(const std::string& str, return true; } -absl::optional> CompactArrayDecode( +std::optional> CompactArrayDecode( const std::vector& bytes, size_t* bytes_index) { DCHECK(bytes_index); @@ -104,32 +106,32 @@ absl::optional> CompactArrayDecode( // Decode length. auto ret = CompactU16Decode(bytes, *bytes_index); if (!ret) { - return absl::nullopt; + return std::nullopt; } const uint16_t array_length = std::get<0>(*ret); *bytes_index += std::get<1>(*ret) /* array_length for encoded length */ + array_length; if (*bytes_index > bytes.size()) { - return absl::nullopt; + return std::nullopt; } return std::vector(bytes.begin() + *bytes_index - array_length, bytes.begin() + *bytes_index); } -absl::optional GetUint8FromStringDict(const base::Value::Dict& dict, - const std::string& key) { +std::optional GetUint8FromStringDict(const base::Value::Dict& dict, + const std::string& key) { const std::string* string_value = dict.FindString(key); if (!string_value) { - return absl::nullopt; + return std::nullopt; } unsigned val = 0; if (!base::StringToUint(*string_value, &val)) { - return absl::nullopt; + return std::nullopt; } if (val > UINT8_MAX) { - return absl::nullopt; + return std::nullopt; } return val; diff --git a/components/brave_wallet/common/solana_utils.h b/components/brave_wallet/common/solana_utils.h index d121befb062..3321bc7702a 100644 --- a/components/brave_wallet/common/solana_utils.h +++ b/components/brave_wallet/common/solana_utils.h @@ -6,13 +6,13 @@ #ifndef BRAVE_COMPONENTS_BRAVE_WALLET_COMMON_SOLANA_UTILS_H_ #define BRAVE_COMPONENTS_BRAVE_WALLET_COMMON_SOLANA_UTILS_H_ +#include #include #include #include #include "base/containers/span.h" #include "base/values.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_wallet { @@ -21,7 +21,7 @@ namespace brave_wallet { // https://docs.solana.com/developing/programming-model/transactions#compact-u16-format void CompactU16Encode(uint16_t u16, std::vector* compact_u16); -absl::optional> CompactU16Decode( +std::optional> CompactU16Decode( const std::vector& compact_u16, size_t start_index); @@ -31,13 +31,13 @@ bool Uint8ArrayDecode(const std::string& str, std::vector* ret, size_t len); -absl::optional GetUint8FromStringDict(const base::Value::Dict& dict, - const std::string& key); +std::optional GetUint8FromStringDict(const base::Value::Dict& dict, + const std::string& key); // A compact-array is serialized as the array length, followed by each array // item. bytes_index will be increased by the bytes read (consumed) in this // function. -absl::optional> CompactArrayDecode( +std::optional> CompactArrayDecode( const std::vector& bytes, size_t* bytes_index); diff --git a/components/brave_wallet/common/value_conversion_utils.cc b/components/brave_wallet/common/value_conversion_utils.cc index 565399f315e..98c7a4df2f6 100644 --- a/components/brave_wallet/common/value_conversion_utils.cc +++ b/components/brave_wallet/common/value_conversion_utils.cc @@ -3,6 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#include "brave/components/brave_wallet/common/value_conversion_utils.h" + +#include #include #include #include @@ -12,7 +15,6 @@ #include "base/values.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" #include "brave/components/brave_wallet/common/common_utils.h" -#include "brave/components/brave_wallet/common/value_conversion_utils.h" #include "net/base/url_util.h" namespace { @@ -59,7 +61,7 @@ bool ValueToNetworkInfoCommon(const base::Value& value, if (symbol) { chain->symbol = *symbol; } - absl::optional decimals = nativeCurrencyValue->FindInt("decimals"); + std::optional decimals = nativeCurrencyValue->FindInt("decimals"); if (decimals) { chain->decimals = decimals.value(); } @@ -72,15 +74,15 @@ bool ValueToNetworkInfoCommon(const base::Value& value, namespace brave_wallet { -absl::optional ExtractChainIdFromValue( +std::optional ExtractChainIdFromValue( const base::Value::Dict* dict) { if (!dict) { - return absl::nullopt; + return std::nullopt; } const std::string* chain_id = dict->FindString("chainId"); if (!chain_id) { - return absl::nullopt; + return std::nullopt; } return *chain_id; } @@ -284,26 +286,26 @@ mojom::BlockchainTokenPtr ValueToBlockchainToken(const base::Value::Dict& value, tokenPtr->logo = *logo; } - absl::optional is_erc20 = value.FindBool("is_erc20"); + std::optional is_erc20 = value.FindBool("is_erc20"); if (!is_erc20) { return nullptr; } tokenPtr->is_erc20 = is_erc20.value(); - absl::optional is_erc721 = value.FindBool("is_erc721"); + std::optional is_erc721 = value.FindBool("is_erc721"); if (!is_erc721) { return nullptr; } tokenPtr->is_erc721 = is_erc721.value(); - absl::optional is_erc1155 = value.FindBool("is_erc1155"); + std::optional is_erc1155 = value.FindBool("is_erc1155"); if (!is_erc1155) { is_erc1155 = false; } else { tokenPtr->is_erc1155 = is_erc1155.value(); } - absl::optional is_spam = value.FindBool("is_spam"); + std::optional is_spam = value.FindBool("is_spam"); if (!is_spam) { tokenPtr->is_spam = false; } else { @@ -312,20 +314,20 @@ mojom::BlockchainTokenPtr ValueToBlockchainToken(const base::Value::Dict& value, // There might be existing pref values that does not have is_nft yet, in this // case, fallback to is_erc721 value. - absl::optional is_nft = value.FindBool("is_nft"); + std::optional is_nft = value.FindBool("is_nft"); if (is_nft) { tokenPtr->is_nft = is_nft.value(); } else { tokenPtr->is_nft = tokenPtr->is_erc721; } - absl::optional decimals = value.FindInt("decimals"); + std::optional decimals = value.FindInt("decimals"); if (!decimals) { return nullptr; } tokenPtr->decimals = decimals.value(); - absl::optional visible = value.FindBool("visible"); + std::optional visible = value.FindBool("visible"); if (!visible) { return nullptr; } diff --git a/components/brave_wallet/common/value_conversion_utils.h b/components/brave_wallet/common/value_conversion_utils.h index 11c2eed00db..70e55cee2c6 100644 --- a/components/brave_wallet/common/value_conversion_utils.h +++ b/components/brave_wallet/common/value_conversion_utils.h @@ -6,17 +6,17 @@ #ifndef BRAVE_COMPONENTS_BRAVE_WALLET_COMMON_VALUE_CONVERSION_UTILS_H_ #define BRAVE_COMPONENTS_BRAVE_WALLET_COMMON_VALUE_CONVERSION_UTILS_H_ +#include #include #include #include "base/values.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/origin.h" namespace brave_wallet { -absl::optional ExtractChainIdFromValue( +std::optional ExtractChainIdFromValue( const base::Value::Dict* dict); base::Value::Dict NetworkInfoToValue(const mojom::NetworkInfo& info); mojom::NetworkInfoPtr ValueToNetworkInfo(const base::Value& value); diff --git a/components/brave_wallet/common/value_conversion_utils_unittest.cc b/components/brave_wallet/common/value_conversion_utils_unittest.cc index 1f3f28ad0d4..f2a5e292cf2 100644 --- a/components/brave_wallet/common/value_conversion_utils_unittest.cc +++ b/components/brave_wallet/common/value_conversion_utils_unittest.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/common/value_conversion_utils.h" +#include #include #include @@ -420,8 +421,8 @@ TEST(ValueConversionUtilsUnitTest, PermissionRequestResponseToValue) { std::string* type = caveats0.FindString("type"); ASSERT_NE(type, nullptr); EXPECT_EQ(*type, "limitResponseLength"); - absl::optional primary_accounts_only_value = caveats0.FindInt("value"); - ASSERT_NE(primary_accounts_only_value, absl::nullopt); + std::optional primary_accounts_only_value = caveats0.FindInt("value"); + ASSERT_NE(primary_accounts_only_value, std::nullopt); EXPECT_EQ(*primary_accounts_only_value, 1); auto& caveats1 = (*caveats)[1].GetDict(); @@ -442,8 +443,8 @@ TEST(ValueConversionUtilsUnitTest, PermissionRequestResponseToValue) { ASSERT_EQ(context->size(), 1UL); EXPECT_EQ((*context)[0], base::Value("https://github.com/MetaMask/rpc-cap")); - absl::optional date = param0.FindDouble("date"); - ASSERT_NE(date, absl::nullopt); + std::optional date = param0.FindDouble("date"); + ASSERT_NE(date, std::nullopt); std::string* id = param0.FindString("id"); ASSERT_NE(id, nullptr); diff --git a/components/brave_wallet/common/zcash_utils.cc b/components/brave_wallet/common/zcash_utils.cc index 77b1eb6f6c2..fcec28ad2e6 100644 --- a/components/brave_wallet/common/zcash_utils.cc +++ b/components/brave_wallet/common/zcash_utils.cc @@ -5,6 +5,8 @@ #include "brave/components/brave_wallet/common/zcash_utils.h" +#include + #include "brave/components/brave_wallet/common/btc_like_serializer_stream.h" #include "brave/components/brave_wallet/common/encoding_utils.h" #include "brave/components/brave_wallet/common/hash_utils.h" @@ -41,19 +43,19 @@ std::string PubkeyToTransparentAddress(const std::vector& pubkey, return Base58EncodeWithCheck(result); } -absl::optional DecodeZCashAddress( +std::optional DecodeZCashAddress( const std::string& address) { std::vector decode_result; if (!DecodeBase58Check(address, decode_result, kPubKeyHashSize + kPrefixSize)) { - return absl::nullopt; + return std::nullopt; } bool is_testnet = decode_result[0] == 0x1d && decode_result[1] == 0x25; bool is_mainnet = decode_result[0] == 0x1c && decode_result[1] == 0xb8; if (!is_testnet && !is_mainnet) { - return absl::nullopt; + return std::nullopt; } std::vector body(decode_result.begin() + kPrefixSize, diff --git a/components/brave_wallet/common/zcash_utils.h b/components/brave_wallet/common/zcash_utils.h index 43ecd4babd3..70687f0a17d 100644 --- a/components/brave_wallet/common/zcash_utils.h +++ b/components/brave_wallet/common/zcash_utils.h @@ -6,10 +6,10 @@ #ifndef BRAVE_COMPONENTS_BRAVE_WALLET_COMMON_ZCASH_UTILS_H_ #define BRAVE_COMPONENTS_BRAVE_WALLET_COMMON_ZCASH_UTILS_H_ +#include #include #include -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_wallet { @@ -30,7 +30,7 @@ bool IsValidZCashAddress(const std::string& address); std::string PubkeyToTransparentAddress(const std::vector& pubkey, bool testnet); -absl::optional DecodeZCashAddress( +std::optional DecodeZCashAddress( const std::string& address); std::vector ZCashAddressToScriptPubkey(const std::string& address, diff --git a/components/brave_wallet/renderer/js_ethereum_provider.h b/components/brave_wallet/renderer/js_ethereum_provider.h index 1bac2ca31c3..78f1042ac80 100644 --- a/components/brave_wallet/renderer/js_ethereum_provider.h +++ b/components/brave_wallet/renderer/js_ethereum_provider.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_WALLET_RENDERER_JS_ETHEREUM_PROVIDER_H_ #include +#include #include #include @@ -135,7 +136,7 @@ class JSEthereumProvider final : public gin::Wrappable, std::string chain_id_; std::string first_allowed_account_; std::string uuid_; - absl::optional brave_wallet_image_; + std::optional brave_wallet_image_; base::WeakPtrFactory weak_ptr_factory_{this}; }; diff --git a/components/brave_wallet/renderer/js_solana_provider.cc b/components/brave_wallet/renderer/js_solana_provider.cc index fb9a02dd105..d2b13e9b086 100644 --- a/components/brave_wallet/renderer/js_solana_provider.cc +++ b/components/brave_wallet/renderer/js_solana_provider.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/renderer/js_solana_provider.h" +#include #include #include @@ -231,7 +232,7 @@ const char* JSSolanaProvider::GetTypeName() { } void JSSolanaProvider::AccountChangedEvent( - const absl::optional& account) { + const std::optional& account) { if (!render_frame()) { return; } @@ -319,7 +320,7 @@ v8::Local JSSolanaProvider::Connect(gin::Arguments* arguments) { } // Get base::Value arg to pass and ignore extra parameters - absl::optional arg = absl::nullopt; + std::optional arg = std::nullopt; v8::Local v8_arg; if (arguments->Length() >= 1 && !arguments->GetNext(&v8_arg)) { arguments->ThrowTypeError( @@ -395,7 +396,7 @@ v8::Local JSSolanaProvider::SignAndSendTransaction( return v8::Local(); } - absl::optional send_options = absl::nullopt; + std::optional send_options = std::nullopt; v8::Local v8_send_options; if (arguments->Length() > 1 && !arguments->GetNext(&v8_send_options)) { arguments->ThrowTypeError( @@ -453,7 +454,7 @@ v8::Local JSSolanaProvider::SignMessage( return v8::Local(); } - absl::optional display_str = absl::nullopt; + std::optional display_str = std::nullopt; v8::Local display; if (arguments->GetNext(&display)) { std::unique_ptr display_value = @@ -881,10 +882,10 @@ void JSSolanaProvider::SendResponse( } } -absl::optional JSSolanaProvider::GetSerializedMessage( +std::optional JSSolanaProvider::GetSerializedMessage( v8::Local transaction) { if (!render_frame()) { - return absl::nullopt; + return std::nullopt; } v8::Isolate* isolate = blink::MainThreadIsolate(); v8::Local context = isolate->GetCurrentContext(); @@ -904,54 +905,54 @@ absl::optional JSSolanaProvider::GetSerializedMessage( } if (serialized_msg.IsEmpty()) { - return absl::nullopt; + return std::nullopt; } std::unique_ptr blob_value = v8_value_converter_->FromV8Value( serialized_msg.ToLocalChecked(), context); if (!blob_value->is_blob()) { - return absl::nullopt; + return std::nullopt; } return Base58Encode(blob_value->GetBlob()); } -absl::optional> +std::optional> JSSolanaProvider::GetSignatureBlobFromV8Signature( const v8::Local& v8_signature, const v8::Local& context) { std::unique_ptr sig_blob_value = v8_value_converter_->FromV8Value(v8_signature, context); if (!sig_blob_value || !sig_blob_value->is_blob()) { - return absl::nullopt; + return std::nullopt; } return sig_blob_value->GetBlob(); } -absl::optional JSSolanaProvider::GetPubkeyStringFromV8Pubkey( +std::optional JSSolanaProvider::GetPubkeyStringFromV8Pubkey( const v8::Local& v8_pubkey_object, const v8::Local& context) { v8::MaybeLocal v8_pubkey = CallMethodOfObject(render_frame()->GetWebFrame(), v8_pubkey_object, kToString, std::vector>()); if (v8_pubkey.IsEmpty()) { - return absl::nullopt; + return std::nullopt; } std::unique_ptr pubkey_value = v8_value_converter_->FromV8Value(v8_pubkey.ToLocalChecked(), context); if (!pubkey_value || !pubkey_value->is_string()) { - return absl::nullopt; + return std::nullopt; } return pubkey_value->GetString(); } -absl::optional> +std::optional> JSSolanaProvider::GetSignatures(v8::Local transaction) { if (!render_frame()) { - return absl::nullopt; + return std::nullopt; } v8::Isolate* isolate = blink::MainThreadIsolate(); v8::Local context = isolate->GetCurrentContext(); @@ -978,7 +979,7 @@ JSSolanaProvider::GetSignatures(v8::Local transaction) { static_account_keys.As(); uint32_t static_account_keys_count = static_account_keys_array->Length(); if (static_account_keys_count < signatures_count) { - return absl::nullopt; + return std::nullopt; } for (uint32_t i = 0; i < signatures_count; ++i) { @@ -988,7 +989,7 @@ JSSolanaProvider::GetSignatures(v8::Local transaction) { auto signature_blob = GetSignatureBlobFromV8Signature(v8_signature, context); if (!signature_blob) { - return absl::nullopt; + return std::nullopt; } // Get pubkey. @@ -997,7 +998,7 @@ JSSolanaProvider::GetSignatures(v8::Local transaction) { auto pubkey_string = GetPubkeyStringFromV8Pubkey(v8_pubkey_object, context); if (!pubkey_string) { - return absl::nullopt; + return std::nullopt; } sig_pubkey_pairs.push_back( mojom::SignaturePubkeyPair::New(signature_blob, *pubkey_string)); @@ -1010,11 +1011,11 @@ JSSolanaProvider::GetSignatures(v8::Local transaction) { signatures_array->Get(context, i).ToLocalChecked(); CHECK(GetProperty(context, v8_sig_pubkey_pair, kSignature) .ToLocal(&v8_signature)); - absl::optional> signature_blob = absl::nullopt; + std::optional> signature_blob = std::nullopt; if (!v8_signature->IsNullOrUndefined()) { signature_blob = GetSignatureBlobFromV8Signature(v8_signature, context); if (!signature_blob) { - return absl::nullopt; + return std::nullopt; } } @@ -1025,7 +1026,7 @@ JSSolanaProvider::GetSignatures(v8::Local transaction) { auto pubkey_string = GetPubkeyStringFromV8Pubkey(v8_pubkey_object, context); if (!pubkey_string) { - return absl::nullopt; + return std::nullopt; } sig_pubkey_pairs.push_back( @@ -1038,12 +1039,12 @@ JSSolanaProvider::GetSignatures(v8::Local transaction) { mojom::SolanaSignTransactionParamPtr JSSolanaProvider::GetSignTransactionParam( v8::Local transaction) { - absl::optional serialized_message = + std::optional serialized_message = GetSerializedMessage(transaction); if (!serialized_message) { return nullptr; } - absl::optional> signatures = + std::optional> signatures = GetSignatures(transaction); if (!signatures) { return nullptr; diff --git a/components/brave_wallet/renderer/js_solana_provider.h b/components/brave_wallet/renderer/js_solana_provider.h index 4321584baf9..7d2f0ae857f 100644 --- a/components/brave_wallet/renderer/js_solana_provider.h +++ b/components/brave_wallet/renderer/js_solana_provider.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_WALLET_RENDERER_JS_SOLANA_PROVIDER_H_ #include +#include #include #include @@ -50,7 +51,7 @@ class JSSolanaProvider final : public gin::Wrappable, const char* GetTypeName() override; // mojom::SolanaEventsListener - void AccountChangedEvent(const absl::optional& account) override; + void AccountChangedEvent(const std::optional& account) override; void DisconnectEvent() override; private: @@ -161,18 +162,18 @@ class JSSolanaProvider final : public gin::Wrappable, bool success); // Get solanaWeb3.Transaction.serializedMessage with base58 encoding - absl::optional GetSerializedMessage( + std::optional GetSerializedMessage( v8::Local transaction); - absl::optional> GetSignatureBlobFromV8Signature( + std::optional> GetSignatureBlobFromV8Signature( const v8::Local& v8_signature, const v8::Local& context); - absl::optional GetPubkeyStringFromV8Pubkey( + std::optional GetPubkeyStringFromV8Pubkey( const v8::Local& v8_pubkey_object, const v8::Local& context); - absl::optional> GetSignatures( + std::optional> GetSignatures( v8::Local transaction); mojom::SolanaSignTransactionParamPtr GetSignTransactionParam( diff --git a/components/brave_wallet/renderer/resource_helper.cc b/components/brave_wallet/renderer/resource_helper.cc index b5c4c1eecb8..e82dc4ffae2 100644 --- a/components/brave_wallet/renderer/resource_helper.cc +++ b/components/brave_wallet/renderer/resource_helper.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_wallet/renderer/resource_helper.h" +#include #include #include "base/base64.h" @@ -23,7 +24,7 @@ std::string LoadDataResource(const int id) { return std::string(resource_bundle.GetRawDataResource(id)); } -absl::optional LoadImageResourceAsDataUrl(const int id) { +std::optional LoadImageResourceAsDataUrl(const int id) { auto& resource_bundle = ui::ResourceBundle::GetSharedInstance(); if (resource_bundle.IsGzipped(id)) { return resource_bundle.LoadDataResourceString(id); @@ -31,14 +32,14 @@ absl::optional LoadImageResourceAsDataUrl(const int id) { auto image = resource_bundle.GetImageNamed(id); if (image.IsEmpty()) { - return absl::nullopt; + return std::nullopt; } std::vector data; if (!gfx::PNGCodec::EncodeBGRASkBitmap(image.AsBitmap(), /*discard_transparency=*/false, &data)) { - return absl::nullopt; + return std::nullopt; } return "data:image/png;base64," + base::Base64Encode(data); diff --git a/components/brave_wallet/renderer/resource_helper.h b/components/brave_wallet/renderer/resource_helper.h index e1a2e4bb30c..1dc3dcd617b 100644 --- a/components/brave_wallet/renderer/resource_helper.h +++ b/components/brave_wallet/renderer/resource_helper.h @@ -6,14 +6,14 @@ #ifndef BRAVE_COMPONENTS_BRAVE_WALLET_RENDERER_RESOURCE_HELPER_H_ #define BRAVE_COMPONENTS_BRAVE_WALLET_RENDERER_RESOURCE_HELPER_H_ +#include #include -#include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_wallet { std::string LoadDataResource(const int id); -absl::optional LoadImageResourceAsDataUrl(const int id); +std::optional LoadImageResourceAsDataUrl(const int id); } // namespace brave_wallet diff --git a/components/brave_wallet/renderer/v8_helper.h b/components/brave_wallet/renderer/v8_helper.h index f49ed0b004a..d25d7898eb3 100644 --- a/components/brave_wallet/renderer/v8_helper.h +++ b/components/brave_wallet/renderer/v8_helper.h @@ -10,7 +10,6 @@ #include #include -#include "third_party/abseil-cpp/absl/types/optional.h" #include "v8/include/v8-context.h" #include "v8/include/v8-local-handle.h" #include "v8/include/v8-value.h" diff --git a/components/brave_webtorrent/browser/magnet_protocol_handler.cc b/components/brave_webtorrent/browser/magnet_protocol_handler.cc index ed32839404b..0a932b53e42 100644 --- a/components/brave_webtorrent/browser/magnet_protocol_handler.cc +++ b/components/brave_webtorrent/browser/magnet_protocol_handler.cc @@ -5,6 +5,7 @@ #include "brave/components/brave_webtorrent/browser/magnet_protocol_handler.h" +#include #include #include @@ -37,7 +38,7 @@ void LoadMagnetURL(const GURL& url, ui::PageTransition page_transition, bool has_user_gesture, bool is_in_fenced_frame_tree, - const absl::optional& initiating_origin, + const std::optional& initiating_origin, content::WeakDocumentPtr initiator_document) { content::WebContents* web_contents = web_contents_getter.Run(); if (!web_contents) { @@ -127,7 +128,7 @@ bool HandleMagnetProtocol(const GURL& url, ui::PageTransition page_transition, bool has_user_gesture, bool is_in_fenced_frame_tree, - const absl::optional& initiating_origin, + const std::optional& initiating_origin, content::WeakDocumentPtr initiator_document) { if (!IsMagnetProtocol(url)) { return false; diff --git a/components/brave_webtorrent/browser/magnet_protocol_handler.h b/components/brave_webtorrent/browser/magnet_protocol_handler.h index e862c75edf4..9154d510467 100644 --- a/components/brave_webtorrent/browser/magnet_protocol_handler.h +++ b/components/brave_webtorrent/browser/magnet_protocol_handler.h @@ -6,6 +6,8 @@ #ifndef BRAVE_COMPONENTS_BRAVE_WEBTORRENT_BROWSER_MAGNET_PROTOCOL_HANDLER_H_ #define BRAVE_COMPONENTS_BRAVE_WEBTORRENT_BROWSER_MAGNET_PROTOCOL_HANDLER_H_ +#include + #include "brave/components/brave_webtorrent/browser/webtorrent_util.h" #include "content/public/browser/weak_document_ptr.h" #include "content/public/browser/web_contents.h" @@ -36,7 +38,7 @@ bool HandleMagnetProtocol(const GURL& url, ui::PageTransition page_transition, bool has_user_gesture, bool is_in_fenced_frame_tree, - const absl::optional& initiating_origin, + const std::optional& initiating_origin, content::WeakDocumentPtr initiator_document); } // namespace webtorrent diff --git a/components/content_settings/core/browser/brave_content_settings_pref_provider.cc b/components/content_settings/core/browser/brave_content_settings_pref_provider.cc index 04b8fbb3464..cea03346f17 100644 --- a/components/content_settings/core/browser/brave_content_settings_pref_provider.cc +++ b/components/content_settings/core/browser/brave_content_settings_pref_provider.cc @@ -38,7 +38,6 @@ #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace content_settings { diff --git a/components/content_settings/core/browser/brave_content_settings_pref_provider_unittest.cc b/components/content_settings/core/browser/brave_content_settings_pref_provider_unittest.cc index 86bb8754d4d..35aad43fc47 100644 --- a/components/content_settings/core/browser/brave_content_settings_pref_provider_unittest.cc +++ b/components/content_settings/core/browser/brave_content_settings_pref_provider_unittest.cc @@ -3,7 +3,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include "brave/components/content_settings/core/browser/brave_content_settings_pref_provider.h" + #include +#include #include #include @@ -12,7 +15,6 @@ #include "base/values.h" #include "brave/components/brave_shields/common/brave_shield_constants.h" #include "brave/components/constants/pref_names.h" -#include "brave/components/content_settings/core/browser/brave_content_settings_pref_provider.h" #include "brave/components/content_settings/core/browser/brave_content_settings_utils.h" #include "chrome/test/base/testing_profile.h" #include "components/content_settings/core/browser/content_settings_pref.h" @@ -26,7 +28,6 @@ #include "components/prefs/scoped_user_pref_update.h" #include "content/public/test/browser_task_environment.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h" namespace content_settings { @@ -106,8 +107,8 @@ void InitializeUnsupportedShieldSettingInDictionary( void CheckMigrationFromResourceIdentifierForDictionary( const base::Value::Dict& dict, std::string_view patterns_string, - const absl::optional expected_last_modified, - absl::optional expected_setting_value) { + const std::optional expected_last_modified, + std::optional expected_setting_value) { const base::Value::Dict* settings_dict = dict.FindDict(patterns_string); EXPECT_NE(settings_dict, nullptr); @@ -529,8 +530,8 @@ TEST_F(BravePrefProviderTest, TestShieldsSettingsMigrationFromResourceIDs) { // Manually write settings under the PLUGINS type using the no longer existing // ResourceIdentifier names, and then perform the migration. - absl::optional plugins(absl::in_place, pref_service, - kUserProfilePluginsPath); + std::optional plugins(std::in_place, pref_service, + kUserProfilePluginsPath); base::Time expected_last_modified = base::Time::Now(); @@ -561,7 +562,7 @@ TEST_F(BravePrefProviderTest, TestShieldsSettingsMigrationFromResourceIDs) { // Destroying `plugins` at this point, as otherwise it will be holding a // dangling pointer, after `MigrateShieldsSettingsFromResourceIds()`. - plugins = absl::nullopt; + plugins = std::nullopt; provider.MigrateShieldsSettingsFromResourceIds(); @@ -598,8 +599,8 @@ TEST_F(BravePrefProviderTest, TestShieldsSettingsMigrationFromUnknownSettings) { // Manually write invalid settings under the PLUGINS type using the no longer // existing ResourceIdentifier names, to attempt the migration. - absl::optional plugins(absl::in_place, pref_service, - kUserProfilePluginsPath); + std::optional plugins(std::in_place, pref_service, + kUserProfilePluginsPath); // Seed both global and per-site shield settings preferences using unsupported // names, so that we can test that Brave doesn't crash while attempting the @@ -618,7 +619,7 @@ TEST_F(BravePrefProviderTest, TestShieldsSettingsMigrationFromUnknownSettings) { // Destroying `plugins` at this point, as otherwise it will be holding a // dangling pointer, after `MigrateShieldsSettingsFromResourceIds()`. - plugins = absl::nullopt; + plugins = std::nullopt; // Doing the migration below should NOT get a crash due to invalid settings. provider.MigrateShieldsSettingsFromResourceIds(); diff --git a/components/content_settings/core/browser/brave_content_settings_utils.cc b/components/content_settings/core/browser/brave_content_settings_utils.cc index ef04f7e7220..0e57b2f4a99 100644 --- a/components/content_settings/core/browser/brave_content_settings_utils.cc +++ b/components/content_settings/core/browser/brave_content_settings_utils.cc @@ -6,6 +6,7 @@ #include "brave/components/content_settings/core/browser/brave_content_settings_utils.h" #include +#include #include "base/containers/contains.h" #include "base/no_destructor.h" @@ -13,7 +14,6 @@ #include "base/strings/string_number_conversions.h" #include "base/values.h" #include "brave/components/brave_shields/common/brave_shield_constants.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h" namespace { @@ -100,12 +100,12 @@ bool IsShieldsContentSettingsTypeName(const std::string& content_type_name) { return false; } -absl::optional ConvertPatternToWildcardSchemeAndPort( +std::optional ConvertPatternToWildcardSchemeAndPort( const ContentSettingsPattern& pattern) { if (!CanPatternBeConvertedToWildcardSchemeAndPort(pattern)) - return absl::nullopt; + return std::nullopt; DCHECK(!pattern.GetHost().empty()); - absl::optional new_pattern = + std::optional new_pattern = ContentSettingsPattern::FromString("*://" + pattern.GetHost() + "/*"); return new_pattern; } @@ -121,7 +121,7 @@ std::string GetShieldsSettingUserPrefsPath(const std::string& name) { content_settings::SessionModel GetSessionModelFromDictionary( const base::Value::Dict& dict, const char* key) { - absl::optional model_int = dict.FindInt(key); + std::optional model_int = dict.FindInt(key); if (!model_int.has_value() || (model_int > static_cast(content_settings::SessionModel::kMaxValue)) || diff --git a/components/content_settings/core/browser/brave_content_settings_utils.h b/components/content_settings/core/browser/brave_content_settings_utils.h index efe16672254..b8232e21064 100644 --- a/components/content_settings/core/browser/brave_content_settings_utils.h +++ b/components/content_settings/core/browser/brave_content_settings_utils.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_BRAVE_CONTENT_SETTINGS_UTILS_H_ #define BRAVE_COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_BRAVE_CONTENT_SETTINGS_UTILS_H_ +#include #include #include @@ -24,7 +25,7 @@ bool IsShieldsContentSettingsType(const ContentSettingsType& content_type); bool IsShieldsContentSettingsTypeName(const std::string& content_type_name); -absl::optional ConvertPatternToWildcardSchemeAndPort( +std::optional ConvertPatternToWildcardSchemeAndPort( const ContentSettingsPattern& pattern); std::string GetShieldsSettingUserPrefsPath(const std::string& name); diff --git a/components/content_settings/core/browser/brave_content_settings_utils_unittest.cc b/components/content_settings/core/browser/brave_content_settings_utils_unittest.cc index 0de271b2e68..5801efb9593 100644 --- a/components/content_settings/core/browser/brave_content_settings_utils_unittest.cc +++ b/components/content_settings/core/browser/brave_content_settings_utils_unittest.cc @@ -3,14 +3,15 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include - #include "brave/components/content_settings/core/browser/brave_content_settings_utils.h" + +#include +#include + #include "chrome/test/base/testing_profile.h" #include "components/content_settings/core/common/content_settings_pattern.h" #include "content/public/test/browser_task_environment.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h" using content_settings::ConvertPatternToWildcardSchemeAndPort; @@ -35,36 +36,36 @@ class BraveContentSettingsUtilsTest : public testing::Test { TEST_F(BraveContentSettingsUtilsTest, TestConvertPatternToWildcardSchemeAndPort) { // Full wildcard pattern. - EXPECT_EQ(absl::nullopt, ConvertPatternToWildcardSchemeAndPort( - ContentSettingsPattern::Wildcard())); + EXPECT_EQ(std::nullopt, ConvertPatternToWildcardSchemeAndPort( + ContentSettingsPattern::Wildcard())); // Brave first party placeholder pattern. - EXPECT_EQ(absl::nullopt, + EXPECT_EQ(std::nullopt, ConvertPatternToWildcardSchemeAndPort( ContentSettingsPattern::FromString("https://firstParty/*"))); // file:// scheme pattern. - EXPECT_EQ(absl::nullopt, + EXPECT_EQ(std::nullopt, ConvertPatternToWildcardSchemeAndPort( ContentSettingsPattern::FromString("file:///a/b/c.zip"))); // Wildcard host pattern. - EXPECT_EQ(absl::nullopt, + EXPECT_EQ(std::nullopt, ConvertPatternToWildcardSchemeAndPort( ContentSettingsPattern::FromString("http://*:8080/*"))); // Wildcard scheme, no port. - EXPECT_EQ(absl::nullopt, + EXPECT_EQ(std::nullopt, ConvertPatternToWildcardSchemeAndPort( ContentSettingsPattern::FromString("*://brave.com/*"))); - EXPECT_EQ(absl::nullopt, + EXPECT_EQ(std::nullopt, ConvertPatternToWildcardSchemeAndPort( ContentSettingsPattern::FromString("*://brave.com:*/"))); // Wildcard scheme, has port. auto pattern = ConvertPatternToWildcardSchemeAndPort( ContentSettingsPattern::FromString("*://brave.com:8080/*")); - EXPECT_NE(absl::nullopt, pattern); + EXPECT_NE(std::nullopt, pattern); EXPECT_EQ(pattern->ToString(), "brave.com"); EXPECT_TRUE(pattern->Matches(GURL("http://brave.com:80/path1"))); EXPECT_TRUE(pattern->Matches(GURL("https://brave.com/path2"))); @@ -74,7 +75,7 @@ TEST_F(BraveContentSettingsUtilsTest, // Scheme, no port. pattern = ConvertPatternToWildcardSchemeAndPort( ContentSettingsPattern::FromString("http://brave.com/")); - EXPECT_NE(absl::nullopt, pattern); + EXPECT_NE(std::nullopt, pattern); EXPECT_EQ(pattern->ToString(), "brave.com"); EXPECT_TRUE(pattern->Matches(GURL("ftp://brave.com:80/path1"))); EXPECT_TRUE(pattern->Matches(GURL("https://brave.com/path2"))); @@ -84,7 +85,7 @@ TEST_F(BraveContentSettingsUtilsTest, // Scheme and port. pattern = ConvertPatternToWildcardSchemeAndPort( ContentSettingsPattern::FromString("https://brave.com:56558/")); - EXPECT_NE(absl::nullopt, pattern); + EXPECT_NE(std::nullopt, pattern); EXPECT_EQ(pattern->ToString(), "brave.com"); EXPECT_TRUE(pattern->Matches(GURL("wss://brave.com:80/path1"))); EXPECT_TRUE(pattern->Matches(GURL("https://brave.com/path2"))); diff --git a/components/content_settings/renderer/brave_content_settings_agent_impl.cc b/components/content_settings/renderer/brave_content_settings_agent_impl.cc index 1991b0add73..14c239a23f3 100644 --- a/components/content_settings/renderer/brave_content_settings_agent_impl.cc +++ b/components/content_settings/renderer/brave_content_settings_agent_impl.cc @@ -6,6 +6,7 @@ #include "brave/components/content_settings/renderer/brave_content_settings_agent_impl.h" #include +#include #include #include #include @@ -195,7 +196,7 @@ BraveContentSettingsAgentImpl::GetEphemeralStorageOriginSync() { return {}; } - absl::optional optional_ephemeral_storage_origin; + std::optional optional_ephemeral_storage_origin; GetContentSettingsManager().AllowEphemeralStorageAccess( routing_id(), frame_origin, frame->GetDocument().SiteForCookies(), top_origin, &optional_ephemeral_storage_origin); diff --git a/components/cosmetic_filters/browser/cosmetic_filters_resources.cc b/components/cosmetic_filters/browser/cosmetic_filters_resources.cc index 511aef0fd71..28a9e40e873 100644 --- a/components/cosmetic_filters/browser/cosmetic_filters_resources.cc +++ b/components/cosmetic_filters/browser/cosmetic_filters_resources.cc @@ -5,6 +5,7 @@ #include "brave/components/cosmetic_filters/browser/cosmetic_filters_resources.h" +#include #include #include "base/json/json_reader.h" @@ -12,7 +13,6 @@ #include "brave/components/brave_shields/browser/ad_block_service.h" #include "brave/components/brave_shields/browser/brave_shields_util.h" #include "components/content_settings/core/browser/host_content_settings_map.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace cosmetic_filters { @@ -27,7 +27,7 @@ void CosmeticFiltersResources::HiddenClassIdSelectors( const std::vector& exceptions, HiddenClassIdSelectorsCallback callback) { DCHECK(ad_block_service_->GetTaskRunner()->RunsTasksInCurrentSequence()); - absl::optional input_value = base::JSONReader::Read(input); + std::optional input_value = base::JSONReader::Read(input); if (!input_value) { // Nothing to work with std::move(callback).Run(base::Value::Dict()); diff --git a/components/cosmetic_filters/browser/cosmetic_filters_resources.h b/components/cosmetic_filters/browser/cosmetic_filters_resources.h index d64634bcc83..5ada732cfc7 100644 --- a/components/cosmetic_filters/browser/cosmetic_filters_resources.h +++ b/components/cosmetic_filters/browser/cosmetic_filters_resources.h @@ -14,7 +14,6 @@ #include "base/memory/raw_ptr.h" #include "base/values.h" #include "brave/components/cosmetic_filters/common/cosmetic_filters.mojom.h" -#include "third_party/abseil-cpp/absl/types/optional.h" class HostContentSettingsMap; diff --git a/components/cosmetic_filters/renderer/cosmetic_filters_js_handler.cc b/components/cosmetic_filters/renderer/cosmetic_filters_js_handler.cc index 248613378cf..9c6c15f16d5 100644 --- a/components/cosmetic_filters/renderer/cosmetic_filters_js_handler.cc +++ b/components/cosmetic_filters/renderer/cosmetic_filters_js_handler.cc @@ -5,6 +5,7 @@ #include "brave/components/cosmetic_filters/renderer/cosmetic_filters_js_handler.h" +#include #include #include "base/feature_list.h" @@ -338,8 +339,8 @@ void CosmeticFiltersJSHandler::OnRemoteDisconnect() { bool CosmeticFiltersJSHandler::ProcessURL( const GURL& url, - absl::optional callback) { - resources_dict_ = absl::nullopt; + std::optional callback) { + resources_dict_ = std::nullopt; url_ = url; enabled_1st_party_cf_ = false; diff --git a/components/cosmetic_filters/renderer/cosmetic_filters_js_handler.h b/components/cosmetic_filters/renderer/cosmetic_filters_js_handler.h index 3f3c7fdfedd..ffeb4d102ad 100644 --- a/components/cosmetic_filters/renderer/cosmetic_filters_js_handler.h +++ b/components/cosmetic_filters/renderer/cosmetic_filters_js_handler.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_COSMETIC_FILTERS_RENDERER_COSMETIC_FILTERS_JS_HANDLER_H_ #include +#include #include #include @@ -16,7 +17,6 @@ #include "content/public/renderer/render_frame.h" #include "content/public/renderer/render_frame_observer.h" #include "mojo/public/cpp/bindings/remote.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h" #include "v8/include/v8.h" @@ -38,7 +38,7 @@ class CosmeticFiltersJSHandler { // Fetches an initial set of resources to inject into the page if cosmetic // filtering is enabled, and returns whether or not to proceed with cosmetic // filtering. - bool ProcessURL(const GURL& url, absl::optional callback); + bool ProcessURL(const GURL& url, std::optional callback); void ApplyRules(bool de_amp_enabled); private: @@ -81,7 +81,7 @@ class CosmeticFiltersJSHandler { bool enabled_1st_party_cf_; std::vector exceptions_; GURL url_; - absl::optional resources_dict_; + std::optional resources_dict_; // True if the content_cosmetic.bundle.js has injected in the current frame. bool bundle_injected_ = false; diff --git a/components/cosmetic_filters/renderer/cosmetic_filters_js_render_frame_observer.cc b/components/cosmetic_filters/renderer/cosmetic_filters_js_render_frame_observer.cc index 4fa49514ecb..83894cb4bf9 100644 --- a/components/cosmetic_filters/renderer/cosmetic_filters_js_render_frame_observer.cc +++ b/components/cosmetic_filters/renderer/cosmetic_filters_js_render_frame_observer.cc @@ -6,6 +6,7 @@ #include "brave/components/cosmetic_filters/renderer/cosmetic_filters_js_render_frame_observer.h" #include +#include #include #include "base/feature_list.h" @@ -13,7 +14,6 @@ #include "brave/components/brave_shields/common/features.h" #include "brave/components/de_amp/common/features.h" #include "content/public/renderer/render_frame.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/blink/public/platform/web_isolated_world_info.h" #include "third_party/blink/public/platform/web_url.h" #include "third_party/blink/public/web/web_local_frame.h" @@ -25,7 +25,7 @@ namespace { const char kSecurityOrigin[] = "chrome://cosmetic_filters"; void EnsureIsolatedWorldInitialized(int world_id) { - static absl::optional last_used_world_id; + static std::optional last_used_world_id; if (last_used_world_id) { // Early return since the isolated world info. is already initialized. DCHECK_EQ(*last_used_world_id, world_id) @@ -68,7 +68,7 @@ CosmeticFiltersJsRenderFrameObserver::~CosmeticFiltersJsRenderFrameObserver() = void CosmeticFiltersJsRenderFrameObserver::DidStartNavigation( const GURL& url, - absl::optional navigation_type) { + std::optional navigation_type) { url_ = url; } @@ -90,12 +90,12 @@ void CosmeticFiltersJsRenderFrameObserver::ReadyToCommitNavigation( if (base::FeatureList::IsEnabled( ::brave_shields::features::kCosmeticFilteringSyncLoad)) { - if (native_javascript_handle_->ProcessURL(url_, absl::nullopt)) { + if (native_javascript_handle_->ProcessURL(url_, std::nullopt)) { ready_->Signal(); } } else { native_javascript_handle_->ProcessURL( - url_, absl::make_optional(base::BindOnce( + url_, std::make_optional(base::BindOnce( &CosmeticFiltersJsRenderFrameObserver::OnProcessURL, weak_factory_.GetWeakPtr()))); } diff --git a/components/cosmetic_filters/renderer/cosmetic_filters_js_render_frame_observer.h b/components/cosmetic_filters/renderer/cosmetic_filters_js_render_frame_observer.h index 2e9eefe77ff..1773a95700d 100644 --- a/components/cosmetic_filters/renderer/cosmetic_filters_js_render_frame_observer.h +++ b/components/cosmetic_filters/renderer/cosmetic_filters_js_render_frame_observer.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_COSMETIC_FILTERS_RENDERER_COSMETIC_FILTERS_JS_RENDER_FRAME_OBSERVER_H_ #include +#include #include "base/memory/weak_ptr.h" #include "base/one_shot_event.h" @@ -14,7 +15,6 @@ #include "content/public/renderer/render_frame.h" #include "content/public/renderer/render_frame_observer.h" #include "content/public/renderer/render_frame_observer_tracker.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/blink/public/web/web_navigation_type.h" #include "url/gurl.h" #include "v8/include/v8.h" @@ -42,7 +42,7 @@ class CosmeticFiltersJsRenderFrameObserver // RenderFrameObserver implementation. void DidStartNavigation( const GURL& url, - absl::optional navigation_type) override; + std::optional navigation_type) override; void ReadyToCommitNavigation( blink::WebDocumentLoader* document_loader) override; diff --git a/components/debounce/browser/debounce_rule.cc b/components/debounce/browser/debounce_rule.cc index f7863645f04..a7cafe7c102 100644 --- a/components/debounce/browser/debounce_rule.cc +++ b/components/debounce/browser/debounce_rule.cc @@ -6,6 +6,7 @@ #include "brave/components/debounce/browser/debounce_rule.h" #include +#include #include #include #include @@ -151,7 +152,7 @@ DebounceRule::ParseRules(const std::string& contents) { if (contents.empty()) { return base::unexpected("Could not obtain debounce configuration"); } - absl::optional root = base::JSONReader::Read(contents); + std::optional root = base::JSONReader::Read(contents); if (!root) { return base::unexpected("Failed to parse debounce configuration"); } diff --git a/components/greaselion/browser/greaselion_download_service.cc b/components/greaselion/browser/greaselion_download_service.cc index 80b1fe6ade6..a1a9f6d1b87 100644 --- a/components/greaselion/browser/greaselion_download_service.cc +++ b/components/greaselion/browser/greaselion_download_service.cc @@ -6,6 +6,7 @@ #include "brave/components/greaselion/browser/greaselion_download_service.h" #include +#include #include #include "base/base_paths.h" @@ -262,7 +263,7 @@ void GreaselionDownloadService::OnDATFileDataReady( LOG(ERROR) << "Could not obtain Greaselion configuration"; return; } - absl::optional root = base::JSONReader::Read(contents); + std::optional root = base::JSONReader::Read(contents); if (!root || !root->is_list()) { LOG(ERROR) << "Failed to parse Greaselion configuration"; return; diff --git a/components/greaselion/browser/greaselion_service_impl.cc b/components/greaselion/browser/greaselion_service_impl.cc index f4519dac469..d28d33f121e 100644 --- a/components/greaselion/browser/greaselion_service_impl.cc +++ b/components/greaselion/browser/greaselion_service_impl.cc @@ -6,7 +6,9 @@ #include "brave/components/greaselion/browser/greaselion_service_impl.h" #include + #include +#include #include #include #include @@ -44,7 +46,6 @@ #include "extensions/common/file_util.h" #include "extensions/common/manifest_constants.h" #include "extensions/common/mojom/manifest.mojom.h" -#include "third_party/abseil-cpp/absl/types/optional.h" using extensions::Extension; using extensions::mojom::ManifestLocation; @@ -65,7 +66,7 @@ bool ShouldComputeHashesForResource( // extension that the caller should take ownership of, or nullptr. // // NOTE: This function does file IO and should not be called on the UI thread. -absl::optional +std::optional ConvertGreaselionRuleToExtensionOnTaskRunner( const greaselion::GreaselionRule& rule, const base::FilePath& install_dir) { @@ -73,13 +74,13 @@ ConvertGreaselionRuleToExtensionOnTaskRunner( extensions::file_util::GetInstallTempDir(install_dir); if (install_temp_dir.empty()) { LOG(ERROR) << "Could not get path to profile temp directory"; - return absl::nullopt; + return std::nullopt; } base::ScopedTempDir temp_dir; if (!temp_dir.CreateUniqueTempDirUnderPath(install_temp_dir)) { LOG(ERROR) << "Could not create Greaselion temp directory"; - return absl::nullopt; + return std::nullopt; } // Create the manifest @@ -155,7 +156,7 @@ ConvertGreaselionRuleToExtensionOnTaskRunner( // files to disk. if (!serializer.Serialize(base::Value(std::move(root)))) { LOG(ERROR) << "Could not write Greaselion manifest"; - return absl::nullopt; + return std::nullopt; } // Copy the messages directory to our extension directory. @@ -165,7 +166,7 @@ ConvertGreaselionRuleToExtensionOnTaskRunner( temp_dir.GetPath().AppendASCII("_locales"), true)) { LOG(ERROR) << "Could not copy Greaselion messages directory at path: " << rule.messages().LossyDisplayName(); - return absl::nullopt; + return std::nullopt; } } @@ -175,7 +176,7 @@ ConvertGreaselionRuleToExtensionOnTaskRunner( temp_dir.GetPath().Append(script.BaseName()))) { LOG(ERROR) << "Could not copy Greaselion script at path: " << script.LossyDisplayName(); - return absl::nullopt; + return std::nullopt; } } @@ -186,11 +187,11 @@ ConvertGreaselionRuleToExtensionOnTaskRunner( if (!extension.get()) { LOG(ERROR) << "Could not load Greaselion extension"; LOG(ERROR) << error; - return absl::nullopt; + return std::nullopt; } // Calculate and write computed hashes. - absl::optional computed_hashes_data = + std::optional computed_hashes_data = extensions::ComputedHashes::Compute( extension->path(), extension_misc::kContentVerificationDefaultBlockSize, @@ -332,7 +333,7 @@ void GreaselionServiceImpl::CreateAndInstallExtensions() { } void GreaselionServiceImpl::PostConvert( - absl::optional converted_extension) { + std::optional converted_extension) { if (!converted_extension) { all_rules_installed_successfully_ = false; pending_installs_ -= 1; diff --git a/components/greaselion/browser/greaselion_service_impl.h b/components/greaselion/browser/greaselion_service_impl.h index 5b812a0cc6e..eac8c726e38 100644 --- a/components/greaselion/browser/greaselion_service_impl.h +++ b/components/greaselion/browser/greaselion_service_impl.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_GREASELION_BROWSER_GREASELION_SERVICE_IMPL_H_ #define BRAVE_COMPONENTS_GREASELION_BROWSER_GREASELION_SERVICE_IMPL_H_ +#include #include #include #include @@ -18,7 +19,6 @@ #include "brave/components/greaselion/browser/greaselion_download_service.h" #include "brave/components/greaselion/browser/greaselion_service.h" #include "extensions/common/extension_id.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace base { class SequencedTaskRunner; @@ -73,7 +73,7 @@ class GreaselionServiceImpl : public GreaselionService, void SetBrowserVersionForTesting(const base::Version& version) override; void CreateAndInstallExtensions(); void PostConvert( - absl::optional converted_extension); + std::optional converted_extension); void Install(scoped_refptr extension); void MaybeNotifyObservers(); diff --git a/components/ipfs/ipfs_dns_resolver.cc b/components/ipfs/ipfs_dns_resolver.cc index 8bf772247fa..6ae0f350dec 100644 --- a/components/ipfs/ipfs_dns_resolver.cc +++ b/components/ipfs/ipfs_dns_resolver.cc @@ -5,13 +5,15 @@ #include "brave/components/ipfs/ipfs_dns_resolver.h" +#include + namespace ipfs { IpfsDnsResolver::IpfsDnsResolver() = default; IpfsDnsResolver::~IpfsDnsResolver() = default; -void IpfsDnsResolver::Notify(absl::optional value) { +void IpfsDnsResolver::Notify(std::optional value) { observers_.Notify(value); } diff --git a/components/ipfs/ipfs_dns_resolver.h b/components/ipfs/ipfs_dns_resolver.h index b8afbad3863..00eacb4c0ee 100644 --- a/components/ipfs/ipfs_dns_resolver.h +++ b/components/ipfs/ipfs_dns_resolver.h @@ -6,10 +6,10 @@ #ifndef BRAVE_COMPONENTS_IPFS_IPFS_DNS_RESOLVER_H_ #define BRAVE_COMPONENTS_IPFS_IPFS_DNS_RESOLVER_H_ +#include #include #include "base/callback_list.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace ipfs { @@ -20,16 +20,16 @@ class IpfsDnsResolver { IpfsDnsResolver(const IpfsDnsResolver&) = delete; IpfsDnsResolver& operator=(const IpfsDnsResolver&) = delete; - virtual absl::optional GetFirstDnsOverHttpsServer() = 0; + virtual std::optional GetFirstDnsOverHttpsServer() = 0; using IpfsDnsResolverObserverList = - base::RepeatingCallbackList)>; + base::RepeatingCallbackList)>; using IpfsDnsResolverObserver = IpfsDnsResolverObserverList::CallbackType; base::CallbackListSubscription AddObserver(IpfsDnsResolverObserver observer); protected: - void Notify(absl::optional value); + void Notify(std::optional value); private: IpfsDnsResolverObserverList observers_; diff --git a/components/ipfs/ipfs_json_parser.cc b/components/ipfs/ipfs_json_parser.cc index c89c031c85a..a88cffdc997 100644 --- a/components/ipfs/ipfs_json_parser.cc +++ b/components/ipfs/ipfs_json_parser.cc @@ -3,18 +3,18 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include "brave/components/ipfs/ipfs_json_parser.h" + +#include #include #include #include -#include "brave/components/ipfs/ipfs_json_parser.h" - #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/logging.h" #include "base/strings/strcat.h" #include "brave/components/ipfs/ipfs_utils.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace { @@ -49,17 +49,17 @@ bool RemoveValueFromList(base::Value::List* root, const T& value_to_remove) { // ], // "Progress": "" // } -absl::optional IPFSJSONParser::GetAddPinsResultFromJSON( +std::optional IPFSJSONParser::GetAddPinsResultFromJSON( const base::Value& value) { auto* auto_dict = value.GetIfDict(); if (!auto_dict) { VLOG(1) << "Invalid response, wrong format."; - return absl::nullopt; + return std::nullopt; } const base::Value::List* pins_list = auto_dict->FindList("Pins"); if (!pins_list) { VLOG(1) << "Invalid response, can not find Pins array."; - return absl::nullopt; + return std::nullopt; } ipfs::AddPinResult result; @@ -75,7 +75,7 @@ absl::optional IPFSJSONParser::GetAddPinsResultFromJSON( auto* val_as_str = val.GetIfString(); if (!val_as_str) { VLOG(1) << "Invalid response, wrong format."; - return absl::nullopt; + return std::nullopt; } result.pins.push_back(*val_as_str); } @@ -89,24 +89,24 @@ absl::optional IPFSJSONParser::GetAddPinsResultFromJSON( // "" // ] // } -absl::optional +std::optional IPFSJSONParser::GetRemovePinsResultFromJSON(const base::Value& value) { auto* auto_dict = value.GetIfDict(); if (!auto_dict) { VLOG(1) << "Invalid response, wrong format."; - return absl::nullopt; + return std::nullopt; } const base::Value::List* pins_list = auto_dict->FindList("Pins"); if (!pins_list) { VLOG(1) << "Invalid response, can not find Pins array."; - return absl::nullopt; + return std::nullopt; } ipfs::RemovePinResult result; for (const base::Value& val : *pins_list) { auto* val_as_str = val.GetIfString(); if (!val_as_str) { - return absl::nullopt; + return std::nullopt; } result.push_back(*val_as_str); } @@ -128,18 +128,18 @@ IPFSJSONParser::GetRemovePinsResultFromJSON(const base::Value& value) { // "Type": "" // } // } -absl::optional IPFSJSONParser::GetGetPinsResultFromJSON( +std::optional IPFSJSONParser::GetGetPinsResultFromJSON( const base::Value& value) { auto* auto_dict = value.GetIfDict(); if (!auto_dict) { VLOG(1) << "Invalid response, wrong format."; - return absl::nullopt; + return std::nullopt; } const base::Value::Dict* keys = auto_dict->FindDict("Keys"); if (!keys) { VLOG(1) << "Invalid response, can not find Keys in PinLsList dict."; - return absl::nullopt; + return std::nullopt; } ipfs::GetPinsResult result; @@ -147,12 +147,12 @@ absl::optional IPFSJSONParser::GetGetPinsResultFromJSON( auto* it_dict = it.second.GetIfDict(); if (!it_dict) { VLOG(1) << "Missing Type for " << it.first; - return absl::nullopt; + return std::nullopt; } const std::string* type = it_dict->FindString("Type"); if (!type) { VLOG(1) << "Missing Type for " << it.first; - return absl::nullopt; + return std::nullopt; } result[it.first] = *type; } @@ -464,7 +464,7 @@ std::string IPFSJSONParser::PutNewPeerToConfigJSON(const std::string& json, if (!ipfs::ParsePeerConnectionString(peer, &peer_id, &address)) return std::string(); - absl::optional records_v = + std::optional records_v = base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS | base::JSONParserOptions::JSON_PARSE_RFC); if (!records_v) { @@ -517,7 +517,7 @@ std::string IPFSJSONParser::PutNewPeerToConfigJSON(const std::string& json, // https://github.com/ipfs/go-ipfs/blob/master/docs/config.md#peering bool IPFSJSONParser::GetPeersFromConfigJSON(const std::string& json, std::vector* peers) { - absl::optional records_v = + std::optional records_v = base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS | base::JSONParserOptions::JSON_PARSE_RFC); if (!records_v) { @@ -567,7 +567,7 @@ std::string IPFSJSONParser::RemovePeerFromConfigJSON( const std::string& json, const std::string& peer_id, const std::string& peer_address) { - absl::optional records_v = + std::optional records_v = base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS | base::JSONParserOptions::JSON_PARSE_RFC); if (!records_v) { diff --git a/components/ipfs/ipfs_json_parser.h b/components/ipfs/ipfs_json_parser.h index bdd39b6616b..f73a9db8687 100644 --- a/components/ipfs/ipfs_json_parser.h +++ b/components/ipfs/ipfs_json_parser.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_IPFS_IPFS_JSON_PARSER_H_ #define BRAVE_COMPONENTS_IPFS_IPFS_JSON_PARSER_H_ +#include #include #include #include @@ -53,11 +54,11 @@ class IPFSJSONParser { const std::string& address); #if BUILDFLAG(ENABLE_IPFS_LOCAL_NODE) // Local pins - static absl::optional GetAddPinsResultFromJSON( + static std::optional GetAddPinsResultFromJSON( const base::Value& value); - static absl::optional GetGetPinsResultFromJSON( + static std::optional GetGetPinsResultFromJSON( const base::Value& value); - static absl::optional GetRemovePinsResultFromJSON( + static std::optional GetRemovePinsResultFromJSON( const base::Value& value); #endif // BUILDFLAG(ENABLE_IPFS_LOCAL_NODE) }; diff --git a/components/ipfs/ipfs_navigation_throttle.cc b/components/ipfs/ipfs_navigation_throttle.cc index 70a5078b80a..1974b00e6c7 100644 --- a/components/ipfs/ipfs_navigation_throttle.cc +++ b/components/ipfs/ipfs_navigation_throttle.cc @@ -6,6 +6,7 @@ #include "brave/components/ipfs/ipfs_navigation_throttle.h" #include +#include #include #include "base/functional/bind.h" @@ -146,7 +147,7 @@ void IpfsNavigationThrottle::GetConnectedPeers() { ipfs_service_->GetConnectedPeers( base::BindOnce(&IpfsNavigationThrottle::OnGetConnectedPeers, weak_ptr_factory_.GetWeakPtr()), - absl::nullopt); + std::nullopt); } void IpfsNavigationThrottle::OnGetConnectedPeers( diff --git a/components/ipfs/ipfs_onboarding_page.cc b/components/ipfs/ipfs_onboarding_page.cc index 932c34e9783..fe871fb2d6b 100644 --- a/components/ipfs/ipfs_onboarding_page.cc +++ b/components/ipfs/ipfs_onboarding_page.cc @@ -5,6 +5,7 @@ #include "brave/components/ipfs/ipfs_onboarding_page.h" +#include #include #include #include @@ -133,7 +134,7 @@ void IPFSOnboardingPage::ReportDaemonStopped() { } void IPFSOnboardingPage::GetConnectedPeers() { - ipfs_service_->GetConnectedPeers(base::NullCallback(), absl::nullopt); + ipfs_service_->GetConnectedPeers(base::NullCallback(), std::nullopt); } bool IPFSOnboardingPage::IsLocalNodeMode() { diff --git a/components/ipfs/ipfs_service.cc b/components/ipfs/ipfs_service.cc index ccd9bf0a51d..eaf4fe29fe0 100644 --- a/components/ipfs/ipfs_service.cc +++ b/components/ipfs/ipfs_service.cc @@ -6,6 +6,7 @@ #include "brave/components/ipfs/ipfs_service.h" #include +#include #include #include @@ -96,7 +97,7 @@ base::flat_map GetHeaders(const GURL& url) { {net::HttpRequestHeaders::kOrigin, url::Origin::Create(url).Serialize()}}; } -absl::optional ConvertPlainStringToJsonArray( +std::optional ConvertPlainStringToJsonArray( const std::string& json) { return base::StrCat({"[\"", json, "\"]"}); } @@ -350,13 +351,13 @@ void IpfsService::Shutdown() { ipfs_pid_ = -1; } -void IpfsService::OnDnsConfigChanged(absl::optional dns_server) { +void IpfsService::OnDnsConfigChanged(std::optional dns_server) { RestartDaemon(); } #if BUILDFLAG(ENABLE_IPFS_LOCAL_NODE) // static -absl::optional IpfsService::WaitUntilExecutionFinished( +std::optional IpfsService::WaitUntilExecutionFinished( base::FilePath data_path, base::CommandLine command_line) { base::LaunchOptions options; @@ -389,7 +390,7 @@ void IpfsService::RotateKey(const std::string& oldkey, BoolCallback callback) { ExecuteNodeCommand( cmdline, GetDataPath(), base::BindOnce( - [](BoolCallback callback, absl::optional result) { + [](BoolCallback callback, std::optional result) { std::move(callback).Run(result.has_value()); }, std::move(callback))); @@ -410,7 +411,7 @@ void IpfsService::ExportKey(const std::string& key, ExecuteNodeCommand( cmdline, GetDataPath(), base::BindOnce( - [](BoolCallback callback, absl::optional result) { + [](BoolCallback callback, std::optional result) { std::move(callback).Run(result.has_value()); }, std::move(callback))); @@ -439,7 +440,7 @@ void IpfsService::AddPin(const std::vector& cids, bool recursive, AddPinCallback callback) { if (!IsDaemonLaunched()) { - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(std::nullopt); return; } @@ -467,7 +468,7 @@ void IpfsService::AddPin(const std::vector& cids, void IpfsService::RemovePin(const std::vector& cids, RemovePinCallback callback) { if (!IsDaemonLaunched()) { - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(std::nullopt); return; } @@ -518,7 +519,7 @@ void IpfsService::RemovePinCli(std::set cids, void IpfsService::LsPinCli(NodeCallback callback) { base::FilePath path = GetIpfsExecutablePath(); if (path.empty()) { - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(std::nullopt); return; } @@ -533,7 +534,7 @@ void IpfsService::LsPinCli(NodeCallback callback) { void IpfsService::OnRemovePinCli(BoolCallback callback, std::set cids, - absl::optional result) { + std::optional result) { DCHECK(!cids.empty()); if (!result || cids.empty()) { std::move(callback).Run(false); @@ -549,12 +550,12 @@ void IpfsService::OnRemovePinCli(BoolCallback callback, } } -void IpfsService::GetPins(const absl::optional>& cids, +void IpfsService::GetPins(const std::optional>& cids, const std::string& type, bool quiet, GetPinsCallback callback) { if (!IsDaemonLaunched()) { - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(std::nullopt); return; } @@ -702,7 +703,7 @@ void IpfsService::OnImportFinished(ipfs::ImportCompletedCallback callback, #endif void IpfsService::GetConnectedPeers(GetConnectedPeersCallback callback, - absl::optional retries) { + std::optional retries) { if (!IsDaemonLaunched()) { if (callback) std::move(callback).Run(false, std::vector{}); @@ -1066,7 +1067,7 @@ void IpfsService::OnGetPinsResult( if (!response.Is2XXResponseCode()) { VLOG(1) << "Fail to get pins, response_code = " << response_code; - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(std::nullopt); return; } @@ -1074,7 +1075,7 @@ void IpfsService::OnGetPinsResult( IPFSJSONParser::GetGetPinsResultFromJSON(response.value_body()); if (!parse_result) { VLOG(1) << "Fail to get pins, wrong format"; - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(std::nullopt); return; } @@ -1090,7 +1091,7 @@ void IpfsService::OnPinAddResult( if (!response.Is2XXResponseCode()) { VLOG(1) << "Fail to add pin, response_code = " << response_code; - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(std::nullopt); return; } @@ -1098,13 +1099,13 @@ void IpfsService::OnPinAddResult( IPFSJSONParser::GetAddPinsResultFromJSON(response.value_body()); if (!parse_result) { VLOG(1) << "Fail to add pin service, wrong format"; - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(std::nullopt); return; } if (parse_result->pins.size() != cids_count_in_request) { VLOG(1) << "Not all CIDs were added"; - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(std::nullopt); return; } @@ -1124,7 +1125,7 @@ void IpfsService::OnPinRemoveResult( if (!response.Is2XXResponseCode()) { VLOG(1) << "Fail to remove pin, response_code = " << response_code; - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(std::nullopt); return; } @@ -1132,7 +1133,7 @@ void IpfsService::OnPinRemoveResult( IPFSJSONParser::GetRemovePinsResultFromJSON(response.value_body()); if (!parse_result) { VLOG(1) << "Fail to remove pin, wrong response format"; - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(std::nullopt); return; } diff --git a/components/ipfs/ipfs_service.h b/components/ipfs/ipfs_service.h index 5a3b134b70d..809a5b38a84 100644 --- a/components/ipfs/ipfs_service.h +++ b/components/ipfs/ipfs_service.h @@ -8,6 +8,7 @@ #include #include +#include #include #include #include @@ -34,7 +35,6 @@ #include "components/keyed_service/core/keyed_service.h" #include "components/version_info/channel.h" #include "mojo/public/cpp/bindings/remote.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h" #if BUILDFLAG(ENABLE_IPFS_LOCAL_NODE) @@ -87,14 +87,14 @@ class IpfsService : public KeyedService, base::OnceCallback; using GarbageCollectionCallback = base::OnceCallback; - using NodeCallback = base::OnceCallback)>; + using NodeCallback = base::OnceCallback)>; #if BUILDFLAG(ENABLE_IPFS_LOCAL_NODE) // Local pins - using AddPinCallback = base::OnceCallback)>; + using AddPinCallback = base::OnceCallback)>; using RemovePinCallback = - base::OnceCallback)>; + base::OnceCallback)>; using GetPinsCallback = - base::OnceCallback)>; + base::OnceCallback)>; #endif // BUILDFLAG(ENABLE_IPFS_LOCAL_NODE) using BoolCallback = base::OnceCallback; using GetConfigCallback = base::OnceCallback; @@ -133,7 +133,7 @@ class IpfsService : public KeyedService, AddPinCallback callback); virtual void RemovePin(const std::vector& cid, RemovePinCallback callback); - virtual void GetPins(const absl::optional>& cid, + virtual void GetPins(const std::optional>& cid, const std::string& type, bool quiet, GetPinsCallback callback); @@ -161,7 +161,7 @@ class IpfsService : public KeyedService, BoolCallback callback); #endif virtual void GetConnectedPeers(GetConnectedPeersCallback callback, - absl::optional retries); + std::optional retries); void GetAddressesConfig(GetAddressesConfigCallback callback); virtual void LaunchDaemon(BoolCallback callback); void ShutdownDaemon(BoolCallback callback); @@ -209,7 +209,7 @@ class IpfsService : public KeyedService, // Launches the ipfs service in an utility process. void LaunchIfNotRunning(const base::FilePath& executable_path); #if BUILDFLAG(ENABLE_IPFS_LOCAL_NODE) - static absl::optional WaitUntilExecutionFinished( + static std::optional WaitUntilExecutionFinished( base::FilePath data_path, base::CommandLine cmd); void ExecuteNodeCommand(const base::CommandLine& command_line, @@ -227,7 +227,7 @@ class IpfsService : public KeyedService, api_request_helper::APIRequestResult response); void OnRemovePinCli(BoolCallback callback, std::set cids, - absl::optional result); + std::optional result); #endif base::TimeDelta CalculatePeersRetryTime(); @@ -250,7 +250,7 @@ class IpfsService : public KeyedService, void OnPreWarmComplete(api_request_helper::APIRequestResult response); std::string GetStorageSize(); - void OnDnsConfigChanged(absl::optional dns_server); + void OnDnsConfigChanged(std::optional dns_server); void OnIPFSAlwaysStartModeChanged(); // The remote to the ipfs service running on an utility process. The browser diff --git a/components/ipfs/ipfs_utils.cc b/components/ipfs/ipfs_utils.cc index fb3305648a5..e866f8b3c52 100644 --- a/components/ipfs/ipfs_utils.cc +++ b/components/ipfs/ipfs_utils.cc @@ -5,6 +5,7 @@ #include "brave/components/ipfs/ipfs_utils.h" +#include #include #include #include @@ -69,12 +70,12 @@ GURL AppendLocalPort(const std::string& port) { return gateway.ReplaceComponents(replacements); } -absl::optional ExtractSourceFromGatewayHost(const GURL& url) { +std::optional ExtractSourceFromGatewayHost(const GURL& url) { std::vector host_parts = base::SplitStringUsingSubstr( url.host(), ".", base::KEEP_WHITESPACE, base::SPLIT_WANT_ALL); if (host_parts.size() <= 2) { - return absl::nullopt; + return std::nullopt; } GURL final_url; if (host_parts.at(1) == "ipfs" && ipfs::IsValidCID(host_parts.at(0))) { @@ -88,7 +89,7 @@ absl::optional ExtractSourceFromGatewayHost(const GURL& url) { } if (!final_url.is_valid()) { - return absl::nullopt; + return std::nullopt; } GURL::Replacements replacements; @@ -97,12 +98,12 @@ absl::optional ExtractSourceFromGatewayHost(const GURL& url) { return final_url.ReplaceComponents(replacements); } -absl::optional ExtractSourceFromGatewayPath(const GURL& url) { +std::optional ExtractSourceFromGatewayPath(const GURL& url) { std::vector path_parts = base::SplitStringUsingSubstr( url.path(), "/", base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY); if (path_parts.size() < 2) { - return absl::nullopt; + return std::nullopt; } GURL final_url; @@ -124,7 +125,7 @@ absl::optional ExtractSourceFromGatewayPath(const GURL& url) { } if (!final_url.is_valid()) { - return absl::nullopt; + return std::nullopt; } GURL::Replacements replacements; @@ -207,22 +208,22 @@ bool IsDefaultGatewayURL(const GURL& url, PrefService* prefs) { url.DomainIs(std::string("ipns.") + gateway_host)); } -absl::optional TranslateXIPFSPath(const std::string& x_ipfs_path_header) { +std::optional TranslateXIPFSPath(const std::string& x_ipfs_path_header) { std::string scheme; if (base::StartsWith(x_ipfs_path_header, "/ipfs/")) { scheme = kIPFSScheme; } else if (base::StartsWith(x_ipfs_path_header, "/ipns/")) { scheme = kIPNSScheme; } else { - return absl::nullopt; + return std::nullopt; } std::string content = x_ipfs_path_header.substr(6, x_ipfs_path_header.size()); if (content.empty()) { - return absl::nullopt; + return std::nullopt; } GURL result = GURL(scheme + "://" + content); if (!result.is_valid()) { - return absl::nullopt; + return std::nullopt; } return result; } @@ -574,9 +575,9 @@ std::string DecodeSingleLabelForm(const std::string& input) { // 4) IPNS key: // gateway.io/ipns/k2k4r8k4oiuzuccssu5jj27hrth43yqoq55wvm46e7ygqokvlz4ixmfn -> // ipns://k2k4r8k4oiuzuccssu5jj27hrth43yqoq55wvm46e7ygqokvlz4ixmfn -absl::optional ExtractSourceFromGateway(const GURL& url) { +std::optional ExtractSourceFromGateway(const GURL& url) { if (!url.is_valid() || !url.SchemeIsHTTPOrHTTPS()) { - return absl::nullopt; + return std::nullopt; } auto result = ExtractSourceFromGatewayHost(url); diff --git a/components/ipfs/ipfs_utils.h b/components/ipfs/ipfs_utils.h index f5b950dc8a2..d0a72e22aff 100644 --- a/components/ipfs/ipfs_utils.h +++ b/components/ipfs/ipfs_utils.h @@ -6,10 +6,10 @@ #ifndef BRAVE_COMPONENTS_IPFS_IPFS_UTILS_H_ #define BRAVE_COMPONENTS_IPFS_IPFS_UTILS_H_ +#include #include #include "components/version_info/channel.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h" class PrefService; @@ -58,7 +58,7 @@ bool TranslateIPFSURI(const GURL& url, GURL* new_url, const GURL& gateway_url, bool use_subdomain); -absl::optional TranslateXIPFSPath(const std::string& x_ipfs_path_header); +std::optional TranslateXIPFSPath(const std::string& x_ipfs_path_header); bool IsValidNodeFilename(const std::string& filename); bool ParsePeerConnectionString(const std::string& value, @@ -71,7 +71,7 @@ bool IsIpfsResolveMethodAsk(PrefService* prefs); std::string GetRegistryDomainFromIPNS(const GURL& url); bool IsValidCIDOrDomain(const std::string& value); std::string DecodeSingleLabelForm(const std::string& input); -absl::optional ExtractSourceFromGateway(const GURL& url); +std::optional ExtractSourceFromGateway(const GURL& url); } // namespace ipfs diff --git a/components/ipfs/ipfs_utils_unittest.cc b/components/ipfs/ipfs_utils_unittest.cc index 641ebedf933..91b42d31d7a 100644 --- a/components/ipfs/ipfs_utils_unittest.cc +++ b/components/ipfs/ipfs_utils_unittest.cc @@ -18,7 +18,6 @@ #include "components/version_info/channel.h" #include "net/base/url_util.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h" class IpfsUtilsUnitTest : public testing::Test { diff --git a/components/ipfs/pin/ipfs_base_pin_service.cc b/components/ipfs/pin/ipfs_base_pin_service.cc index ee62973c1a5..55e1f6389e3 100644 --- a/components/ipfs/pin/ipfs_base_pin_service.cc +++ b/components/ipfs/pin/ipfs_base_pin_service.cc @@ -5,6 +5,8 @@ #include "brave/components/ipfs/pin/ipfs_base_pin_service.h" +#include + #include "brave/components/ipfs/ipfs_utils.h" #include "brave/components/ipfs/pref_names.h" @@ -127,7 +129,7 @@ void IpfsBasePinService::GetConnectedPeers(size_t attempt) { ipfs_service_->GetConnectedPeers( base::BindOnce(&IpfsBasePinService::OnGetConnectedPeersResult, weak_ptr_factory_.GetWeakPtr(), attempt), - absl::nullopt); + std::nullopt); } bool IpfsBasePinService::HasJobs() { diff --git a/components/ipfs/pin/ipfs_base_pin_service_unittest.cc b/components/ipfs/pin/ipfs_base_pin_service_unittest.cc index e594aefe2e2..87c6e61814e 100644 --- a/components/ipfs/pin/ipfs_base_pin_service_unittest.cc +++ b/components/ipfs/pin/ipfs_base_pin_service_unittest.cc @@ -6,6 +6,7 @@ #include "brave/components/ipfs/pin/ipfs_base_pin_service.h" #include +#include #include #include "base/test/bind.h" @@ -34,7 +35,7 @@ class MockIpfsService : public IpfsService { MOCK_METHOD1(StartDaemonAndLaunch, void(base::OnceCallback)); MOCK_METHOD2(GetConnectedPeers, void(IpfsService::GetConnectedPeersCallback, - absl::optional)); + std::optional)); }; } // namespace @@ -82,13 +83,13 @@ class MockJob : public IpfsBaseJob { TEST_F(IpfsBasePinServiceTest, TasksExecuted) { service()->OnGetConnectedPeersResult(1, true, {}); - absl::optional method_called; + std::optional method_called; std::unique_ptr first_job = std::make_unique( base::BindLambdaForTesting([&method_called]() { method_called = true; })); service()->AddJob(std::move(first_job)); EXPECT_TRUE(method_called.value()); - absl::optional second_method_called; + std::optional second_method_called; std::unique_ptr second_job = std::make_unique(base::BindLambdaForTesting( [&second_method_called]() { second_method_called = true; })); diff --git a/components/ipfs/pin/ipfs_local_pin_service.cc b/components/ipfs/pin/ipfs_local_pin_service.cc index 09f63adebbc..83df14a691b 100644 --- a/components/ipfs/pin/ipfs_local_pin_service.cc +++ b/components/ipfs/pin/ipfs_local_pin_service.cc @@ -6,6 +6,7 @@ #include "brave/components/ipfs/pin/ipfs_local_pin_service.h" #include +#include #include #include #include @@ -42,11 +43,11 @@ std::string GetPrefNameFromPinningMode(PinningMode mode) { } // namespace // Splits ipfs:// url to a list of PinData items -absl::optional> IpfsLocalPinService::ExtractPinData( +std::optional> IpfsLocalPinService::ExtractPinData( const std::string& ipfs_url) { auto gurl = GURL(ipfs_url); if (!gurl.SchemeIs(ipfs::kIPFSScheme)) { - return absl::nullopt; + return std::nullopt; } // This will just remove ipfs:// scheme auto path = gurl.path(); @@ -54,7 +55,7 @@ absl::optional> IpfsLocalPinService::ExtractPinData( base::SplitString(path, "/", base::WhitespaceHandling::KEEP_WHITESPACE, base::SplitResult::SPLIT_WANT_NONEMPTY); if (slit.empty()) { - return absl::nullopt; + return std::nullopt; } std::vector result; std::string builder = "/ipfs"; @@ -67,14 +68,14 @@ absl::optional> IpfsLocalPinService::ExtractPinData( return result; } -absl::optional> +std::optional> IpfsLocalPinService::ExtractMergedPinData( const std::vector& ipfs_urls) { std::vector result; for (const auto& ipfs_url : ipfs_urls) { auto pins_data_for_url = ExtractPinData(ipfs_url); if (!pins_data_for_url) { - return absl::nullopt; + return std::nullopt; } for (const auto& item : pins_data_for_url.value()) { if (!base::Contains(result, item)) { @@ -99,7 +100,7 @@ AddLocalPinJob::AddLocalPinJob(PrefService* prefs_service, AddLocalPinJob::~AddLocalPinJob() = default; void AddLocalPinJob::Start() { - auto callback = base::BarrierCallback>( + auto callback = base::BarrierCallback>( 2, base::BindOnce(&AddLocalPinJob::OnAddPinResult, weak_ptr_factory_.GetWeakPtr())); @@ -125,8 +126,8 @@ void AddLocalPinJob::Start() { } void AddLocalPinJob::Accumulate( - base::OnceCallback)> callback, - absl::optional result) { + base::OnceCallback)> callback, + std::optional result) { if (!result) { pinning_failed_ = true; } @@ -135,7 +136,7 @@ void AddLocalPinJob::Accumulate( } void AddLocalPinJob::OnAddPinResult( - std::vector> result) { + std::vector> result) { if (is_canceled_) { std::move(callback_).Run(false); return; @@ -228,9 +229,9 @@ void VerifyLocalPinJob::Start() { weak_ptr_factory_.GetWeakPtr())); } -void VerifyLocalPinJob::OnGetPinsResult(absl::optional result) { +void VerifyLocalPinJob::OnGetPinsResult(std::optional result) { if (is_canceled_) { - std::move(callback_).Run(absl::nullopt); + std::move(callback_).Run(std::nullopt); return; } @@ -253,22 +254,22 @@ GcJob::GcJob(PrefService* prefs_service, GcJob::~GcJob() = default; void GcJob::Start() { - auto callback = base::BarrierCallback>( + auto callback = base::BarrierCallback>( 2, base::BindOnce(&GcJob::OnGetPinsResult, weak_ptr_factory_.GetWeakPtr())); ipfs_service_->GetPins( - absl::nullopt, GetPrefNameFromPinningMode(PinningMode::RECURSIVE), true, + std::nullopt, GetPrefNameFromPinningMode(PinningMode::RECURSIVE), true, base::BindOnce(&GcJob::Accumulate, weak_ptr_factory_.GetWeakPtr(), callback)); ipfs_service_->GetPins( - absl::nullopt, GetPrefNameFromPinningMode(PinningMode::DIRECT), true, + std::nullopt, GetPrefNameFromPinningMode(PinningMode::DIRECT), true, base::BindOnce(&GcJob::Accumulate, weak_ptr_factory_.GetWeakPtr(), callback)); } void GcJob::Accumulate( - base::OnceCallback)> callback, - absl::optional result) { + base::OnceCallback)> callback, + std::optional result) { if (!result) { gc_job_failed_ = true; } @@ -276,7 +277,7 @@ void GcJob::Accumulate( std::move(callback).Run(std::move(result)); } -void GcJob::OnGetPinsResult(std::vector> result) { +void GcJob::OnGetPinsResult(std::vector> result) { if (is_canceled_) { std::move(callback_).Run(false); return; @@ -314,7 +315,7 @@ void GcJob::OnGetPinsResult(std::vector> result) { } } -void GcJob::OnPinsRemovedResult(absl::optional result) { +void GcJob::OnPinsRemovedResult(std::optional result) { std::move(callback_).Run(result.has_value()); } @@ -335,7 +336,7 @@ void IpfsLocalPinService::Reset(base::OnceCallback callback) { void IpfsLocalPinService::OnLsPinCliResult( base::OnceCallback callback, - absl::optional result) { + std::optional result) { if (!result) { std::move(callback).Run(false); return; @@ -410,7 +411,7 @@ void IpfsLocalPinService::ValidatePins( auto pins_data = ExtractMergedPinData(ipfs_urls); if (!pins_data) { NOTREACHED(); - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(std::nullopt); return; } ipfs_base_pin_service_->AddJob(std::make_unique( @@ -439,7 +440,7 @@ void IpfsLocalPinService::OnAddJobFinished(AddPinCallback callback, } void IpfsLocalPinService::OnValidateJobFinished(ValidatePinsCallback callback, - absl::optional status) { + std::optional status) { std::move(callback).Run(status); ipfs_base_pin_service_->OnJobDone(status.value_or(false)); } diff --git a/components/ipfs/pin/ipfs_local_pin_service.h b/components/ipfs/pin/ipfs_local_pin_service.h index 6eeea5e7d0d..37c854ac00c 100644 --- a/components/ipfs/pin/ipfs_local_pin_service.h +++ b/components/ipfs/pin/ipfs_local_pin_service.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_IPFS_PIN_IPFS_LOCAL_PIN_SERVICE_H_ #include +#include #include #include #include @@ -16,7 +17,6 @@ #include "base/gtest_prod_util.h" #include "brave/components/ipfs/ipfs_service.h" #include "brave/components/ipfs/pin/ipfs_base_pin_service.h" -#include "third_party/abseil-cpp/absl/types/optional.h" using ipfs::IpfsService; @@ -31,12 +31,11 @@ struct PinData { bool operator==(const PinData&) const; }; -absl::optional> ExtractPinData( - const std::string& ipfs_url); +std::optional> ExtractPinData(const std::string& ipfs_url); using AddPinCallback = base::OnceCallback; using RemovePinCallback = base::OnceCallback; -using ValidatePinsCallback = base::OnceCallback)>; +using ValidatePinsCallback = base::OnceCallback)>; using GcCallback = base::OnceCallback; /** @@ -76,9 +75,9 @@ class AddLocalPinJob : public IpfsBaseJob { private: void Accumulate( - base::OnceCallback)> callback, - absl::optional result); - void OnAddPinResult(std::vector> result); + base::OnceCallback)> callback, + std::optional result); + void OnAddPinResult(std::vector> result); raw_ptr prefs_service_; raw_ptr ipfs_service_; @@ -121,7 +120,7 @@ class VerifyLocalPinJob : public IpfsBaseJob { void Start() override; private: - void OnGetPinsResult(absl::optional result); + void OnGetPinsResult(std::optional result); raw_ptr prefs_service_; raw_ptr ipfs_service_; @@ -143,10 +142,10 @@ class GcJob : public IpfsBaseJob { private: void Accumulate( - base::OnceCallback)> callback, - absl::optional result); - void OnGetPinsResult(std::vector> result); - void OnPinsRemovedResult(absl::optional result); + base::OnceCallback)> callback, + std::optional result); + void OnGetPinsResult(std::vector> result); + void OnPinsRemovedResult(std::optional result); raw_ptr prefs_service_; raw_ptr ipfs_service_; @@ -179,23 +178,23 @@ class IpfsLocalPinService : public KeyedService { void SetIpfsBasePinServiceForTesting(std::unique_ptr); - static absl::optional> ExtractPinData( + static std::optional> ExtractPinData( const std::string& ipfs_url); - static absl::optional> ExtractMergedPinData( + static std::optional> ExtractMergedPinData( const std::vector& ipfs_urls); private: FRIEND_TEST_ALL_PREFIXES(IpfsLocalPinServiceTest, ResetTest); void OnLsPinCliResult(base::OnceCallback callback, - absl::optional result); + std::optional result); void OnRemovePinCliResult(base::OnceCallback callback, bool result); void AddGcTask(); void OnRemovePinsFinished(RemovePinCallback callback, bool status); void OnAddJobFinished(AddPinCallback callback, bool status); void OnValidateJobFinished(ValidatePinsCallback callback, - absl::optional status); + std::optional status); void OnGcFinishedCallback(bool status); bool HasJobs(); diff --git a/components/ipfs/pin/ipfs_local_pin_service_unittest.cc b/components/ipfs/pin/ipfs_local_pin_service_unittest.cc index 488de889c0e..1f8ef4399d6 100644 --- a/components/ipfs/pin/ipfs_local_pin_service_unittest.cc +++ b/components/ipfs/pin/ipfs_local_pin_service_unittest.cc @@ -6,6 +6,7 @@ #include "brave/components/ipfs/pin/ipfs_local_pin_service.h" #include +#include #include #include @@ -38,7 +39,7 @@ class MockIpfsService : public IpfsService { void(const std::vector& cid, IpfsService::RemovePinCallback callback)); MOCK_METHOD4(GetPins, - void(const absl::optional>& cid, + void(const std::optional>& cid, const std::string& type, bool quiet, IpfsService::GetPinsCallback callback)); @@ -102,7 +103,7 @@ TEST_F(IpfsLocalPinServiceTest, AddLocalPinJobTest) { std::move(callback).Run(result); })); - absl::optional success; + std::optional success; service()->AddPins( "a", {"ipfs://Qma/metadata/1.json", "ipfs://Qmb/images/1.jpg"}, base::BindLambdaForTesting( @@ -117,7 +118,7 @@ TEST_F(IpfsLocalPinServiceTest, AddLocalPinJobTest) { "QmaD1" : ["a"], "QmbD1" : ["a"] }})"; - absl::optional expected_value = base::JSONReader::Read( + std::optional expected_value = base::JSONReader::Read( expected, base::JSON_PARSE_CHROMIUM_EXTENSIONS | base::JSONParserOptions::JSON_PARSE_RFC); EXPECT_EQ(expected_value.value(), GetPrefs()->GetDict(kIPFSPinnedCids)); @@ -137,7 +138,7 @@ TEST_F(IpfsLocalPinServiceTest, AddLocalPinJobTest) { std::move(callback).Run(result); })); - absl::optional success; + std::optional success; service()->AddPins("b", {"ipfs://Qma", "ipfs://Qmb", "ipfs://Qmc", "ipfs://Qmd", "ipfs://Qimage"}, @@ -157,7 +158,7 @@ TEST_F(IpfsLocalPinServiceTest, AddLocalPinJobTest) { "QmaD1" : ["a"], "QmbD1" : ["a"] }})"; - absl::optional expected_value = base::JSONReader::Read( + std::optional expected_value = base::JSONReader::Read( expected, base::JSON_PARSE_CHROMIUM_EXTENSIONS | base::JSONParserOptions::JSON_PARSE_RFC); EXPECT_EQ(expected_value.value(), GetPrefs()->GetDict(kIPFSPinnedCids)); @@ -172,14 +173,14 @@ TEST_F(IpfsLocalPinServiceTest, AddLocalPinJobTest) { IpfsService::AddPinCallback callback) { AddPinResult result; if (recursive) { - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(std::nullopt); return; } result.recursive = recursive; std::move(callback).Run(result); })); - absl::optional success; + std::optional success; service()->AddPins( "c", {"ipfs://Qma", "ipfs://Qmb", "ipfs://Qmc", "ipfs://Qmd", "ipfs://Qme"}, @@ -199,7 +200,7 @@ TEST_F(IpfsLocalPinServiceTest, AddLocalPinJobTest) { "QmaD1" : ["a"], "QmbD1" : ["a"] }})"; - absl::optional expected_value = base::JSONReader::Read( + std::optional expected_value = base::JSONReader::Read( expected, base::JSON_PARSE_CHROMIUM_EXTENSIONS | base::JSONParserOptions::JSON_PARSE_RFC); EXPECT_EQ(expected_value.value(), GetPrefs()->GetDict(kIPFSPinnedCids)); @@ -212,10 +213,10 @@ TEST_F(IpfsLocalPinServiceTest, AddLocalPinJobTest) { .WillByDefault(::testing::Invoke( [](const std::vector& cids, bool recursive, IpfsService::AddPinCallback callback) { - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(std::nullopt); })); - absl::optional success; + std::optional success; service()->AddPins( "c", {"ipfs://Qma", "ipfs://Qmb", "ipfs://Qmc", "ipfs://Qmd", "ipfs://Qme"}, @@ -235,7 +236,7 @@ TEST_F(IpfsLocalPinServiceTest, AddLocalPinJobTest) { "QmaD1" : ["a"], "QmbD1" : ["a"] }})"; - absl::optional expected_value = base::JSONReader::Read( + std::optional expected_value = base::JSONReader::Read( expected, base::JSON_PARSE_CHROMIUM_EXTENSIONS | base::JSONParserOptions::JSON_PARSE_RFC); EXPECT_EQ(expected_value.value(), GetPrefs()->GetDict(kIPFSPinnedCids)); @@ -251,14 +252,14 @@ TEST_F(IpfsLocalPinServiceTest, RemoveLocalPinJobTest) { "Qmc" : ["a", "b"], "Qmd" : ["b"] }, "direct": {}})"; - absl::optional base_value = base::JSONReader::Read( + std::optional base_value = base::JSONReader::Read( base, base::JSON_PARSE_CHROMIUM_EXTENSIONS | base::JSONParserOptions::JSON_PARSE_RFC); GetPrefs()->SetDict(kIPFSPinnedCids, base_value.value().GetDict().Clone()); } { - absl::optional success; + std::optional success; service()->RemovePins("a", base::BindLambdaForTesting( [&success](bool result) { success = result; })); @@ -269,7 +270,7 @@ TEST_F(IpfsLocalPinServiceTest, RemoveLocalPinJobTest) { "Qmc" : ["b"], "Qmd" : ["b"] })"; - absl::optional expected_value = base::JSONReader::Read( + std::optional expected_value = base::JSONReader::Read( expected, base::JSON_PARSE_CHROMIUM_EXTENSIONS | base::JSONParserOptions::JSON_PARSE_RFC); EXPECT_EQ(expected_value.value(), @@ -278,7 +279,7 @@ TEST_F(IpfsLocalPinServiceTest, RemoveLocalPinJobTest) { } { - absl::optional success; + std::optional success; service()->RemovePins("c", base::BindLambdaForTesting( [&success](bool result) { success = result; })); @@ -289,7 +290,7 @@ TEST_F(IpfsLocalPinServiceTest, RemoveLocalPinJobTest) { "Qmc" : ["b"], "Qmd" : ["b"] })"; - absl::optional expected_value = base::JSONReader::Read( + std::optional expected_value = base::JSONReader::Read( expected, base::JSON_PARSE_CHROMIUM_EXTENSIONS | base::JSONParserOptions::JSON_PARSE_RFC); EXPECT_EQ(expected_value.value(), @@ -298,14 +299,14 @@ TEST_F(IpfsLocalPinServiceTest, RemoveLocalPinJobTest) { } { - absl::optional success; + std::optional success; service()->RemovePins("b", base::BindLambdaForTesting( [&success](bool result) { success = result; })); std::string expected = R"({ })"; - absl::optional expected_value = base::JSONReader::Read( + std::optional expected_value = base::JSONReader::Read( expected, base::JSON_PARSE_CHROMIUM_EXTENSIONS | base::JSONParserOptions::JSON_PARSE_RFC); EXPECT_EQ(expected_value.value(), @@ -322,7 +323,7 @@ TEST_F(IpfsLocalPinServiceTest, VerifyLocalPinJobTest) { "Qmc" : ["a", "b"], "Qmd" : ["b"] }, "direct": {}})"; - absl::optional base_value = base::JSONReader::Read( + std::optional base_value = base::JSONReader::Read( base, base::JSON_PARSE_CHROMIUM_EXTENSIONS | base::JSONParserOptions::JSON_PARSE_RFC); GetPrefs()->SetDict(kIPFSPinnedCids, base_value.value().GetDict().Clone()); @@ -330,7 +331,7 @@ TEST_F(IpfsLocalPinServiceTest, VerifyLocalPinJobTest) { { ON_CALL(*GetIpfsService(), GetPins(_, _, _, _)) - .WillByDefault(::testing::Invoke([](const absl::optional< + .WillByDefault(::testing::Invoke([](const std::optional< std::vector>& cid, const std::string& type, bool quiet, IpfsService::GetPinsCallback @@ -339,10 +340,10 @@ TEST_F(IpfsLocalPinServiceTest, VerifyLocalPinJobTest) { std::move(callback).Run(result); })); - absl::optional success; + std::optional success; service()->ValidatePins( "a", {"ipfs://Qma", "ipfs://Qmb", "ipfs://Qmc"}, - base::BindLambdaForTesting([&success](absl::optional result) { + base::BindLambdaForTesting([&success](std::optional result) { success = result.value(); })); @@ -353,7 +354,7 @@ TEST_F(IpfsLocalPinServiceTest, VerifyLocalPinJobTest) { { ON_CALL(*GetIpfsService(), GetPins(_, _, _, _)) .WillByDefault(::testing::Invoke( - [](const absl::optional>& cid, + [](const std::optional>& cid, const std::string& type, bool quiet, IpfsService::GetPinsCallback callback) { GetPinsResult result = {{"Qma", "Recursive"}, @@ -362,10 +363,10 @@ TEST_F(IpfsLocalPinServiceTest, VerifyLocalPinJobTest) { std::move(callback).Run(result); })); - absl::optional success; + std::optional success; service()->ValidatePins( "a", {"ipfs://Qma", "ipfs://Qmb", "ipfs://Qmc"}, - base::BindLambdaForTesting([&success](absl::optional result) { + base::BindLambdaForTesting([&success](std::optional result) { success = result.value(); })); EXPECT_TRUE(success.has_value()); @@ -375,17 +376,17 @@ TEST_F(IpfsLocalPinServiceTest, VerifyLocalPinJobTest) { { ON_CALL(*GetIpfsService(), GetPins(_, _, _, _)) .WillByDefault(::testing::Invoke( - [](const absl::optional>& cid, + [](const std::optional>& cid, const std::string& type, bool quiet, IpfsService::GetPinsCallback callback) { GetPinsResult result = {}; std::move(callback).Run(result); })); - absl::optional success = false; + std::optional success = false; service()->ValidatePins( "b", {"ipfs://Qma", "ipfs://Qmb", "ipfs://Qmc", "ipfs://Qmd"}, - base::BindLambdaForTesting([&success](absl::optional result) { + base::BindLambdaForTesting([&success](std::optional result) { success = result.value(); })); @@ -395,21 +396,21 @@ TEST_F(IpfsLocalPinServiceTest, VerifyLocalPinJobTest) { } { - absl::optional success; + std::optional success; VerifyLocalPinJob job( GetPrefs(), GetIpfsService(), "b", IpfsLocalPinService::ExtractMergedPinData( {"ipfs://Qma", "ipfs://Qmb", "ipfs://Qmc", "ipfs://Qmd"}) .value(), base::BindLambdaForTesting( - [&success](absl::optional result) { success = result; })); + [&success](std::optional result) { success = result; })); ON_CALL(*GetIpfsService(), GetPins(_, _, _, _)) .WillByDefault(::testing::Invoke( - [](const absl::optional>& cid, + [](const std::optional>& cid, const std::string& type, bool quiet, IpfsService::GetPinsCallback callback) { - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(std::nullopt); })); job.Start(); @@ -428,21 +429,21 @@ TEST_F(IpfsLocalPinServiceTest, GcJobTest) { }, "direct":{ "Qmb" : ["a", "b"] }})"; - absl::optional base_value = base::JSONReader::Read( + std::optional base_value = base::JSONReader::Read( base, base::JSON_PARSE_CHROMIUM_EXTENSIONS | base::JSONParserOptions::JSON_PARSE_RFC); GetPrefs()->SetDict(kIPFSPinnedCids, base_value.value().GetDict().Clone()); } { - absl::optional success; + std::optional success; GcJob job(GetPrefs(), GetIpfsService(), base::BindLambdaForTesting( [&success](bool result) { success = result; })); ON_CALL(*GetIpfsService(), GetPins(_, _, _, _)) .WillByDefault(::testing::Invoke( - [](const absl::optional>& cid, + [](const std::optional>& cid, const std::string& type, bool quiet, IpfsService::GetPinsCallback callback) { EXPECT_FALSE(cid.has_value()); @@ -461,27 +462,26 @@ TEST_F(IpfsLocalPinServiceTest, GcJobTest) { } { - absl::optional success; + std::optional success; GcJob job(GetPrefs(), GetIpfsService(), base::BindLambdaForTesting( [&success](bool result) { success = result; })); ON_CALL(*GetIpfsService(), GetPins(_, _, _, _)) - .WillByDefault(::testing::Invoke([](const absl::optional< - std::vector>& cid, - const std::string& type, bool quiet, - IpfsService::GetPinsCallback - callback) { - EXPECT_FALSE(cid.has_value()); - EXPECT_TRUE(quiet); - GetPinsResult result; - if (type == "recursive") { - result = {{"Qm1", "Recursive"}, {"Qm2", "Recursive"}}; - } else { - result = {}; - } - std::move(callback).Run(result); - })); + .WillByDefault(::testing::Invoke( + [](const std::optional>& cid, + const std::string& type, bool quiet, + IpfsService::GetPinsCallback callback) { + EXPECT_FALSE(cid.has_value()); + EXPECT_TRUE(quiet); + GetPinsResult result; + if (type == "recursive") { + result = {{"Qm1", "Recursive"}, {"Qm2", "Recursive"}}; + } else { + result = {}; + } + std::move(callback).Run(result); + })); EXPECT_CALL(*GetIpfsService(), RemovePin(_, _)).Times(1); ON_CALL(*GetIpfsService(), RemovePin(_, _)) @@ -501,17 +501,17 @@ TEST_F(IpfsLocalPinServiceTest, GcJobTest) { } { - absl::optional success; + std::optional success; GcJob job(GetPrefs(), GetIpfsService(), base::BindLambdaForTesting( [&success](bool result) { success = result; })); ON_CALL(*GetIpfsService(), GetPins(_, _, _, _)) .WillByDefault(::testing::Invoke( - [](const absl::optional>& cid, + [](const std::optional>& cid, const std::string& type, bool quiet, IpfsService::GetPinsCallback callback) { - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(std::nullopt); })); EXPECT_CALL(*GetIpfsService(), RemovePin(_, _)).Times(0); @@ -530,7 +530,7 @@ TEST_F(IpfsLocalPinServiceTest, ResetTest) { "Qmc" : ["a", "b"], "Qmd" : ["b"] }, "direct":{}})"; - absl::optional base_value = base::JSONReader::Read( + std::optional base_value = base::JSONReader::Read( base, base::JSON_PARSE_CHROMIUM_EXTENSIONS | base::JSONParserOptions::JSON_PARSE_RFC); GetPrefs()->SetDict(kIPFSPinnedCids, base_value.value().GetDict().Clone()); @@ -549,7 +549,7 @@ TEST_F(IpfsLocalPinServiceTest, ResetTest) { EXPECT_NE(cid.end(), cid.find("bafy3")); std::move(callback).Run(true); })); - absl::optional reset_result; + std::optional reset_result; service()->AddPins("123", {"ipfs://bafy1", "ipfs://bafy2"}, base::DoNothing()); service()->AddPins("345", {"ipfs://bafy1", "ipfs://bafy2"}, @@ -572,7 +572,7 @@ TEST_F(IpfsLocalPinServiceTest, ResetTest_UnpinFailed) { "Qmc" : ["a", "b"], "Qmd" : ["b"] }, "direct":{}})"; - absl::optional base_value = base::JSONReader::Read( + std::optional base_value = base::JSONReader::Read( base, base::JSON_PARSE_CHROMIUM_EXTENSIONS | base::JSONParserOptions::JSON_PARSE_RFC); GetPrefs()->SetDict(kIPFSPinnedCids, base_value.value().GetDict().Clone()); @@ -591,7 +591,7 @@ TEST_F(IpfsLocalPinServiceTest, ResetTest_UnpinFailed) { EXPECT_NE(cid.end(), cid.find("bafy3")); std::move(callback).Run(false); })); - absl::optional reset_result; + std::optional reset_result; service()->Reset(base::BindLambdaForTesting( [&reset_result](bool result) { reset_result = result; })); EXPECT_EQ(4u, @@ -607,7 +607,7 @@ TEST_F(IpfsLocalPinServiceTest, ResetTest_NoPinnedItems) { "Qmc" : ["a", "b"], "Qmd" : ["b"] }, "direct":{}})"; - absl::optional base_value = base::JSONReader::Read( + std::optional base_value = base::JSONReader::Read( base, base::JSON_PARSE_CHROMIUM_EXTENSIONS | base::JSONParserOptions::JSON_PARSE_RFC); GetPrefs()->SetDict(kIPFSPinnedCids, base_value.value().GetDict().Clone()); @@ -617,7 +617,7 @@ TEST_F(IpfsLocalPinServiceTest, ResetTest_NoPinnedItems) { .WillByDefault(::testing::Invoke([](IpfsService::NodeCallback callback) { std::move(callback).Run(""); })); - absl::optional reset_result; + std::optional reset_result; service()->Reset(base::BindLambdaForTesting( [&reset_result](bool result) { reset_result = result; })); EXPECT_EQ(0u, GetPrefs()->GetDict(kIPFSPinnedCids).size()); diff --git a/components/l10n/browser/default_locale_util.h b/components/l10n/browser/default_locale_util.h index efa393512b4..4c3e7ddcb1a 100644 --- a/components/l10n/browser/default_locale_util.h +++ b/components/l10n/browser/default_locale_util.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_L10N_BROWSER_DEFAULT_LOCALE_UTIL_H_ #define BRAVE_COMPONENTS_L10N_BROWSER_DEFAULT_LOCALE_UTIL_H_ +#include #include #include "absl/types/optional.h" @@ -15,7 +16,7 @@ namespace brave_l10n { // Returns the current default locale of the device. When the locale should // match the application locale or an eligible string pack for localization use // the canonicalized l10n_util::GetApplicationLocale. -absl::optional MaybeGetDefaultLocaleString(); +std::optional MaybeGetDefaultLocaleString(); } // namespace brave_l10n diff --git a/components/l10n/browser/default_locale_util_android.cc b/components/l10n/browser/default_locale_util_android.cc index 20502c00151..6451721c38e 100644 --- a/components/l10n/browser/default_locale_util_android.cc +++ b/components/l10n/browser/default_locale_util_android.cc @@ -5,11 +5,13 @@ #include "brave/components/l10n/browser/default_locale_util.h" +#include + #include "base/android/locale_utils.h" namespace brave_l10n { -absl::optional MaybeGetDefaultLocaleString() { +std::optional MaybeGetDefaultLocaleString() { return base::android::GetDefaultLocaleString(); } diff --git a/components/l10n/browser/default_locale_util_ios.mm b/components/l10n/browser/default_locale_util_ios.mm index da34e4b2d77..006f19d831e 100644 --- a/components/l10n/browser/default_locale_util_ios.mm +++ b/components/l10n/browser/default_locale_util_ios.mm @@ -7,9 +7,11 @@ #import +#include + namespace brave_l10n { -absl::optional MaybeGetDefaultLocaleString() { +std::optional MaybeGetDefaultLocaleString() { const NSLocale* const locale = NSLocale.currentLocale; return [NSString stringWithFormat:@"%@_%@", locale.languageCode, locale.countryCode] diff --git a/components/l10n/browser/default_locale_util_linux.cc b/components/l10n/browser/default_locale_util_linux.cc index 2722b6d5cff..cc1c692f943 100644 --- a/components/l10n/browser/default_locale_util_linux.cc +++ b/components/l10n/browser/default_locale_util_linux.cc @@ -3,13 +3,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include - #include "brave/components/l10n/browser/default_locale_util.h" +#include +#include + namespace brave_l10n { -absl::optional MaybeGetDefaultLocaleString() { +std::optional MaybeGetDefaultLocaleString() { // LC_ALL should always override the LANG variable, whether it is set or not. char const* language = language = std::getenv("LC_ALL"); @@ -18,7 +19,7 @@ absl::optional MaybeGetDefaultLocaleString() { } if (!language || !*language) { - return absl::nullopt; + return std::nullopt; } return {language}; diff --git a/components/l10n/browser/default_locale_util_mac.mm b/components/l10n/browser/default_locale_util_mac.mm index ca12241d401..4256eb658bd 100644 --- a/components/l10n/browser/default_locale_util_mac.mm +++ b/components/l10n/browser/default_locale_util_mac.mm @@ -7,9 +7,11 @@ #import +#include + namespace brave_l10n { -absl::optional MaybeGetDefaultLocaleString() { +std::optional MaybeGetDefaultLocaleString() { const NSString* const locale = [[NSLocale preferredLanguages] firstObject]; return locale.UTF8String; } diff --git a/components/l10n/browser/default_locale_util_win.cc b/components/l10n/browser/default_locale_util_win.cc index 2cad571dc96..425cc457247 100644 --- a/components/l10n/browser/default_locale_util_win.cc +++ b/components/l10n/browser/default_locale_util_win.cc @@ -8,23 +8,24 @@ #include #include +#include namespace brave_l10n { -absl::optional MaybeGetDefaultLocaleString() { +std::optional MaybeGetDefaultLocaleString() { const int buffer_size = ::GetLocaleInfoEx(/*lpLocaleName*/ nullptr, /*LCType*/ LOCALE_SNAME, /*lpLCData*/ nullptr, /*cchData*/ 0); if (buffer_size == 0) { - return absl::nullopt; + return std::nullopt; } const std::unique_ptr locale_sname(new wchar_t[buffer_size]); if (::GetLocaleInfoEx(/*lpLocaleName*/ nullptr, /*LCType*/ LOCALE_SNAME, /*lpLCData*/ locale_sname.get(), /*cchData*/ buffer_size) == 0) { - return absl::nullopt; + return std::nullopt; } const std::unique_ptr default_locale(new char[buffer_size]); diff --git a/components/l10n/common/locale_subtag_parser_util.cc b/components/l10n/common/locale_subtag_parser_util.cc index 8fc6cbb8706..177b3cbecd4 100644 --- a/components/l10n/common/locale_subtag_parser_util.cc +++ b/components/l10n/common/locale_subtag_parser_util.cc @@ -5,6 +5,8 @@ #include "brave/components/l10n/common/locale_subtag_parser_util.h" +#include + #include "absl/types/optional.h" #include "base/no_destructor.h" #include "base/strings/strcat.h" @@ -38,8 +40,8 @@ std::string NormalizeLocale(const std::string& locale) { return normalized_locale; } -absl::optional& CachedLocaleSubtag() { - static base::NoDestructor> +std::optional& CachedLocaleSubtag() { + static base::NoDestructor> cached_locale_subtag; return *cached_locale_subtag; } diff --git a/components/l10n/common/locale_util.cc b/components/l10n/common/locale_util.cc index c39fc0cddb8..35a9263e5f7 100644 --- a/components/l10n/common/locale_util.cc +++ b/components/l10n/common/locale_util.cc @@ -5,6 +5,8 @@ #include "brave/components/l10n/common/locale_util.h" +#include + #include "brave/components/l10n/common/default_locale.h" #include "brave/components/l10n/common/locale_subtag_info.h" #include "brave/components/l10n/common/locale_subtag_parser_util.h" @@ -35,16 +37,16 @@ std::string GetDefaultISOLanguageCodeString() { return GetISOLanguageCode(GetDefaultLocaleString()); } -absl::optional GetISOScriptCode(const std::string& locale) { +std::optional GetISOScriptCode(const std::string& locale) { std::string script = ParseLocaleSubtags(locale).script; if (script.empty()) { - return absl::nullopt; + return std::nullopt; } return script; } -absl::optional GetDefaultISOScriptCodeString() { +std::optional GetDefaultISOScriptCodeString() { return GetISOScriptCode(GetDefaultLocaleString()); } @@ -61,29 +63,29 @@ std::string GetDefaultISOCountryCodeString() { return GetISOCountryCode(GetDefaultLocaleString()); } -absl::optional GetCharSet(const std::string& locale) { +std::optional GetCharSet(const std::string& locale) { std::string charset = ParseLocaleSubtags(locale).charset; if (charset.empty()) { - return absl::nullopt; + return std::nullopt; } return charset; } -absl::optional GetDefaultCharSetString() { +std::optional GetDefaultCharSetString() { return GetCharSet(GetDefaultLocaleString()); } -absl::optional GetVariant(const std::string& locale) { +std::optional GetVariant(const std::string& locale) { std::string variant_code = ParseLocaleSubtags(locale).variant; if (variant_code.empty()) { - return absl::nullopt; + return std::nullopt; } return variant_code; } -absl::optional GetDefaultVariantString() { +std::optional GetDefaultVariantString() { return GetVariant(GetDefaultLocaleString()); } diff --git a/components/l10n/common/locale_util.h b/components/l10n/common/locale_util.h index a6e826afa97..f1e05fc7eac 100644 --- a/components/l10n/common/locale_util.h +++ b/components/l10n/common/locale_util.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_L10N_COMMON_LOCALE_UTIL_H_ #define BRAVE_COMPONENTS_L10N_COMMON_LOCALE_UTIL_H_ +#include #include #include "absl/types/optional.h" @@ -32,12 +33,12 @@ std::string GetDefaultISOLanguageCodeString(); // Returns an optional sentence case four-letter ISO 15924 script code for the // given locale. See https://en.wikipedia.org/wiki/ISO_15924. -absl::optional GetISOScriptCode(const std::string& locale); +std::optional GetISOScriptCode(const std::string& locale); // Returns an optional sentence case four-letter ISO 15924 script code for the // current default locale of the device as a string. See // https://en.wikipedia.org/wiki/ISO_15924. -absl::optional GetDefaultISOScriptCodeString(); +std::optional GetDefaultISOScriptCodeString(); // Returns an uppercase two-letter ISO 3166-1 alpha-2 country code or UN M.49 // code for the given locale, falling back to "US" if the locale does not @@ -54,19 +55,19 @@ std::string GetISOCountryCode(const std::string& locale); std::string GetDefaultISOCountryCodeString(); // Returns an optional charset specifier for the given locale. -absl::optional GetCharSet(const std::string& locale); +std::optional GetCharSet(const std::string& locale); // Returns an optional charset for the current default locale of the device as a // string. -absl::optional GetDefaultCharSetString(); +std::optional GetDefaultCharSetString(); // Returns optional well-recognized variations that define a language or its // dialects for the given locale. -absl::optional GetVariant(const std::string& locale); +std::optional GetVariant(const std::string& locale); // Returns optional well-recognized variations that define a language or its // dialects for the current default locale of the device as a string. -absl::optional GetDefaultVariantString(); +std::optional GetDefaultVariantString(); } // namespace brave_l10n diff --git a/components/misc_metrics/menu_metrics.h b/components/misc_metrics/menu_metrics.h index 40cb9a9e53f..35e84e89fa3 100644 --- a/components/misc_metrics/menu_metrics.h +++ b/components/misc_metrics/menu_metrics.h @@ -6,12 +6,12 @@ #ifndef BRAVE_COMPONENTS_MISC_METRICS_MENU_METRICS_H_ #define BRAVE_COMPONENTS_MISC_METRICS_MENU_METRICS_H_ +#include #include #include "base/memory/raw_ptr.h" #include "base/timer/wall_clock_timer.h" #include "brave/components/time_period_storage/weekly_storage.h" -#include "third_party/abseil-cpp/absl/types/optional.h" class PrefRegistrySimple; class PrefService; @@ -67,7 +67,7 @@ class MenuMetrics { void Update(); - absl::optional> current_max_group_; + std::optional> current_max_group_; raw_ptr local_state_ = nullptr; WeeklyStorage menu_shown_storage_; diff --git a/components/ntp_background_images/browser/ntp_background_images_data.cc b/components/ntp_background_images/browser/ntp_background_images_data.cc index 2f460f3aad7..46432a8828e 100644 --- a/components/ntp_background_images/browser/ntp_background_images_data.cc +++ b/components/ntp_background_images/browser/ntp_background_images_data.cc @@ -5,6 +5,7 @@ #include "brave/components/ntp_background_images/browser/ntp_background_images_data.h" +#include #include #include "base/json/json_reader.h" @@ -54,14 +55,14 @@ NTPBackgroundImagesData::NTPBackgroundImagesData( const std::string& json_string, const base::FilePath& installed_dir) : NTPBackgroundImagesData() { - absl::optional json_value = base::JSONReader::Read(json_string); + std::optional json_value = base::JSONReader::Read(json_string); if (!json_value || !json_value->is_dict()) { DVLOG(2) << "Read json data failed. Invalid JSON data"; return; } base::Value::Dict& root = json_value->GetDict(); - absl::optional incomingSchemaVersion = root.FindInt(kSchemaVersionKey); + std::optional incomingSchemaVersion = root.FindInt(kSchemaVersionKey); const bool schemaVersionIsValid = incomingSchemaVersion && *incomingSchemaVersion == kExpectedSchemaVersion; if (!schemaVersionIsValid) { diff --git a/components/ntp_background_images/browser/ntp_background_images_data.h b/components/ntp_background_images/browser/ntp_background_images_data.h index b81c12ff41a..a8c5d35b201 100644 --- a/components/ntp_background_images/browser/ntp_background_images_data.h +++ b/components/ntp_background_images/browser/ntp_background_images_data.h @@ -11,7 +11,6 @@ #include "base/files/file_path.h" #include "base/values.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/gfx/geometry/point.h" #include "ui/gfx/geometry/rect.h" diff --git a/components/ntp_background_images/browser/ntp_background_images_service.cc b/components/ntp_background_images/browser/ntp_background_images_service.cc index 766b8323f81..a2f9c486b98 100644 --- a/components/ntp_background_images/browser/ntp_background_images_service.cc +++ b/components/ntp_background_images/browser/ntp_background_images_service.cc @@ -7,6 +7,7 @@ #include #include +#include #include #include "base/command_line.h" @@ -404,7 +405,7 @@ void NTPBackgroundImagesService::OnGetMappingTableData( return; } - absl::optional mapping_table_value = + std::optional mapping_table_value = base::JSONReader::Read(json_string); if (!mapping_table_value) { diff --git a/components/ntp_background_images/browser/ntp_background_images_service.h b/components/ntp_background_images/browser/ntp_background_images_service.h index d716da6e885..6d1381aedaa 100644 --- a/components/ntp_background_images/browser/ntp_background_images_service.h +++ b/components/ntp_background_images/browser/ntp_background_images_service.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_NTP_BACKGROUND_IMAGES_BROWSER_NTP_BACKGROUND_IMAGES_SERVICE_H_ #include +#include #include #include @@ -156,7 +157,7 @@ class NTPBackgroundImagesService { bool test_data_used_ = false; raw_ptr component_update_service_ = nullptr; - absl::optional sponsored_images_component_id_; + std::optional sponsored_images_component_id_; raw_ptr local_pref_ = nullptr; base::FilePath bi_installed_dir_; std::unique_ptr bi_images_data_; @@ -177,7 +178,7 @@ class NTPBackgroundImagesService { // is done is important for super referral. If this is SR install, we should // not show SI images until user chooses Brave default images. So, we should // know the exact timing whether SR assets is ready to use or not. - absl::optional initial_sr_component_info_; + std::optional initial_sr_component_info_; base::WeakPtrFactory weak_factory_; }; diff --git a/components/ntp_background_images/browser/ntp_background_images_source.cc b/components/ntp_background_images/browser/ntp_background_images_source.cc index c5cac786b8e..4e37ad84548 100644 --- a/components/ntp_background_images/browser/ntp_background_images_source.cc +++ b/components/ntp_background_images/browser/ntp_background_images_source.cc @@ -5,6 +5,7 @@ #include "brave/components/ntp_background_images/browser/ntp_background_images_source.h" +#include #include #include @@ -24,10 +25,10 @@ namespace ntp_background_images { namespace { -absl::optional ReadFileToString(const base::FilePath& path) { +std::optional ReadFileToString(const base::FilePath& path) { std::string contents; if (!base::ReadFileToString(path, &contents)) - return absl::optional(); + return std::optional(); return contents; } @@ -80,7 +81,7 @@ void NTPBackgroundImagesSource::GetImageFile( void NTPBackgroundImagesSource::OnGotImageFile( GotDataCallback callback, - absl::optional input) { + std::optional input) { if (!input) return; diff --git a/components/ntp_background_images/browser/ntp_background_images_source.h b/components/ntp_background_images/browser/ntp_background_images_source.h index 1e7211f2837..14ccb8253f5 100644 --- a/components/ntp_background_images/browser/ntp_background_images_source.h +++ b/components/ntp_background_images/browser/ntp_background_images_source.h @@ -6,13 +6,13 @@ #ifndef BRAVE_COMPONENTS_NTP_BACKGROUND_IMAGES_BROWSER_NTP_BACKGROUND_IMAGES_SOURCE_H_ #define BRAVE_COMPONENTS_NTP_BACKGROUND_IMAGES_BROWSER_NTP_BACKGROUND_IMAGES_SOURCE_H_ +#include #include #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "content/public/browser/url_data_source.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace base { class FilePath; @@ -48,7 +48,7 @@ class NTPBackgroundImagesSource : public content::URLDataSource { void GetImageFile(const base::FilePath& image_file_path, GotDataCallback callback); void OnGotImageFile(GotDataCallback callback, - absl::optional input); + std::optional input); int GetWallpaperIndexFromPath(const std::string& path) const; raw_ptr service_ = nullptr; // not owned diff --git a/components/ntp_background_images/browser/ntp_sponsored_images_data.cc b/components/ntp_background_images/browser/ntp_sponsored_images_data.cc index ccea51d343a..44dd076105b 100644 --- a/components/ntp_background_images/browser/ntp_sponsored_images_data.cc +++ b/components/ntp_background_images/browser/ntp_sponsored_images_data.cc @@ -5,6 +5,7 @@ #include "brave/components/ntp_background_images/browser/ntp_sponsored_images_data.h" +#include #include #include "base/json/json_reader.h" @@ -139,14 +140,14 @@ NTPSponsoredImagesData::NTPSponsoredImagesData( const std::string& json_string, const base::FilePath& installed_dir) : NTPSponsoredImagesData() { - absl::optional json_value = base::JSONReader::Read(json_string); + std::optional json_value = base::JSONReader::Read(json_string); if (!json_value || !json_value->is_dict()) { DVLOG(2) << "Read json data failed. Invalid JSON data"; return; } base::Value::Dict& root = json_value->GetDict(); - absl::optional incomingSchemaVersion = root.FindInt(kSchemaVersionKey); + std::optional incomingSchemaVersion = root.FindInt(kSchemaVersionKey); const bool schemaVersionIsValid = incomingSchemaVersion && *incomingSchemaVersion == kExpectedSchemaVersion; if (!schemaVersionIsValid) { @@ -299,7 +300,7 @@ bool NTPSponsoredImagesData::IsSuperReferral() const { return IsValid() && !theme_name.empty(); } -absl::optional NTPSponsoredImagesData::GetBackgroundAt( +std::optional NTPSponsoredImagesData::GetBackgroundAt( size_t campaign_index, size_t background_index) { DCHECK(campaign_index < campaigns.size() && background_index >= 0 && @@ -307,7 +308,7 @@ absl::optional NTPSponsoredImagesData::GetBackgroundAt( const auto campaign = campaigns[campaign_index]; if (!campaign.IsValid()) - return absl::nullopt; + return std::nullopt; base::Value::Dict data; data.Set(kThemeNameKey, theme_name); @@ -341,7 +342,7 @@ absl::optional NTPSponsoredImagesData::GetBackgroundAt( return data; } -absl::optional NTPSponsoredImagesData::GetBackgroundByAdInfo( +std::optional NTPSponsoredImagesData::GetBackgroundByAdInfo( const brave_ads::NewTabPageAdInfo& ad_info) { // Find campaign size_t campaign_index = 0; @@ -353,7 +354,7 @@ absl::optional NTPSponsoredImagesData::GetBackgroundByAdInfo( if (campaign_index == campaigns.size()) { VLOG(0) << "The ad campaign wasn't found in the NTP sponsored images data: " << ad_info.campaign_id; - return absl::nullopt; + return std::nullopt; } const auto& sponsored_backgrounds = campaigns[campaign_index].backgrounds; @@ -367,7 +368,7 @@ absl::optional NTPSponsoredImagesData::GetBackgroundByAdInfo( if (background_index == sponsored_backgrounds.size()) { VLOG(0) << "Creative instance wasn't found in NTP sposored images data: " << ad_info.creative_instance_id; - return absl::nullopt; + return std::nullopt; } if (VLOG_IS_ON(0)) { @@ -380,7 +381,7 @@ absl::optional NTPSponsoredImagesData::GetBackgroundByAdInfo( } } - absl::optional data = + std::optional data = GetBackgroundAt(campaign_index, background_index); if (data) { data->Set(kWallpaperIDKey, ad_info.placement_id); diff --git a/components/ntp_background_images/browser/ntp_sponsored_images_data.h b/components/ntp_background_images/browser/ntp_sponsored_images_data.h index b38fa5d1ca3..c7f91f7b191 100644 --- a/components/ntp_background_images/browser/ntp_sponsored_images_data.h +++ b/components/ntp_background_images/browser/ntp_sponsored_images_data.h @@ -6,12 +6,12 @@ #ifndef BRAVE_COMPONENTS_NTP_BACKGROUND_IMAGES_BROWSER_NTP_SPONSORED_IMAGES_DATA_H_ #define BRAVE_COMPONENTS_NTP_BACKGROUND_IMAGES_BROWSER_NTP_SPONSORED_IMAGES_DATA_H_ +#include #include #include #include "base/files/file_path.h" #include "base/values.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/gfx/geometry/point.h" #include "ui/gfx/geometry/rect.h" @@ -61,7 +61,7 @@ struct SponsoredBackground { std::string creative_instance_id; Logo logo; - absl::optional viewbox; + std::optional viewbox; SponsoredBackground(); // For unit test. @@ -107,9 +107,9 @@ struct NTPSponsoredImagesData { void ParseSRProperties(const base::Value::Dict& value, const base::FilePath& installed_dir); - absl::optional GetBackgroundAt(size_t campaign_index, - size_t background_index); - absl::optional GetBackgroundByAdInfo( + std::optional GetBackgroundAt(size_t campaign_index, + size_t background_index); + std::optional GetBackgroundByAdInfo( const brave_ads::NewTabPageAdInfo& ad_info); bool IsSuperReferral() const; diff --git a/components/ntp_background_images/browser/ntp_sponsored_images_source.cc b/components/ntp_background_images/browser/ntp_sponsored_images_source.cc index aa9b0dc938b..99e046cf9bd 100644 --- a/components/ntp_background_images/browser/ntp_sponsored_images_source.cc +++ b/components/ntp_background_images/browser/ntp_sponsored_images_source.cc @@ -5,6 +5,7 @@ #include "brave/components/ntp_background_images/browser/ntp_sponsored_images_source.h" +#include #include #include @@ -24,10 +25,10 @@ namespace ntp_background_images { namespace { -absl::optional ReadFileToString(const base::FilePath& path) { +std::optional ReadFileToString(const base::FilePath& path) { std::string contents; if (!base::ReadFileToString(path, &contents)) - return absl::optional(); + return std::optional(); return contents; } @@ -85,7 +86,7 @@ void NTPSponsoredImagesSource::GetImageFile( void NTPSponsoredImagesSource::OnGotImageFile( GotDataCallback callback, - absl::optional input) { + std::optional input) { if (!input) return; diff --git a/components/ntp_background_images/browser/ntp_sponsored_images_source.h b/components/ntp_background_images/browser/ntp_sponsored_images_source.h index 42fe51a2c33..a86504496a3 100644 --- a/components/ntp_background_images/browser/ntp_sponsored_images_source.h +++ b/components/ntp_background_images/browser/ntp_sponsored_images_source.h @@ -6,13 +6,13 @@ #ifndef BRAVE_COMPONENTS_NTP_BACKGROUND_IMAGES_BROWSER_NTP_SPONSORED_IMAGES_SOURCE_H_ #define BRAVE_COMPONENTS_NTP_BACKGROUND_IMAGES_BROWSER_NTP_SPONSORED_IMAGES_SOURCE_H_ +#include #include #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "content/public/browser/url_data_source.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace base { class FilePath; @@ -49,7 +49,7 @@ class NTPSponsoredImagesSource : public content::URLDataSource { void GetImageFile(const base::FilePath& image_file_path, GotDataCallback callback); void OnGotImageFile(GotDataCallback callback, - absl::optional input); + std::optional input); bool IsValidPath(const std::string& path) const; raw_ptr service_ = nullptr; // not owned diff --git a/components/ntp_background_images/browser/sponsored_images_component_data.cc b/components/ntp_background_images/browser/sponsored_images_component_data.cc index be5b40481f0..b79bed963c8 100644 --- a/components/ntp_background_images/browser/sponsored_images_component_data.cc +++ b/components/ntp_background_images/browser/sponsored_images_component_data.cc @@ -4,6 +4,9 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "brave/components/ntp_background_images/browser/sponsored_images_component_data.h" + +#include + #include "base/feature_list.h" #include "brave/components/ntp_background_images/browser/features.h" #include "build/build_config.h" @@ -7116,7 +7119,7 @@ constexpr SponsoredImagesComponentData kRegionalData[] = { } // namespace -absl::optional GetSponsoredImagesComponentData( +std::optional GetSponsoredImagesComponentData( const std::string& region) { if (base::FeatureList::IsEnabled(features::kBraveNTPBrandedWallpaperDemo)) { return kDemoData; @@ -7126,7 +7129,7 @@ absl::optional GetSponsoredImagesComponentData( if (data.region == region) return data; } - return absl::nullopt; + return std::nullopt; } } // namespace ntp_background_images diff --git a/components/ntp_background_images/browser/sponsored_images_component_data.h b/components/ntp_background_images/browser/sponsored_images_component_data.h index 6df653ab9bd..06711cab1fc 100644 --- a/components/ntp_background_images/browser/sponsored_images_component_data.h +++ b/components/ntp_background_images/browser/sponsored_images_component_data.h @@ -6,10 +6,10 @@ #ifndef BRAVE_COMPONENTS_NTP_BACKGROUND_IMAGES_BROWSER_SPONSORED_IMAGES_COMPONENT_DATA_H_ #define BRAVE_COMPONENTS_NTP_BACKGROUND_IMAGES_BROWSER_SPONSORED_IMAGES_COMPONENT_DATA_H_ +#include #include #include -#include "third_party/abseil-cpp/absl/types/optional.h" namespace ntp_background_images { @@ -19,7 +19,7 @@ struct SponsoredImagesComponentData { std::string_view component_id; }; -absl::optional GetSponsoredImagesComponentData( +std::optional GetSponsoredImagesComponentData( const std::string& region); } // namespace ntp_background_images diff --git a/components/ntp_background_images/browser/view_counter_service.cc b/components/ntp_background_images/browser/view_counter_service.cc index 15532e7528d..b1ae9e269ef 100644 --- a/components/ntp_background_images/browser/view_counter_service.cc +++ b/components/ntp_background_images/browser/view_counter_service.cc @@ -6,6 +6,7 @@ #include "brave/components/ntp_background_images/browser/view_counter_service.h" #include +#include #include #include #include @@ -167,10 +168,10 @@ NTPSponsoredImagesData* ViewCounterService::GetCurrentBrandedWallpaperData() return service_->GetBrandedImagesData(false); } -absl::optional +std::optional ViewCounterService::GetCurrentWallpaperForDisplay() { if (ShouldShowBrandedWallpaper()) { - absl::optional branded_wallpaper = + std::optional branded_wallpaper = GetCurrentBrandedWallpaper(); if (branded_wallpaper) { return branded_wallpaper; @@ -185,10 +186,10 @@ ViewCounterService::GetCurrentWallpaperForDisplay() { return GetCurrentWallpaper(); } -absl::optional ViewCounterService::GetCurrentWallpaper() +std::optional ViewCounterService::GetCurrentWallpaper() const { if (!IsBackgroundWallpaperActive()) - return absl::nullopt; + return std::nullopt; #if BUILDFLAG(ENABLE_CUSTOM_BACKGROUND) if (ShouldShowCustomBackground()) { @@ -202,7 +203,7 @@ absl::optional ViewCounterService::GetCurrentWallpaper() auto* data = GetCurrentWallpaperData(); if (!data) { CHECK_IS_TEST(); - return absl::nullopt; + return std::nullopt; } auto background = @@ -211,11 +212,11 @@ absl::optional ViewCounterService::GetCurrentWallpaper() return background; } -absl::optional +std::optional ViewCounterService::GetCurrentBrandedWallpaper() const { NTPSponsoredImagesData* images_data = GetCurrentBrandedWallpaperData(); if (!images_data) { - return absl::nullopt; + return std::nullopt; } const bool should_frequency_cap_ads = @@ -227,17 +228,17 @@ ViewCounterService::GetCurrentBrandedWallpaper() const { return GetCurrentBrandedWallpaperFromModel(); } -absl::optional +std::optional ViewCounterService::GetCurrentBrandedWallpaperByAdInfo() const { DCHECK(ads_service_); - const absl::optional ad = + const std::optional ad = ads_service_->GetPrefetchedNewTabPageAdForDisplay(); if (!ad) { - return absl::nullopt; + return std::nullopt; } - absl::optional branded_wallpaper_data = + std::optional branded_wallpaper_data = GetCurrentBrandedWallpaperData()->GetBackgroundByAdInfo(*ad); if (!branded_wallpaper_data) { ads_service_->OnFailedToPrefetchNewTabPageAd(ad->placement_id, @@ -247,7 +248,7 @@ ViewCounterService::GetCurrentBrandedWallpaperByAdInfo() const { return branded_wallpaper_data; } -absl::optional +std::optional ViewCounterService::GetCurrentBrandedWallpaperFromModel() const { size_t current_campaign_index; size_t current_background_index; diff --git a/components/ntp_background_images/browser/view_counter_service.h b/components/ntp_background_images/browser/view_counter_service.h index cde48a024c9..7a037a5b621 100644 --- a/components/ntp_background_images/browser/view_counter_service.h +++ b/components/ntp_background_images/browser/view_counter_service.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_NTP_BACKGROUND_IMAGES_BROWSER_VIEW_COUNTER_SERVICE_H_ #include +#include #include #include @@ -76,11 +77,11 @@ class ViewCounterService : public KeyedService, const std::string& destination_url, const std::string& wallpaper_id); - absl::optional GetCurrentWallpaperForDisplay(); - absl::optional GetCurrentWallpaper() const; - absl::optional GetCurrentBrandedWallpaper() const; - absl::optional GetCurrentBrandedWallpaperByAdInfo() const; - absl::optional GetCurrentBrandedWallpaperFromModel() const; + std::optional GetCurrentWallpaperForDisplay(); + std::optional GetCurrentWallpaper() const; + std::optional GetCurrentBrandedWallpaper() const; + std::optional GetCurrentBrandedWallpaperByAdInfo() const; + std::optional GetCurrentBrandedWallpaperFromModel() const; std::vector GetTopSitesData() const; bool IsSuperReferral() const; diff --git a/components/ntp_background_images/browser/view_counter_service_unittest.cc b/components/ntp_background_images/browser/view_counter_service_unittest.cc index 12708ec4123..0d987ace58a 100644 --- a/components/ntp_background_images/browser/view_counter_service_unittest.cc +++ b/components/ntp_background_images/browser/view_counter_service_unittest.cc @@ -3,7 +3,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include "brave/components/ntp_background_images/browser/view_counter_service.h" + #include +#include #include #include @@ -25,7 +28,6 @@ #include "brave/components/ntp_background_images/browser/ntp_sponsored_images_data.h" #include "brave/components/ntp_background_images/browser/url_constants.h" #include "brave/components/ntp_background_images/browser/view_counter_model.h" -#include "brave/components/ntp_background_images/browser/view_counter_service.h" #include "brave/components/ntp_background_images/buildflags/buildflags.h" #include "brave/components/ntp_background_images/common/pref_names.h" #include "build/build_config.h" @@ -233,7 +235,7 @@ class NTPBackgroundImagesViewCounterTest : public testing::Test { return features::kInitialCountToBrandedWallpaper.Get(); } - absl::optional TryGetFirstSponsoredImageWallpaper() { + std::optional TryGetFirstSponsoredImageWallpaper() { // Loading initial count times. for (int i = 0; i < GetInitialCountToBrandedWallpaper(); ++i) { auto wallpaper = view_counter_->GetCurrentWallpaperForDisplay(); @@ -468,7 +470,7 @@ TEST_F(NTPBackgroundImagesViewCounterTest, SponsoredImageAdFrequencyCapped) { prefs()->SetBoolean(brave_rewards::prefs::kEnabled, true); EXPECT_CALL(ads_service_mock_, GetPrefetchedNewTabPageAdForDisplay()) - .WillOnce(Return(absl::nullopt)); + .WillOnce(Return(std::nullopt)); EXPECT_CALL(ads_service_mock_, PrefetchNewTabPageAd()) .Times(GetInitialCountToBrandedWallpaper()); EXPECT_CALL(ads_service_mock_, OnFailedToPrefetchNewTabPageAd(_, _)).Times(0); diff --git a/components/p3a/constellation_log_store.cc b/components/p3a/constellation_log_store.cc index df488296671..9350ae7a986 100644 --- a/components/p3a/constellation_log_store.cc +++ b/components/p3a/constellation_log_store.cc @@ -6,6 +6,7 @@ #include "brave/components/p3a/constellation_log_store.h" #include +#include #include #include @@ -127,9 +128,9 @@ const std::string& ConstellationLogStore::staged_log_signature() const { return staged_log_signature_; } -absl::optional ConstellationLogStore::staged_log_user_id() const { +std::optional ConstellationLogStore::staged_log_user_id() const { NOTREACHED(); - return absl::nullopt; + return std::nullopt; } void ConstellationLogStore::StageNextLog() { diff --git a/components/p3a/constellation_log_store.h b/components/p3a/constellation_log_store.h index b08168ffbbb..d15dca7f95a 100644 --- a/components/p3a/constellation_log_store.h +++ b/components/p3a/constellation_log_store.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_P3A_CONSTELLATION_LOG_STORE_H_ #include +#include #include #include #include @@ -17,7 +18,6 @@ #include "base/time/time.h" #include "brave/components/p3a/metric_log_type.h" #include "components/metrics/log_store.h" -#include "third_party/abseil-cpp/absl/types/optional.h" class PrefService; class PrefRegistrySimple; @@ -55,7 +55,7 @@ class ConstellationLogStore : public metrics::LogStore { std::string staged_log_type() const; const std::string& staged_log_hash() const override; const std::string& staged_log_signature() const override; - absl::optional staged_log_user_id() const override; + std::optional staged_log_user_id() const override; void StageNextLog() override; void DiscardStagedLog(std::string_view reason = "") override; void MarkStagedLogAsSent() override; diff --git a/components/p3a/message_manager.cc b/components/p3a/message_manager.cc index 7993941a0d7..592babbbce2 100644 --- a/components/p3a/message_manager.cc +++ b/components/p3a/message_manager.cc @@ -5,6 +5,7 @@ #include "brave/components/p3a/message_manager.h" +#include #include #include "base/functional/bind.h" @@ -124,7 +125,7 @@ void MessageManager::Init( void MessageManager::UpdateMetricValue( std::string_view histogram_name, size_t bucket, - absl::optional only_update_for_constellation) { + std::optional only_update_for_constellation) { bool update_for_all = !only_update_for_constellation.has_value(); MetricLogType log_type = GetLogTypeForHistogram(histogram_name); if (features::IsConstellationEnabled() && @@ -140,7 +141,7 @@ void MessageManager::UpdateMetricValue( void MessageManager::RemoveMetricValue( std::string_view histogram_name, - absl::optional only_update_for_constellation) { + std::optional only_update_for_constellation) { bool update_for_all = !only_update_for_constellation.has_value(); for (MetricLogType log_type : kAllMetricLogTypes) { auto* json_log_store = json_log_stores_[log_type].get(); diff --git a/components/p3a/message_manager.h b/components/p3a/message_manager.h index aa4b62f5126..914e144e0a4 100644 --- a/components/p3a/message_manager.h +++ b/components/p3a/message_manager.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_P3A_MESSAGE_MANAGER_H_ #include +#include #include #include @@ -19,7 +20,6 @@ #include "brave/components/p3a/metric_log_store.h" #include "brave/components/p3a/metric_log_type.h" #include "brave/components/p3a/p3a_message.h" -#include "third_party/abseil-cpp/absl/types/optional.h" class PrefService; @@ -53,7 +53,7 @@ class MessageManager : public MetricLogStore::Delegate { base::RepeatingCallback; class Delegate { public: - virtual absl::optional GetDynamicMetricLogType( + virtual std::optional GetDynamicMetricLogType( const std::string& histogram_name) const = 0; virtual void OnRotation(MetricLogType log_type, bool is_constellation) = 0; // A metric "cycle" is a transmission to the P3A JSON server, @@ -82,10 +82,10 @@ class MessageManager : public MetricLogStore::Delegate { void UpdateMetricValue( std::string_view histogram_name, size_t bucket, - absl::optional only_update_for_constellation = absl::nullopt); + std::optional only_update_for_constellation = std::nullopt); void RemoveMetricValue( std::string_view histogram_name, - absl::optional only_update_for_constellation = absl::nullopt); + std::optional only_update_for_constellation = std::nullopt); private: void StartScheduledUpload(bool is_constellation, MetricLogType log_type); diff --git a/components/p3a/message_manager_unittest.cc b/components/p3a/message_manager_unittest.cc index 1055d6c71c1..10beb34bc61 100644 --- a/components/p3a/message_manager_unittest.cc +++ b/components/p3a/message_manager_unittest.cc @@ -6,6 +6,7 @@ #include "brave/components/p3a/message_manager.h" #include +#include #include #include @@ -53,9 +54,9 @@ class P3AMessageManagerTest : public testing::Test, base::MakeRefCounted( &url_loader_factory_)) {} - absl::optional GetDynamicMetricLogType( + std::optional GetDynamicMetricLogType( const std::string& histogram_name) const override { - return absl::optional(); + return std::optional(); } void OnRotation(MetricLogType log_type, bool is_constellation) override {} @@ -144,7 +145,7 @@ class P3AMessageManagerTest : public testing::Test, std::string(kTestStarUploadHost))) { std::string log_type_str = request.url.path(); EXPECT_TRUE(base::TrimString(log_type_str, "/", &log_type_str)); - absl::optional log_type = + std::optional log_type = StringToMetricLogType(log_type_str); EXPECT_TRUE(log_type.has_value()); @@ -269,7 +270,7 @@ class P3AMessageManagerTest : public testing::Test, base::Value::Dict parsed_log = base::test::ParseJsonDict(body); std::string* metric_name = parsed_log.FindString("metric_name"); ASSERT_TRUE(metric_name); - absl::optional metric_value = parsed_log.FindInt("metric_value"); + std::optional metric_value = parsed_log.FindInt("metric_value"); ASSERT_TRUE(metric_value); if (is_p2a) { diff --git a/components/p3a/metric_log_store.cc b/components/p3a/metric_log_store.cc index b0af6737de4..09f8214d1ad 100644 --- a/components/p3a/metric_log_store.cc +++ b/components/p3a/metric_log_store.cc @@ -5,6 +5,7 @@ #include "brave/components/p3a/metric_log_store.h" +#include #include #include @@ -227,9 +228,9 @@ const std::string& MetricLogStore::staged_log_signature() const { return staged_log_signature_; } -absl::optional MetricLogStore::staged_log_user_id() const { +std::optional MetricLogStore::staged_log_user_id() const { NOTREACHED(); - return absl::nullopt; + return std::nullopt; } void MetricLogStore::StageNextLog() { diff --git a/components/p3a/metric_log_store.h b/components/p3a/metric_log_store.h index 4101bafa563..c0ae6728cbc 100644 --- a/components/p3a/metric_log_store.h +++ b/components/p3a/metric_log_store.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_P3A_METRIC_LOG_STORE_H_ #define BRAVE_COMPONENTS_P3A_METRIC_LOG_STORE_H_ +#include #include #include @@ -15,7 +16,6 @@ #include "base/time/time.h" #include "brave/components/p3a/metric_log_type.h" #include "components/metrics/log_store.h" -#include "third_party/abseil-cpp/absl/types/optional.h" class PrefService; class PrefRegistrySimple; @@ -69,7 +69,7 @@ class MetricLogStore : public metrics::LogStore { const std::string& staged_log_key() const; const std::string& staged_log_hash() const override; const std::string& staged_log_signature() const override; - absl::optional staged_log_user_id() const override; + std::optional staged_log_user_id() const override; void StageNextLog() override; void DiscardStagedLog(std::string_view reason = "") override; void MarkStagedLogAsSent() override; diff --git a/components/p3a/metric_log_type.cc b/components/p3a/metric_log_type.cc index 3f20af64d19..8de38a4661c 100644 --- a/components/p3a/metric_log_type.cc +++ b/components/p3a/metric_log_type.cc @@ -5,6 +5,8 @@ #include "brave/components/p3a/metric_log_type.h" +#include + #include "base/notreached.h" namespace p3a { @@ -27,7 +29,7 @@ const char* MetricLogTypeToString(MetricLogType log_type) { NOTREACHED(); } -absl::optional StringToMetricLogType( +std::optional StringToMetricLogType( const std::string& log_type_str) { if (log_type_str == kSlowStr) { return MetricLogType::kSlow; @@ -36,7 +38,7 @@ absl::optional StringToMetricLogType( } else if (log_type_str == kExpressStr) { return MetricLogType::kExpress; } - return absl::nullopt; + return std::nullopt; } } // namespace p3a diff --git a/components/p3a/metric_log_type.h b/components/p3a/metric_log_type.h index 974465ecca4..7cd85b68dce 100644 --- a/components/p3a/metric_log_type.h +++ b/components/p3a/metric_log_type.h @@ -6,9 +6,9 @@ #ifndef BRAVE_COMPONENTS_P3A_METRIC_LOG_TYPE_H_ #define BRAVE_COMPONENTS_P3A_METRIC_LOG_TYPE_H_ +#include #include -#include "third_party/abseil-cpp/absl/types/optional.h" namespace p3a { @@ -27,7 +27,7 @@ inline constexpr MetricLogType kAllMetricLogTypes[] = { MetricLogType::kSlow, MetricLogType::kTypical, MetricLogType::kExpress}; const char* MetricLogTypeToString(MetricLogType log_type); -absl::optional StringToMetricLogType( +std::optional StringToMetricLogType( const std::string& log_type_str); } // namespace p3a diff --git a/components/p3a/nitro_utils/attestation.cc b/components/p3a/nitro_utils/attestation.cc index d7c4404f01e..fe7b75e38ee 100644 --- a/components/p3a/nitro_utils/attestation.cc +++ b/components/p3a/nitro_utils/attestation.cc @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -30,7 +31,6 @@ #include "services/network/public/cpp/simple_url_loader.h" #include "services/network/public/mojom/url_response_head.mojom.h" #include "services/network/url_loader_factory.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/boringssl/src/include/openssl/pool.h" namespace nitro_utils { @@ -153,7 +153,7 @@ bool VerifyUserDataKey(scoped_refptr server_cert, return false; } -absl::optional ParseCertificatesAndCheckRoot( +std::optional ParseCertificatesAndCheckRoot( scoped_refptr server_cert, const cbor::Value::MapValue& cose_map) { const auto cert_it = cose_map.find(cbor::Value("certificate")); @@ -162,7 +162,7 @@ absl::optional ParseCertificatesAndCheckRoot( !cabundle_it->second.is_array()) { LOG(ERROR) << "Nitro verification: certificate and/or cabundle are " << "missing or not the right type"; - return absl::nullopt; + return std::nullopt; } const cbor::Value::ArrayValue& cabundle_arr = cabundle_it->second.GetArray(); @@ -183,14 +183,14 @@ absl::optional ParseCertificatesAndCheckRoot( for (auto& cert_val : cert_vals) { if (!cert_val.is_bytestring()) { LOG(ERROR) << "Nitro verification: certificate is not bstr"; - return absl::nullopt; + return std::nullopt; } if (!net::ParsedCertificate::CreateAndAddToVector( net::x509_util::CreateCryptoBuffer(cert_val.GetBytestring()), parse_cert_options, &cert_chain, &cert_errors)) { LOG(ERROR) << "Nitro verification: failed to parse certificate: " << cert_errors.ToDebugString(); - return absl::nullopt; + return std::nullopt; } } @@ -200,10 +200,10 @@ absl::optional ParseCertificatesAndCheckRoot( if (root_cert_fp != kAWSRootCertFP) { LOG(ERROR) << "Nitro verification: root cert fp does not match AWS root cert fp"; - return absl::nullopt; + return std::nullopt; } - return absl::make_optional(cert_chain); + return std::make_optional(cert_chain); } void ParseAndVerifyDocument( @@ -220,7 +220,7 @@ void ParseAndVerifyDocument( std::string_view trimmed_body = base::TrimWhitespaceASCII(*response_body, base::TrimPositions::TRIM_ALL); - absl::optional> cose_encoded = + std::optional> cose_encoded = base::Base64Decode(trimmed_body); if (!cose_encoded.has_value()) { LOG(ERROR) << "Nitro verification: Failed to decode base64 document"; @@ -260,7 +260,7 @@ void ParseAndVerifyDocument( return; } - absl::optional cert_chain = + std::optional cert_chain = ParseCertificatesAndCheckRoot(server_cert, cose_map); if (!cert_chain.has_value()) { std::move(result_callback).Run(scoped_refptr()); diff --git a/components/p3a/nitro_utils/cose.cc b/components/p3a/nitro_utils/cose.cc index f97498da148..edbb261cf38 100644 --- a/components/p3a/nitro_utils/cose.cc +++ b/components/p3a/nitro_utils/cose.cc @@ -5,6 +5,7 @@ #include "brave/components/p3a/nitro_utils/cose.h" +#include #include #include @@ -94,7 +95,7 @@ bool CoseSign1::DecodeFromBytes(const std::vector& data) { cbor::Reader::Config cbor_config; cbor_config.allow_and_canonicalize_out_of_order_keys = true; - absl::optional decoded_val = + std::optional decoded_val = cbor::Reader::Read(data, cbor_config); if (cbor_config.error_code_out != nullptr && *cbor_config.error_code_out != @@ -120,7 +121,7 @@ bool CoseSign1::DecodeFromBytes(const std::vector& data) { return false; } - absl::optional protected_decoded_val = + std::optional protected_decoded_val = cbor::Reader::Read(protected_encoded_.GetBytestring(), cbor_config); if (cbor_config.error_code_out != nullptr && *cbor_config.error_code_out != @@ -166,7 +167,7 @@ bool CoseSign1::DecodeFromBytes(const std::vector& data) { return false; } - absl::optional payload_dec_val = + std::optional payload_dec_val = cbor::Reader::Read(payload_encoded_.GetBytestring(), cbor_config); if (!payload_dec_val.has_value() || (cbor_config.error_code_out != nullptr && @@ -215,7 +216,7 @@ bool CoseSign1::Verify(const net::ParsedCertificateList& cert_chain) { sig_data_vec.push_back(payload_encoded_.Clone()); cbor::Value sig_data(sig_data_vec); - absl::optional> encoded_sig_data = + std::optional> encoded_sig_data = cbor::Writer::Write(sig_data); CHECK(encoded_sig_data.has_value()); diff --git a/components/p3a/p3a_config.cc b/components/p3a/p3a_config.cc index e485a84d4af..9b2af44017f 100644 --- a/components/p3a/p3a_config.cc +++ b/components/p3a/p3a_config.cc @@ -5,6 +5,7 @@ #include "brave/components/p3a/p3a_config.h" +#include #include #include "base/check.h" @@ -44,15 +45,15 @@ base::TimeDelta MaybeOverrideTimeDeltaFromCommandLine( return default_config_value; } -absl::optional MaybeSetUint8FromCommandLine(base::CommandLine* cmdline, - const char* switch_name) { +std::optional MaybeSetUint8FromCommandLine(base::CommandLine* cmdline, + const char* switch_name) { if (cmdline->HasSwitch(switch_name)) { unsigned value; if (base::StringToUint(cmdline->GetSwitchValueASCII(switch_name), &value)) { return value; } } - return absl::nullopt; + return std::nullopt; } std::string MaybeOverrideStringFromCommandLine( @@ -118,7 +119,7 @@ P3AConfig::P3AConfig() CheckURL(p2a_json_upload_url); CheckURL(GURL(star_randomness_host)); for (MetricLogType log_type : kAllMetricLogTypes) { - fake_star_epochs[log_type] = absl::nullopt; + fake_star_epochs[log_type] = std::nullopt; } } diff --git a/components/p3a/p3a_config.h b/components/p3a/p3a_config.h index abb07f6ae13..e41313a3c10 100644 --- a/components/p3a/p3a_config.h +++ b/components/p3a/p3a_config.h @@ -6,12 +6,12 @@ #ifndef BRAVE_COMPONENTS_P3A_P3A_CONFIG_H_ #define BRAVE_COMPONENTS_P3A_P3A_CONFIG_H_ +#include #include #include "base/containers/flat_map.h" #include "base/time/time.h" #include "brave/components/p3a/metric_log_type.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h" namespace p3a { @@ -24,7 +24,7 @@ struct P3AConfig { base::flat_map json_rotation_intervals; // Fake STAR epoch for testing purposes. - base::flat_map> fake_star_epochs; + base::flat_map> fake_star_epochs; // Endpoint for uploading P3A metrics in JSON format GURL p3a_json_upload_url; diff --git a/components/p3a/p3a_service.cc b/components/p3a/p3a_service.cc index 273bb1e81df..59d3e79fdb3 100644 --- a/components/p3a/p3a_service.cc +++ b/components/p3a/p3a_service.cc @@ -5,6 +5,7 @@ #include "brave/components/p3a/p3a_service.h" +#include #include #include #include @@ -202,12 +203,12 @@ void P3AService::OnMetricCycled(const std::string& histogram_name, metric_cycled_callbacks_.Notify(histogram_name, is_constellation); } -absl::optional P3AService::GetDynamicMetricLogType( +std::optional P3AService::GetDynamicMetricLogType( const std::string& histogram_name) const { auto log_type_it = dynamic_metric_log_types_.find(histogram_name); return log_type_it != dynamic_metric_log_types_.end() ? log_type_it->second - : absl::optional(); + : std::optional(); } void P3AService::LoadDynamicMetrics() { @@ -291,7 +292,7 @@ void P3AService::OnHistogramChangedOnUI(const char* histogram_name, void P3AService::HandleHistogramChange( std::string_view histogram_name, size_t bucket, - absl::optional only_update_for_constellation) { + std::optional only_update_for_constellation) { if (IsSuspendedMetric(histogram_name, bucket)) { message_manager_->RemoveMetricValue(std::string(histogram_name), only_update_for_constellation); diff --git a/components/p3a/p3a_service.h b/components/p3a/p3a_service.h index 622efd2ec40..2284aeea021 100644 --- a/components/p3a/p3a_service.h +++ b/components/p3a/p3a_service.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_P3A_P3A_SERVICE_H_ #include +#include #include #include #include @@ -20,7 +21,6 @@ #include "brave/components/p3a/message_manager.h" #include "brave/components/p3a/metric_log_type.h" #include "brave/components/p3a/p3a_config.h" -#include "third_party/abseil-cpp/absl/types/optional.h" class PrefRegistrySimple; class PrefService; @@ -99,7 +99,7 @@ class P3AService : public base::RefCountedThreadSafe, void OnRotation(MetricLogType log_type, bool is_constellation) override; void OnMetricCycled(const std::string& histogram_name, bool is_constellation) override; - absl::optional GetDynamicMetricLogType( + std::optional GetDynamicMetricLogType( const std::string& histogram_name) const override; void DisableStarAttestationForTesting(); @@ -120,7 +120,7 @@ class P3AService : public base::RefCountedThreadSafe, void HandleHistogramChange( std::string_view histogram_name, size_t bucket, - absl::optional only_update_for_constellation = absl::nullopt); + std::optional only_update_for_constellation = std::nullopt); // General prefs: bool initialized_ = false; diff --git a/components/p3a/star_randomness_meta.cc b/components/p3a/star_randomness_meta.cc index 1dd817358e6..e46a77964b5 100644 --- a/components/p3a/star_randomness_meta.cc +++ b/components/p3a/star_randomness_meta.cc @@ -5,6 +5,7 @@ #include "brave/components/p3a/star_randomness_meta.h" +#include #include #include @@ -56,7 +57,7 @@ const int kRndInfoRetryMaxBackoffMinutes = 60; "randomness"; return constellation::get_ppoprf_null_public_key(); } - absl::optional> dec_pk = base::Base64Decode(*pk_base64); + std::optional> dec_pk = base::Base64Decode(*pk_base64); if (!dec_pk.has_value()) { LOG(ERROR) << "StarRandomnessMeta: bad pk base64, will not validate " "randomness"; @@ -108,7 +109,7 @@ StarRandomnessMeta::StarRandomnessMeta( if (!approved_cert_fp_str.empty() && approved_cert_fp.FromString(approved_cert_fp_str)) { VLOG(2) << "StarRandomnessMeta: loaded cached approved cert"; - approved_cert_fp_ = absl::make_optional(approved_cert_fp); + approved_cert_fp_ = std::make_optional(approved_cert_fp); } } @@ -261,7 +262,7 @@ void StarRandomnessMeta::AttestServer(bool make_info_request_after) { return; } attestation_pending_ = true; - approved_cert_fp_ = absl::nullopt; + approved_cert_fp_ = std::nullopt; VLOG(2) << "StarRandomnessMeta: starting attestation"; GURL attestation_url = GURL( @@ -290,7 +291,7 @@ void StarRandomnessMeta::HandleAttestationResult( } return; } - approved_cert_fp_ = absl::make_optional( + approved_cert_fp_ = std::make_optional( net::HashValue(approved_cert->CalculateChainFingerprint256())); std::string approved_cert_fp_str = approved_cert_fp_->ToString(); local_state_->SetString(kApprovedCertFPPrefName, approved_cert_fp_str); @@ -353,7 +354,7 @@ void StarRandomnessMeta::HandleServerInfoResponse( return; } base::Value::Dict& root = parsed_value->GetDict(); - absl::optional epoch = root.FindInt("currentEpoch"); + std::optional epoch = root.FindInt("currentEpoch"); std::string* next_epoch_time_str = root.FindString("nextEpochTime"); if (!epoch || !next_epoch_time_str) { LOG(ERROR) << "StarRandomnessMeta: failed to parse server info json: " diff --git a/components/p3a/star_randomness_meta.h b/components/p3a/star_randomness_meta.h index c0c67855582..bfdadd70c66 100644 --- a/components/p3a/star_randomness_meta.h +++ b/components/p3a/star_randomness_meta.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_P3A_STAR_RANDOMNESS_META_H_ #include +#include #include #include "base/functional/callback.h" @@ -19,7 +20,6 @@ #include "brave/components/p3a/metric_log_type.h" #include "brave/components/p3a/p3a_config.h" #include "net/base/hash_value.h" -#include "third_party/abseil-cpp/absl/types/optional.h" class PrefService; class PrefRegistrySimple; @@ -54,7 +54,7 @@ struct RandomnessServerUpdateState { ~RandomnessServerUpdateState(); bool has_used_cached_info = false; - absl::optional last_cached_epoch = absl::nullopt; + std::optional last_cached_epoch = std::nullopt; base::OneShotTimer rnd_info_retry_timer; base::TimeDelta current_backoff_time; @@ -118,7 +118,7 @@ class StarRandomnessMeta { const raw_ptr config_; - absl::optional approved_cert_fp_; + std::optional approved_cert_fp_; bool attestation_pending_ = false; base::WeakPtrFactory weak_ptr_factory_{this}; diff --git a/components/p3a/star_randomness_points.cc b/components/p3a/star_randomness_points.cc index b6faec4f576..ec0082982e8 100644 --- a/components/p3a/star_randomness_points.cc +++ b/components/p3a/star_randomness_points.cc @@ -6,6 +6,7 @@ #include "brave/components/p3a/star_randomness_points.h" #include +#include #include #include @@ -40,7 +41,7 @@ std::unique_ptr> DecodeBase64List( return nullptr; } constellation::VecU8 entry_dec_vec; - absl::optional> entry_dec = + std::optional> entry_dec = base::Base64Decode(*entry_str); if (!entry_dec.has_value()) { LOG(ERROR) << "StarRandomnessPoints: failed to decode base64 value"; diff --git a/components/p3a/star_randomness_test_util.cc b/components/p3a/star_randomness_test_util.cc index c9e5a0098b9..062867eae9a 100644 --- a/components/p3a/star_randomness_test_util.cc +++ b/components/p3a/star_randomness_test_util.cc @@ -6,6 +6,7 @@ #include "brave/components/p3a/star_randomness_test_util.h" #include +#include #include #include #include @@ -34,7 +35,7 @@ MetricLogType ValidateURLAndGetMetricLogType(const GURL& url, url.path(), "/", base::KEEP_WHITESPACE, base::SPLIT_WANT_ALL); EXPECT_EQ(path_segments.size(), 4U); - absl::optional log_type = + std::optional log_type = StringToMetricLogType(path_segments[2]); EXPECT_TRUE(log_type.has_value()); diff --git a/components/permissions/contexts/brave_wallet_permission_context.cc b/components/permissions/contexts/brave_wallet_permission_context.cc index fb43866d513..c635926ce1a 100644 --- a/components/permissions/contexts/brave_wallet_permission_context.cc +++ b/components/permissions/contexts/brave_wallet_permission_context.cc @@ -5,6 +5,7 @@ #include "brave/components/permissions/contexts/brave_wallet_permission_context.h" +#include #include #include "brave/components/brave_wallet/browser/permission_utils.h" @@ -215,13 +216,13 @@ void BraveWalletPermissionContext::RequestPermissions( } // static -absl::optional> +std::optional> BraveWalletPermissionContext::GetAllowedAccounts( blink::PermissionType permission, content::RenderFrameHost* rfh, const std::vector& addresses) { if (!rfh) { - return absl::nullopt; + return std::nullopt; } // Fail if there is no last committed URL yet @@ -233,7 +234,7 @@ BraveWalletPermissionContext::GetAllowedAccounts( content::PermissionControllerDelegate* delegate = web_contents->GetBrowserContext()->GetPermissionControllerDelegate(); if (!delegate) { - return absl::nullopt; + return std::nullopt; } const ContentSettingsType content_settings_type = diff --git a/components/permissions/contexts/brave_wallet_permission_context.h b/components/permissions/contexts/brave_wallet_permission_context.h index ec3e19f48cd..2251288c67d 100644 --- a/components/permissions/contexts/brave_wallet_permission_context.h +++ b/components/permissions/contexts/brave_wallet_permission_context.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_PERMISSIONS_CONTEXTS_BRAVE_WALLET_PERMISSION_CONTEXT_H_ #include +#include #include #include #include @@ -61,7 +62,7 @@ class BraveWalletPermissionContext : public PermissionContextBase { content::WebContents* web_contents); static void Cancel(content::WebContents* web_contents); - static absl::optional> GetAllowedAccounts( + static std::optional> GetAllowedAccounts( blink::PermissionType permission, content::RenderFrameHost* rfh, const std::vector& addresses); diff --git a/components/permissions/permission_expirations.cc b/components/permissions/permission_expirations.cc index bae4e57e2f4..e1324e2a7a2 100644 --- a/components/permissions/permission_expirations.cc +++ b/components/permissions/permission_expirations.cc @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -303,7 +304,7 @@ PermissionExpirations::ParseExpiringPermissions( if (!requesting_origin) { continue; } - absl::optional content_setting = item->FindInt(kContentSettingKey); + std::optional content_setting = item->FindInt(kContentSettingKey); expiring_permissions.push_back(PermissionOrigins( requesting_origin, embedding_origin, content_setting.value_or(ContentSetting::CONTENT_SETTING_ALLOW))); diff --git a/components/permissions/permission_lifetime_options.cc b/components/permissions/permission_lifetime_options.cc index da17d56ed14..61af0366dac 100644 --- a/components/permissions/permission_lifetime_options.cc +++ b/components/permissions/permission_lifetime_options.cc @@ -5,13 +5,14 @@ #include "brave/components/permissions/permission_lifetime_options.h" +#include #include namespace permissions { PermissionLifetimeOption::PermissionLifetimeOption( std::u16string label, - absl::optional lifetime) + std::optional lifetime) : label(std::move(label)), lifetime(std::move(lifetime)) {} PermissionLifetimeOption::PermissionLifetimeOption( diff --git a/components/permissions/permission_lifetime_options.h b/components/permissions/permission_lifetime_options.h index 72b0ce767de..cf4b6a0d247 100644 --- a/components/permissions/permission_lifetime_options.h +++ b/components/permissions/permission_lifetime_options.h @@ -6,16 +6,16 @@ #ifndef BRAVE_COMPONENTS_PERMISSIONS_PERMISSION_LIFETIME_OPTIONS_H_ #define BRAVE_COMPONENTS_PERMISSIONS_PERMISSION_LIFETIME_OPTIONS_H_ +#include #include #include "base/time/time.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace permissions { struct PermissionLifetimeOption { PermissionLifetimeOption(std::u16string label, - absl::optional lifetime); + std::optional lifetime); PermissionLifetimeOption(const PermissionLifetimeOption&); PermissionLifetimeOption& operator=(const PermissionLifetimeOption&); PermissionLifetimeOption(PermissionLifetimeOption&&) noexcept; @@ -26,7 +26,7 @@ struct PermissionLifetimeOption { std::u16string label; // If not set, lifetime will not be controlled (i.e. permanent). If set to // base::TimeDelta(), permission should be alive until eTLD+1 is closed. - absl::optional lifetime; + std::optional lifetime; }; } // namespace permissions diff --git a/components/permissions/permission_lifetime_utils.cc b/components/permissions/permission_lifetime_utils.cc index 3703ee64718..c7c41898219 100644 --- a/components/permissions/permission_lifetime_utils.cc +++ b/components/permissions/permission_lifetime_utils.cc @@ -6,6 +6,7 @@ #include "brave/components/permissions/permission_lifetime_utils.h" #include +#include #include #include @@ -18,17 +19,16 @@ #include "components/permissions/features.h" #include "components/permissions/permission_request.h" #include "net/base/features.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace permissions { namespace { // Returns manually set option to ease manual testing. -absl::optional GetTestSecondsOption() { +std::optional GetTestSecondsOption() { const char kPermissionLifetimeTestSeconds[] = "permission-lifetime-test-seconds"; - static absl::optional test_seconds; + static std::optional test_seconds; if (!test_seconds.has_value()) { const std::string& test_seconds_str = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( @@ -37,7 +37,7 @@ absl::optional GetTestSecondsOption() { test_seconds = base::StringToInt(test_seconds_str, &val) ? val : 0; } if (!*test_seconds) { - return absl::nullopt; + return std::nullopt; } return PermissionLifetimeOption( base::UTF8ToUTF16(base::StringPrintf("%d seconds", *test_seconds)), @@ -65,7 +65,7 @@ std::vector CreatePermissionLifetimeOptions() { base::Days(7)); options.emplace_back(brave_l10n::GetLocalizedResourceUTF16String( IDS_PERMISSIONS_BUBBLE_FOREVER_LIFETIME_OPTION), - absl::nullopt); + std::nullopt); DCHECK_LE(options.size(), kOptionsCount); // This is strictly for manual testing. diff --git a/components/permissions/permission_lifetime_utils.h b/components/permissions/permission_lifetime_utils.h index 6d490fb1920..65ae6d0ffd3 100644 --- a/components/permissions/permission_lifetime_utils.h +++ b/components/permissions/permission_lifetime_utils.h @@ -11,7 +11,6 @@ #include "base/time/time.h" #include "brave/components/permissions/permission_lifetime_options.h" #include "components/permissions/permission_prompt.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace permissions { diff --git a/components/permissions/permission_origins.cc b/components/permissions/permission_origins.cc index 1c210f76d6b..5c73fe16e97 100644 --- a/components/permissions/permission_origins.cc +++ b/components/permissions/permission_origins.cc @@ -4,7 +4,8 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "brave/components/permissions/permission_origins.h" -#include "third_party/abseil-cpp/absl/types/optional.h" + +#include namespace permissions { @@ -20,8 +21,8 @@ PermissionOrigins::PermissionOrigins(const std::string* requesting_origin, int content_setting) : requesting_origin_(GURL(*requesting_origin)), embedding_origin_(embedding_origin - ? absl::make_optional(*embedding_origin) - : absl::nullopt), + ? std::make_optional(*embedding_origin) + : std::nullopt), content_setting_(static_cast(content_setting)) {} PermissionOrigins::PermissionOrigins(const PermissionOrigins&) = default; diff --git a/components/permissions/permission_origins.h b/components/permissions/permission_origins.h index 6c1e0999bc2..1b3988aa042 100644 --- a/components/permissions/permission_origins.h +++ b/components/permissions/permission_origins.h @@ -6,10 +6,10 @@ #ifndef BRAVE_COMPONENTS_PERMISSIONS_PERMISSION_ORIGINS_H_ #define BRAVE_COMPONENTS_PERMISSIONS_PERMISSION_ORIGINS_H_ +#include #include #include "components/content_settings/core/common/content_settings.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h" namespace permissions { @@ -40,7 +40,7 @@ class PermissionOrigins { private: GURL requesting_origin_; - absl::optional embedding_origin_; + std::optional embedding_origin_; ContentSetting content_setting_; }; diff --git a/components/psst/browser/core/psst_rule.cc b/components/psst/browser/core/psst_rule.cc index 867d65eef0b..d41dfae81ed 100644 --- a/components/psst/browser/core/psst_rule.cc +++ b/components/psst/browser/core/psst_rule.cc @@ -6,6 +6,7 @@ #include "brave/components/psst/browser/core/psst_rule.h" #include +#include #include #include @@ -14,7 +15,6 @@ #include "base/types/expected.h" #include "extensions/common/url_pattern.h" #include "net/base/url_util.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h" #include "url/origin.h" #include "url/url_constants.h" @@ -80,15 +80,15 @@ void PsstRule::RegisterJSONConverter( } // static -absl::optional> PsstRule::ParseRules( +std::optional> PsstRule::ParseRules( const std::string& contents) { if (contents.empty()) { - return absl::nullopt; + return std::nullopt; } - absl::optional root = base::JSONReader::Read(contents); + std::optional root = base::JSONReader::Read(contents); if (!root) { VLOG(1) << "PsstRule::ParseRules: invalid JSON"; - return absl::nullopt; + return std::nullopt; } std::vector rules; base::JSONValueConverter converter; diff --git a/components/psst/browser/core/psst_rule.h b/components/psst/browser/core/psst_rule.h index 6d482767c99..7f07a73c517 100644 --- a/components/psst/browser/core/psst_rule.h +++ b/components/psst/browser/core/psst_rule.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_PSST_BROWSER_CORE_PSST_RULE_H_ #include +#include #include #include #include @@ -16,7 +17,6 @@ #include "base/json/json_value_converter.h" #include "base/values.h" #include "extensions/common/url_pattern_set.h" -#include "third_party/abseil-cpp/absl/types/optional.h" class GURL; @@ -57,7 +57,7 @@ class PsstRule { base::JSONValueConverter* converter); // Parse the psst.json file contents into a vector of PsstRule. - static absl::optional> ParseRules( + static std::optional> ParseRules( const std::string& contents); // Check if this rule matches the given URL. bool ShouldInsertScript(const GURL& url) const; diff --git a/components/psst/browser/core/psst_rule_registry.cc b/components/psst/browser/core/psst_rule_registry.cc index 1b403c5e4c8..145552a81de 100644 --- a/components/psst/browser/core/psst_rule_registry.cc +++ b/components/psst/browser/core/psst_rule_registry.cc @@ -21,7 +21,6 @@ #include "brave/components/psst/browser/core/psst_rule.h" #include "brave/components/psst/common/features.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h" #include "url/origin.h" diff --git a/components/psst/browser/core/psst_rule_registry.h b/components/psst/browser/core/psst_rule_registry.h index 3a24f32587b..aa8c9c33fc4 100644 --- a/components/psst/browser/core/psst_rule_registry.h +++ b/components/psst/browser/core/psst_rule_registry.h @@ -16,7 +16,6 @@ #include "base/memory/singleton.h" #include "base/memory/weak_ptr.h" #include "brave/components/psst/browser/core/psst_rule.h" -#include "third_party/abseil-cpp/absl/types/optional.h" class GURL; diff --git a/components/query_filter/utils.cc b/components/query_filter/utils.cc index 1cb0a9a89f7..3ca91dd696d 100644 --- a/components/query_filter/utils.cc +++ b/components/query_filter/utils.cc @@ -5,6 +5,7 @@ #include "brave/components/query_filter/utils.h" +#include #include #include #include @@ -127,8 +128,8 @@ static constexpr auto kScopedQueryStringTrackers = // Remove tracking query parameters from a GURL, leaving all // other parts untouched. -absl::optional StripQueryParameter(const std::string_view query, - const std::string& spec) { +std::optional StripQueryParameter(const std::string_view query, + const std::string& spec) { // We are using custom query string parsing code here. See // https://github.com/brave/brave-core/pull/13726#discussion_r897712350 // for more information on why this approach was selected. @@ -159,15 +160,15 @@ absl::optional StripQueryParameter(const std::string_view query, if (disallowed_count > 0) { return base::JoinString(output_kv_strings, "&"); } - return absl::nullopt; + return std::nullopt; } -absl::optional ApplyQueryFilter(const GURL& original_url) { +std::optional ApplyQueryFilter(const GURL& original_url) { const auto& query = original_url.query_piece(); const std::string& spec = original_url.spec(); const auto clean_query_value = StripQueryParameter(query, spec); if (!clean_query_value.has_value()) { - return absl::nullopt; + return std::nullopt; } const auto& clean_query = clean_query_value.value(); if (clean_query.length() < query.length()) { @@ -179,10 +180,10 @@ absl::optional ApplyQueryFilter(const GURL& original_url) { } return original_url.ReplaceComponents(replacements); } - return absl::nullopt; + return std::nullopt; } -absl::optional MaybeApplyQueryStringFilter( +std::optional MaybeApplyQueryStringFilter( const GURL& initiator_url, const GURL& redirect_source_url, const GURL& request_url, @@ -191,23 +192,23 @@ absl::optional MaybeApplyQueryStringFilter( if (!request_url.has_query()) { // Optimization: // If there are no query params then we have nothing to strip. - return absl::nullopt; + return std::nullopt; } if (request_method != "GET") { - return absl::nullopt; + return std::nullopt; } if (redirect_source_url.is_valid()) { if (internal_redirect) { // Ignore internal redirects since we trigger them. - return absl::nullopt; + return std::nullopt; } if (net::registry_controlled_domains::SameDomainOrHost( redirect_source_url, request_url, net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES)) { // Same-site redirects are exempted. - return absl::nullopt; + return std::nullopt; } } else if (initiator_url.is_valid() && net::registry_controlled_domains::SameDomainOrHost( @@ -215,7 +216,7 @@ absl::optional MaybeApplyQueryStringFilter( net::registry_controlled_domains:: INCLUDE_PRIVATE_REGISTRIES)) { // Same-site requests are exempted. - return absl::nullopt; + return std::nullopt; } return ApplyQueryFilter(request_url); diff --git a/components/query_filter/utils.h b/components/query_filter/utils.h index 194009f189a..65b79738714 100644 --- a/components/query_filter/utils.h +++ b/components/query_filter/utils.h @@ -6,13 +6,13 @@ #ifndef BRAVE_COMPONENTS_QUERY_FILTER_UTILS_H_ #define BRAVE_COMPONENTS_QUERY_FILTER_UTILS_H_ +#include #include -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h" namespace query_filter { -absl::optional ApplyQueryFilter(const GURL& original_url); +std::optional ApplyQueryFilter(const GURL& original_url); // This function will return a new url stripping known tracking query params. // If nothing is to be stripped, a null value is returned. @@ -24,8 +24,8 @@ absl::optional ApplyQueryFilter(const GURL& original_url); // specifies where we are navigating to. `request_method` indicates the HTTP // method of the request. `internal_redirect` indicates wether or not this is an // internal redirect or not. This function returns the url we should redirect to -// or a `absl::nullopt` value if nothing is changed. -absl::optional MaybeApplyQueryStringFilter( +// or a `std::nullopt` value if nothing is changed. +std::optional MaybeApplyQueryStringFilter( const GURL& initiator_url, const GURL& redirect_source_url, const GURL& request_url, diff --git a/components/query_filter/utils_unittest.cc b/components/query_filter/utils_unittest.cc index f198dbcd658..3869c060528 100644 --- a/components/query_filter/utils_unittest.cc +++ b/components/query_filter/utils_unittest.cc @@ -6,7 +6,6 @@ #include "brave/components/query_filter/utils.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h" TEST(BraveQueryFilter, FilterQueryTrackers) { diff --git a/components/request_otr/browser/request_otr_rule.cc b/components/request_otr/browser/request_otr_rule.cc index 4723f2b8856..1dbe68cfc69 100644 --- a/components/request_otr/browser/request_otr_rule.cc +++ b/components/request_otr/browser/request_otr_rule.cc @@ -6,6 +6,7 @@ #include "brave/components/request_otr/browser/request_otr_rule.h" #include +#include #include #include #include @@ -89,7 +90,7 @@ RequestOTRRule::ParseRules(const std::string& contents) { if (contents.empty()) { return base::unexpected("Could not obtain request_otr configuration"); } - absl::optional root = base::JSONReader::Read(contents); + std::optional root = base::JSONReader::Read(contents); if (!root) { return base::unexpected("Failed to parse request_otr configuration"); } diff --git a/components/safe_builtins/renderer/safe_builtins_helpers.h b/components/safe_builtins/renderer/safe_builtins_helpers.h index 24eed48fba2..84eaf18b592 100644 --- a/components/safe_builtins/renderer/safe_builtins_helpers.h +++ b/components/safe_builtins/renderer/safe_builtins_helpers.h @@ -8,7 +8,6 @@ #include -#include "third_party/abseil-cpp/absl/types/optional.h" #include "v8/include/v8-local-handle.h" #include "v8/include/v8-value.h" diff --git a/components/script_injector/renderer/script_injector_render_frame_observer.cc b/components/script_injector/renderer/script_injector_render_frame_observer.cc index 2f395d6b887..4b72aabc775 100644 --- a/components/script_injector/renderer/script_injector_render_frame_observer.cc +++ b/components/script_injector/renderer/script_injector_render_frame_observer.cc @@ -5,6 +5,7 @@ #include "brave/components/script_injector/renderer/script_injector_render_frame_observer.h" +#include #include #include @@ -64,7 +65,7 @@ void ScriptInjectorRenderFrameObserver::RequestAsyncExecuteScript( base::BindOnce( [](RequestAsyncExecuteScriptCallback callback, blink::mojom::WantResultOption want_result, - absl::optional value, base::TimeTicks start_time) { + std::optional value, base::TimeTicks start_time) { if (want_result == blink::mojom::WantResultOption::kWantResult) { std::move(callback).Run(value ? std::move(*value) : base::Value()); diff --git a/components/services/bat_ads/bat_ads_client_mojo_bridge.cc b/components/services/bat_ads/bat_ads_client_mojo_bridge.cc index d21fb98ae81..933ffadc525 100644 --- a/components/services/bat_ads/bat_ads_client_mojo_bridge.cc +++ b/components/services/bat_ads/bat_ads_client_mojo_bridge.cc @@ -5,6 +5,7 @@ #include "brave/components/services/bat_ads/bat_ads_client_mojo_bridge.h" +#include #include #include "base/time/time.h" @@ -13,7 +14,6 @@ #include "brave/components/brave_ads/core/public/units/notification_ad/notification_ad_info.h" #include "brave/components/brave_ads/core/public/units/notification_ad/notification_ad_value_util.h" #include "brave/components/brave_federated/public/interfaces/brave_federated.mojom.h" // IWYU pragma: keep -#include "third_party/abseil-cpp/absl/types/optional.h" namespace bat_ads { @@ -230,7 +230,7 @@ void BatAdsClientMojoBridge::AddFederatedLearningPredictorTrainingSample( void BatAdsClientMojoBridge::Load(const std::string& name, brave_ads::LoadCallback callback) { if (!bat_ads_client_associated_receiver_.is_bound()) { - std::move(callback).Run(/*value*/ absl::nullopt); + std::move(callback).Run(/*value*/ std::nullopt); return; } @@ -289,13 +289,13 @@ void BatAdsClientMojoBridge::Log(const char* file, } } -absl::optional BatAdsClientMojoBridge::GetProfilePref( +std::optional BatAdsClientMojoBridge::GetProfilePref( const std::string& path) { if (!bat_ads_client_associated_receiver_.is_bound()) { return CachedProfilePrefValue(path); } - absl::optional value; + std::optional value; if (!bat_ads_client_associated_receiver_->GetProfilePref(path, &value)) { return CachedProfilePrefValue(path); } @@ -337,13 +337,13 @@ bool BatAdsClientMojoBridge::HasProfilePrefPath(const std::string& path) const { return value; } -absl::optional BatAdsClientMojoBridge::GetLocalStatePref( +std::optional BatAdsClientMojoBridge::GetLocalStatePref( const std::string& path) { if (!bat_ads_client_associated_receiver_.is_bound()) { return CachedLocalStatePrefValue(path); } - absl::optional value; + std::optional value; if (!bat_ads_client_associated_receiver_->GetLocalStatePref(path, &value)) { return CachedLocalStatePrefValue(path); } @@ -388,19 +388,19 @@ bool BatAdsClientMojoBridge::HasLocalStatePrefPath( return value; } -absl::optional BatAdsClientMojoBridge::CachedProfilePrefValue( +std::optional BatAdsClientMojoBridge::CachedProfilePrefValue( const std::string& path) const { if (!cached_profile_prefs_.contains(path)) { - return absl::nullopt; + return std::nullopt; } return cached_profile_prefs_.at(path).Clone(); } -absl::optional BatAdsClientMojoBridge::CachedLocalStatePrefValue( +std::optional BatAdsClientMojoBridge::CachedLocalStatePrefValue( const std::string& path) const { if (!cached_local_state_prefs_.contains(path)) { - return absl::nullopt; + return std::nullopt; } return cached_local_state_prefs_.at(path).Clone(); diff --git a/components/services/bat_ads/bat_ads_client_mojo_bridge.h b/components/services/bat_ads/bat_ads_client_mojo_bridge.h index 106df4d583f..654fce04bf9 100644 --- a/components/services/bat_ads/bat_ads_client_mojo_bridge.h +++ b/components/services/bat_ads/bat_ads_client_mojo_bridge.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_SERVICES_BAT_ADS_BAT_ADS_CLIENT_MOJO_BRIDGE_H_ #include +#include #include #include @@ -104,12 +105,12 @@ class BatAdsClientMojoBridge : public brave_ads::AdsClient { std::vector training_sample) override; - absl::optional GetProfilePref(const std::string& path) override; + std::optional GetProfilePref(const std::string& path) override; void SetProfilePref(const std::string& path, base::Value value) override; void ClearProfilePref(const std::string& path) override; bool HasProfilePrefPath(const std::string& path) const override; - absl::optional GetLocalStatePref( + std::optional GetLocalStatePref( const std::string& path) override; void SetLocalStatePref(const std::string& path, base::Value value) override; void ClearLocalStatePref(const std::string& path) override; @@ -121,9 +122,9 @@ class BatAdsClientMojoBridge : public brave_ads::AdsClient { const std::string& message) override; private: - absl::optional CachedProfilePrefValue( + std::optional CachedProfilePrefValue( const std::string& path) const; - absl::optional CachedLocalStatePrefValue( + std::optional CachedLocalStatePrefValue( const std::string& path) const; base::flat_map diff --git a/components/services/bat_ads/bat_ads_impl.cc b/components/services/bat_ads/bat_ads_impl.cc index 4cb8b66ce2b..c988c9a140f 100644 --- a/components/services/bat_ads/bat_ads_impl.cc +++ b/components/services/bat_ads/bat_ads_impl.cc @@ -5,6 +5,7 @@ #include "brave/components/services/bat_ads/bat_ads_impl.h" +#include #include #include "base/check.h" @@ -27,7 +28,6 @@ #include "brave/components/brave_ads/core/public/units/notification_ad/notification_ad_value_util.h" #include "brave/components/services/bat_ads/bat_ads_client_mojo_bridge.h" #include "brave/components/services/bat_ads/bat_ads_observer.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace bat_ads { @@ -99,15 +99,14 @@ void BatAdsImpl::Shutdown(ShutdownCallback callback) { void BatAdsImpl::MaybeGetNotificationAd( const std::string& placement_id, MaybeGetNotificationAdCallback callback) { - const absl::optional ad = + const std::optional ad = GetAds()->MaybeGetNotificationAd(placement_id); if (!ad) { - std::move(callback).Run(/*ad*/ absl::nullopt); + std::move(callback).Run(/*ad*/ std::nullopt); return; } - absl::optional dict = - brave_ads::NotificationAdToValue(*ad); + std::optional dict = brave_ads::NotificationAdToValue(*ad); std::move(callback).Run(std::move(dict)); } @@ -125,13 +124,13 @@ void BatAdsImpl::MaybeServeNewTabPageAd( MaybeServeNewTabPageAdCallback callback) { GetAds()->MaybeServeNewTabPageAd(base::BindOnce( [](MaybeServeNewTabPageAdCallback callback, - const absl::optional& ad) { + const std::optional& ad) { if (!ad) { - std::move(callback).Run(/*ad*/ absl::nullopt); + std::move(callback).Run(/*ad*/ std::nullopt); return; } - absl::optional dict = + std::optional dict = brave_ads::NewTabPageAdToValue(*ad); std::move(callback).Run(std::move(dict)); }, @@ -168,14 +167,14 @@ void BatAdsImpl::MaybeServeInlineContentAd( base::BindOnce( [](MaybeServeInlineContentAdCallback callback, const std::string& dimensions, - const absl::optional& ad) { + const std::optional& ad) { if (!ad) { std::move(callback).Run(dimensions, - /*ads*/ absl::nullopt); + /*ads*/ std::nullopt); return; } - absl::optional dict = + std::optional dict = brave_ads::InlineContentAdToValue(*ad); std::move(callback).Run(dimensions, std::move(dict)); }, diff --git a/components/services/ipfs/ipfs_service_utils.cc b/components/services/ipfs/ipfs_service_utils.cc index 9f3483d285d..37e3062efa9 100644 --- a/components/services/ipfs/ipfs_service_utils.cc +++ b/components/services/ipfs/ipfs_service_utils.cc @@ -6,6 +6,7 @@ #include "brave/components/services/ipfs/ipfs_service_utils.h" #include +#include #include #include #include @@ -15,7 +16,6 @@ #include "base/strings/strcat.h" #include "base/strings/string_util.h" #include "brave/components/services/ipfs/public/mojom/ipfs_service.mojom.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/re2/src/re2/re2.h" namespace { @@ -32,7 +32,7 @@ namespace ipfs { bool UpdateConfigJSON(const std::string& source, const ipfs::mojom::IpfsConfig* config, std::string* result) { - absl::optional records_v = base::JSONReader::Read( + std::optional records_v = base::JSONReader::Read( source, base::JSON_PARSE_CHROMIUM_EXTENSIONS | base::JSONParserOptions::JSON_PARSE_RFC); if (!records_v) { diff --git a/components/services/ipfs/ipfs_service_utils_unittest.cc b/components/services/ipfs/ipfs_service_utils_unittest.cc index 65ab0e186d9..d60f13e5c51 100644 --- a/components/services/ipfs/ipfs_service_utils_unittest.cc +++ b/components/services/ipfs/ipfs_service_utils_unittest.cc @@ -3,13 +3,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include "brave/components/services/ipfs/ipfs_service_utils.h" + #include +#include #include "base/json/json_reader.h" #include "base/json/json_writer.h" - -#include "brave/components/services/ipfs/ipfs_service_utils.h" - #include "brave/components/services/ipfs/public/mojom/ipfs_service.mojom.h" #include "testing/gtest/include/gtest/gtest.h" @@ -22,7 +22,7 @@ TEST_F(IPFSServiceUtils, UpdateConfigJSONTest) { std::string updated; auto config = ipfs::mojom::IpfsConfig::New( base::FilePath(), base::FilePath(), base::FilePath(), "GatewayPort", - "APIPort", "SwarmPort", "StorageSize", absl::nullopt); + "APIPort", "SwarmPort", "StorageSize", std::nullopt); std::string expect = "{\"Addresses\":{\"API\":\"/ip4/127.0.0.1/tcp/APIPort\"," @@ -104,7 +104,7 @@ TEST_F(IPFSServiceUtils, DNSResolversRemove) { auto config = ipfs::mojom::IpfsConfig::New( base::FilePath(), base::FilePath(), base::FilePath(), "GatewayPort", - "APIPort", "SwarmPort", "StorageSize", absl::nullopt); + "APIPort", "SwarmPort", "StorageSize", std::nullopt); std::string expect = "{\"Addresses\":{\"API\":\"/ip4/127.0.0.1/tcp/APIPort\"," diff --git a/components/sidebar/sidebar_service.cc b/components/sidebar/sidebar_service.cc index 2cb5b35f235..84e1ad48b5d 100644 --- a/components/sidebar/sidebar_service.cc +++ b/components/sidebar/sidebar_service.cc @@ -8,6 +8,7 @@ #include #include #include +#include #include #include @@ -32,7 +33,6 @@ #include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_service.h" #include "components/prefs/scoped_user_pref_update.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" @@ -431,7 +431,7 @@ SidebarService::ShowSidebarOption SidebarService::GetSidebarShowOption() const { return static_cast(prefs_->GetInteger(kSidebarShowOption)); } -absl::optional SidebarService::GetDefaultPanelItem() const { +std::optional SidebarService::GetDefaultPanelItem() const { // A list of preferred item types // Use this order for picking active panel when panel is opened as // we don't cache previous active panel. @@ -441,7 +441,7 @@ absl::optional SidebarService::GetDefaultPanelItem() const { SidebarItem::BuiltInItemType::kPlaylist, SidebarItem::BuiltInItemType::kChatUI}; - absl::optional default_item; + std::optional default_item; for (const auto& type : kPreferredPanelOrder) { auto found_item_iter = base::ranges::find(items_, type, &SidebarItem::built_in_item_type); diff --git a/components/sidebar/sidebar_service.h b/components/sidebar/sidebar_service.h index aa182b1f135..ddebc6a3d21 100644 --- a/components/sidebar/sidebar_service.h +++ b/components/sidebar/sidebar_service.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_SIDEBAR_SIDEBAR_SERVICE_H_ #define BRAVE_COMPONENTS_SIDEBAR_SIDEBAR_SERVICE_H_ +#include #include #include @@ -18,7 +19,6 @@ #include "components/keyed_service/core/keyed_service.h" #include "components/prefs/pref_change_registrar.h" #include "components/version_info/channel.h" -#include "third_party/abseil-cpp/absl/types/optional.h" class PrefRegistrySimple; class PrefService; @@ -85,7 +85,7 @@ class SidebarService : public KeyedService { ShowSidebarOption GetSidebarShowOption() const; void SetSidebarShowOption(ShowSidebarOption show_options); - absl::optional GetDefaultPanelItem() const; + std::optional GetDefaultPanelItem() const; bool IsEditableItemAt(size_t index) const; SidebarService(const SidebarService&) = delete; diff --git a/components/sidebar/sidebar_service_unittest.cc b/components/sidebar/sidebar_service_unittest.cc index 713bf743580..df64ea31795 100644 --- a/components/sidebar/sidebar_service_unittest.cc +++ b/components/sidebar/sidebar_service_unittest.cc @@ -3,7 +3,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include "brave/components/sidebar/sidebar_service.h" + #include +#include #include #include @@ -18,7 +21,6 @@ #include "brave/components/sidebar/pref_names.h" #include "brave/components/sidebar/sidebar_item.h" #include "brave/components/sidebar/sidebar_p3a.h" -#include "brave/components/sidebar/sidebar_service.h" #include "components/prefs/testing_pref_service.h" #include "components/sync_preferences/pref_service_mock_factory.h" #include "components/sync_preferences/testing_pref_service_syncable.h" @@ -171,7 +173,7 @@ constexpr char sidebar_builtin_ai_chat_not_listed_json[] = R"({ })"; base::Value::Dict ParseTestJson(const std::string_view json) { - absl::optional potential_response_dict_val = + std::optional potential_response_dict_val = base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS | base::JSONParserOptions::JSON_PARSE_RFC); return std::move(potential_response_dict_val.value().GetDict()); diff --git a/components/skus/renderer/skus_js_handler.cc b/components/skus/renderer/skus_js_handler.cc index 202f2f8c7a9..4070e0658ab 100644 --- a/components/skus/renderer/skus_js_handler.cc +++ b/components/skus/renderer/skus_js_handler.cc @@ -5,6 +5,7 @@ #include "brave/components/skus/renderer/skus_js_handler.h" +#include #include #include @@ -129,7 +130,7 @@ void SkusJSHandler::OnRefreshOrder( v8::Local resolver = promise_resolver.Get(isolate); - absl::optional records_v = base::JSONReader::Read( + std::optional records_v = base::JSONReader::Read( response, base::JSON_PARSE_CHROMIUM_EXTENSIONS | base::JSONParserOptions::JSON_PARSE_RFC); if (!records_v) { @@ -286,7 +287,7 @@ void SkusJSHandler::OnCredentialSummary( v8::Local resolver = promise_resolver.Get(isolate); - absl::optional records_v = base::JSONReader::Read( + std::optional records_v = base::JSONReader::Read( response, base::JSON_PARSE_CHROMIUM_EXTENSIONS | base::JSONParserOptions::JSON_PARSE_RFC); if (!records_v) { diff --git a/components/speedreader/speedreader_local_url_loader.cc b/components/speedreader/speedreader_local_url_loader.cc index 425eca06231..4ccb32524ef 100644 --- a/components/speedreader/speedreader_local_url_loader.cc +++ b/components/speedreader/speedreader_local_url_loader.cc @@ -6,6 +6,7 @@ #include "brave/components/speedreader/speedreader_local_url_loader.h" #include +#include #include #include #include @@ -99,7 +100,7 @@ void SpeedReaderLocalURLLoader::OnReceiveEarlyHints( void SpeedReaderLocalURLLoader::OnReceiveResponse( network::mojom::URLResponseHeadPtr response_head, mojo::ScopedDataPipeConsumerHandle body, - absl::optional cached_metadata) {} + std::optional cached_metadata) {} void SpeedReaderLocalURLLoader::OnReceiveRedirect( const net::RedirectInfo& redirect_info, @@ -125,7 +126,7 @@ void SpeedReaderLocalURLLoader::FollowRedirect( const std::vector& removed_headers, const net::HttpRequestHeaders& modified_headers, const net::HttpRequestHeaders& modified_cors_exempt_headers, - const absl::optional& new_url) {} + const std::optional& new_url) {} void SpeedReaderLocalURLLoader::SetPriority(net::RequestPriority priority, int32_t intra_priority_value) {} diff --git a/components/speedreader/speedreader_local_url_loader.h b/components/speedreader/speedreader_local_url_loader.h index a1a248fe1a9..1c73997a3f1 100644 --- a/components/speedreader/speedreader_local_url_loader.h +++ b/components/speedreader/speedreader_local_url_loader.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_SPEEDREADER_SPEEDREADER_LOCAL_URL_LOADER_H_ #define BRAVE_COMPONENTS_SPEEDREADER_SPEEDREADER_LOCAL_URL_LOADER_H_ +#include #include #include #include @@ -57,7 +58,7 @@ class SpeedReaderLocalURLLoader : public network::mojom::URLLoaderClient, void OnReceiveResponse( network::mojom::URLResponseHeadPtr response_head, mojo::ScopedDataPipeConsumerHandle body, - absl::optional cached_metadata) override; + std::optional cached_metadata) override; void OnReceiveRedirect( const net::RedirectInfo& redirect_info, network::mojom::URLResponseHeadPtr response_head) override; @@ -73,7 +74,7 @@ class SpeedReaderLocalURLLoader : public network::mojom::URLLoaderClient, const std::vector& removed_headers, const net::HttpRequestHeaders& modified_headers, const net::HttpRequestHeaders& modified_cors_exempt_headers, - const absl::optional& new_url) override; + const std::optional& new_url) override; void SetPriority(net::RequestPriority priority, int32_t intra_priority_value) override; void PauseReadingBodyFromNet() override; diff --git a/components/speedreader/tts_player.cc b/components/speedreader/tts_player.cc index 9c72bfe3b33..dbd3083034c 100644 --- a/components/speedreader/tts_player.cc +++ b/components/speedreader/tts_player.cc @@ -6,6 +6,7 @@ #include "brave/components/speedreader/tts_player.h" #include +#include #include #include "base/strings/utf_string_conversions.h" @@ -83,14 +84,14 @@ bool TtsPlayer::Controller::IsPlaying() const { } bool TtsPlayer::Controller::IsPlayingRequestedWebContents( - absl::optional paragraph_index) const { + std::optional paragraph_index) const { if (paragraph_index.has_value() && paragraph_index != paragraph_index_) { return false; } return playing_web_contents_ == request_web_contents_; } -void TtsPlayer::Controller::Play(absl::optional paragraph_index) { +void TtsPlayer::Controller::Play(std::optional paragraph_index) { DCHECK(request_web_contents_); if (IsPlayingRequestedWebContents()) { Observe(playing_web_contents_); @@ -290,7 +291,7 @@ void TtsPlayer::Controller::OnTtsEvent(content::TtsUtterance* utterance, } void TtsPlayer::Controller::OnContentReady(content::WebContents* web_contents, - absl::optional paragraph_index, + std::optional paragraph_index, base::Value content) { if (!content.is_dict() || web_contents != request_web_contents_) { return; diff --git a/components/speedreader/tts_player.h b/components/speedreader/tts_player.h index 49b12934155..ade834c8053 100644 --- a/components/speedreader/tts_player.h +++ b/components/speedreader/tts_player.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_SPEEDREADER_TTS_PLAYER_H_ #include +#include #include #include @@ -17,7 +18,6 @@ #include "base/values.h" #include "content/public/browser/tts_utterance.h" #include "content/public/browser/web_contents_observer.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace content { class WebContents; @@ -60,9 +60,9 @@ class TtsPlayer { public: bool IsPlaying() const; bool IsPlayingRequestedWebContents( - absl::optional paragraph_index = absl::nullopt) const; + std::optional paragraph_index = std::nullopt) const; - void Play(absl::optional paragraph_index = absl::nullopt); + void Play(std::optional paragraph_index = std::nullopt); void Pause(); void Resume(); void Stop(); @@ -94,7 +94,7 @@ class TtsPlayer { const std::string& error_message) override; void OnContentReady(content::WebContents* web_contents, - absl::optional paragraph_index, + std::optional paragraph_index, base::Value content); raw_ptr owner_ = nullptr; diff --git a/components/sync_device_info/brave_device_info.cc b/components/sync_device_info/brave_device_info.cc index d023ca15827..b18888cc634 100644 --- a/components/sync_device_info/brave_device_info.cc +++ b/components/sync_device_info/brave_device_info.cc @@ -5,6 +5,8 @@ #include "brave/components/sync_device_info/brave_device_info.h" +#include + #include "base/values.h" namespace syncer { @@ -23,8 +25,8 @@ BraveDeviceInfo::BraveDeviceInfo( base::Time last_updated_timestamp, base::TimeDelta pulse_interval, bool send_tab_to_self_receiving_enabled, - const absl::optional& sharing_info, - const absl::optional& paask_info, + const std::optional& sharing_info, + const std::optional& paask_info, const std::string& fcm_registration_token, const ModelTypeSet& interested_data_types, bool is_self_delete_supported) diff --git a/components/sync_device_info/brave_device_info.h b/components/sync_device_info/brave_device_info.h index b507a3bf725..a10e17d85cb 100644 --- a/components/sync_device_info/brave_device_info.h +++ b/components/sync_device_info/brave_device_info.h @@ -6,12 +6,12 @@ #ifndef BRAVE_COMPONENTS_SYNC_DEVICE_INFO_BRAVE_DEVICE_INFO_H_ #define BRAVE_COMPONENTS_SYNC_DEVICE_INFO_BRAVE_DEVICE_INFO_H_ +#include #include #include "base/time/time.h" #include "components/sync/protocol/sync.pb.h" #include "components/sync_device_info/device_info.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace base { class DictionaryValue; @@ -34,8 +34,8 @@ class BraveDeviceInfo : public DeviceInfo { base::Time last_updated_timestamp, base::TimeDelta pulse_interval, bool send_tab_to_self_receiving_enabled, - const absl::optional& sharing_info, - const absl::optional& paask_info, + const std::optional& sharing_info, + const std::optional& paask_info, const std::string& fcm_registration_token, const ModelTypeSet& interested_data_types, bool is_self_delete_supported); diff --git a/components/time_period_storage/weekly_event_storage.cc b/components/time_period_storage/weekly_event_storage.cc index 40d53a82767..7a99cae1a81 100644 --- a/components/time_period_storage/weekly_event_storage.cc +++ b/components/time_period_storage/weekly_event_storage.cc @@ -7,6 +7,7 @@ #include #include +#include #include #include "base/json/values_util.h" @@ -16,7 +17,6 @@ #include "base/values.h" #include "components/prefs/pref_service.h" #include "components/prefs/scoped_user_pref_update.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace { static constexpr size_t kDaysInWeek = 7; @@ -48,8 +48,8 @@ void WeeklyEventStorage::Add(int value) { Save(); } -absl::optional WeeklyEventStorage::GetLatest() { - auto result = absl::optional(); +std::optional WeeklyEventStorage::GetLatest() { + auto result = std::optional(); if (HasEvent()) { // Assume the front is the most recent event. result = events_.front().value; diff --git a/components/time_period_storage/weekly_event_storage.h b/components/time_period_storage/weekly_event_storage.h index 03ba7ed70e2..9764dfd47b9 100644 --- a/components/time_period_storage/weekly_event_storage.h +++ b/components/time_period_storage/weekly_event_storage.h @@ -8,13 +8,13 @@ #include #include +#include #include "base/memory/raw_ref.h" #include "base/time/clock.h" #include "base/time/time.h" #include "components/prefs/pref_service.h" #include "components/prefs/scoped_user_pref_update.h" -#include "third_party/abseil-cpp/absl/types/optional.h" // WeeklyStorage variant holding a list of events over the past week. // @@ -43,7 +43,7 @@ class WeeklyEventStorage { // Add a new event code. void Add(int value); // Return the most recent event, if any. - absl::optional GetLatest(); + std::optional GetLatest(); // Check if any events are in the record. bool HasEvent(); diff --git a/components/time_period_storage/weekly_event_storage_unittest.cc b/components/time_period_storage/weekly_event_storage_unittest.cc index f18c0c9e86c..0a5c1d7c5da 100644 --- a/components/time_period_storage/weekly_event_storage_unittest.cc +++ b/components/time_period_storage/weekly_event_storage_unittest.cc @@ -6,6 +6,7 @@ #include "brave/components/time_period_storage/weekly_event_storage.h" #include +#include #include #include "base/memory/raw_ptr.h" @@ -49,23 +50,22 @@ class WeeklyEventStorageTest : public ::testing::Test { TEST_F(WeeklyEventStorageTest, StartsEmpty) { EXPECT_FALSE(state_->HasEvent()); - EXPECT_EQ(state_->GetLatest(), absl::nullopt); + EXPECT_EQ(state_->GetLatest(), std::nullopt); } TEST_F(WeeklyEventStorageTest, AddEvents) { state_->Add(TestValues::kNull); EXPECT_TRUE(state_->HasEvent()); - EXPECT_EQ(state_->GetLatest(), absl::optional(TestValues::kNull)); + EXPECT_EQ(state_->GetLatest(), std::optional(TestValues::kNull)); state_->Add(TestValues::kBrave); - EXPECT_EQ(state_->GetLatest(), - absl::optional(TestValues::kBrave)); + EXPECT_EQ(state_->GetLatest(), std::optional(TestValues::kBrave)); } TEST_F(WeeklyEventStorageTest, ForgetsOldEvents) { // Add an initial event. state_->Add(TestValues::kFoo); - EXPECT_EQ(state_->GetLatest(), absl::optional(TestValues::kFoo)); + EXPECT_EQ(state_->GetLatest(), std::optional(TestValues::kFoo)); // Jump to the next week. clock_->Advance(base::Days(8)); @@ -75,7 +75,7 @@ TEST_F(WeeklyEventStorageTest, ForgetsOldEvents) { // Newer events should still accumulate. state_->Add(TestValues::kNull); state_->Add(TestValues::kBar); - EXPECT_EQ(state_->GetLatest(), absl::optional(TestValues::kBar)); + EXPECT_EQ(state_->GetLatest(), std::optional(TestValues::kBar)); } TEST_F(WeeklyEventStorageTest, IntermittentUsage) { @@ -84,16 +84,16 @@ TEST_F(WeeklyEventStorageTest, IntermittentUsage) { clock_->Advance(base::Days(day % 3)); state_->Add(value); } - EXPECT_EQ(state_->GetLatest(), absl::optional(value)); + EXPECT_EQ(state_->GetLatest(), std::optional(value)); } TEST_F(WeeklyEventStorageTest, InfrequentUsage) { state_->Add(TestValues::kFoo); clock_->Advance(base::Days(6)); state_->Add(TestValues::kBar); - EXPECT_EQ(state_->GetLatest(), absl::optional(TestValues::kBar)); + EXPECT_EQ(state_->GetLatest(), std::optional(TestValues::kBar)); clock_->Advance(base::Days(10)); - EXPECT_EQ(state_->GetLatest(), absl::nullopt); + EXPECT_EQ(state_->GetLatest(), std::nullopt); } // Verify serialization order across reloads, since GetLatest @@ -106,13 +106,11 @@ TEST_F(WeeklyEventStorageTest, SerializationOrder) { state_->Add(TestValues::kFoo); state_->Add(TestValues::kBrave); clock_->Advance(base::Days(1)); - EXPECT_EQ(state_->GetLatest(), - absl::optional(TestValues::kBrave)); + EXPECT_EQ(state_->GetLatest(), std::optional(TestValues::kBrave)); // Create a new WeeklyEventStorage object. CreateWeeklyEventStorage(); // Most recently added event should still be the latest. - EXPECT_EQ(state_->GetLatest(), - absl::optional(TestValues::kBrave)); + EXPECT_EQ(state_->GetLatest(), std::optional(TestValues::kBrave)); } diff --git a/components/tor/tor_profile_service_impl.cc b/components/tor/tor_profile_service_impl.cc index b51dcb05e89..b8a4f2be013 100644 --- a/components/tor/tor_profile_service_impl.cc +++ b/components/tor/tor_profile_service_impl.cc @@ -6,6 +6,7 @@ #include "brave/components/tor/tor_profile_service_impl.h" #include +#include #include #include @@ -89,16 +90,16 @@ class TorProxyLookupClient : public network::mojom::ProxyLookupClient { GetProxyLookupClient() { mojo::PendingRemote pending_remote = receiver_.BindNewPipeAndPassRemote(); - receiver_.set_disconnect_handler(base::BindOnce( - &TorProxyLookupClient::OnProxyLookupComplete, base::Unretained(this), - net::ERR_ABORTED, absl::nullopt)); + receiver_.set_disconnect_handler( + base::BindOnce(&TorProxyLookupClient::OnProxyLookupComplete, + base::Unretained(this), net::ERR_ABORTED, std::nullopt)); return pending_remote; } // network::mojom::ProxyLookupClient: void OnProxyLookupComplete( int32_t net_error, - const absl::optional& proxy_info) override { + const std::optional& proxy_info) override { std::move(callback_).Run(proxy_info); delete this; } @@ -108,7 +109,7 @@ class TorProxyLookupClient : public network::mojom::ProxyLookupClient { }; void OnNewTorCircuit(std::unique_ptr tracker, - const absl::optional& proxy_info) { + const std::optional& proxy_info) { tracker->NewIdentityLoaded(proxy_info.has_value() && !proxy_info->is_direct()); } diff --git a/components/tor/tor_profile_service_impl.h b/components/tor/tor_profile_service_impl.h index 91f8ce9ddc7..ff3b754c752 100644 --- a/components/tor/tor_profile_service_impl.h +++ b/components/tor/tor_profile_service_impl.h @@ -7,6 +7,7 @@ #define BRAVE_COMPONENTS_TOR_TOR_PROFILE_SERVICE_IMPL_H_ #include +#include #include #include "base/memory/raw_ptr.h" @@ -18,7 +19,6 @@ #include "brave/components/tor/tor_profile_service.h" #include "components/prefs/pref_change_registrar.h" #include "net/proxy_resolution/proxy_info.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace content { class BrowserContext; @@ -32,7 +32,7 @@ class ProxyConfigServiceTor; namespace tor { using NewTorCircuitCallback = - base::OnceCallback& proxy_info)>; + base::OnceCallback& proxy_info)>; class TorProfileServiceImpl : public TorProfileService, diff --git a/components/tor/tor_utils.cc b/components/tor/tor_utils.cc index d344cfced7e..30485904321 100644 --- a/components/tor/tor_utils.cc +++ b/components/tor/tor_utils.cc @@ -5,6 +5,7 @@ #include "brave/components/tor/tor_utils.h" +#include #include #include #include @@ -16,7 +17,6 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/pref_names.h" #include "components/prefs/pref_service.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace { constexpr const char kUseBridgesKey[] = "use_bridges"; @@ -101,7 +101,7 @@ const std::vector& BridgesConfig::GetBuiltinBridges() const { // clang-format on // static -absl::optional BridgesConfig::FromDict( +std::optional BridgesConfig::FromDict( const base::Value::Dict& dict) { BridgesConfig result; result.use_bridges = @@ -129,9 +129,9 @@ absl::optional BridgesConfig::FromDict( } // static -absl::optional BridgesConfig::FromValue(const base::Value* v) { +std::optional BridgesConfig::FromValue(const base::Value* v) { if (!v || !v->is_dict()) - return absl::nullopt; + return std::nullopt; return FromDict(v->GetDict()); } diff --git a/components/tor/tor_utils.h b/components/tor/tor_utils.h index 700f56d42fe..572bbfdd5c6 100644 --- a/components/tor/tor_utils.h +++ b/components/tor/tor_utils.h @@ -6,6 +6,7 @@ #ifndef BRAVE_COMPONENTS_TOR_TOR_UTILS_H_ #define BRAVE_COMPONENTS_TOR_TOR_UTILS_H_ +#include #include #include @@ -43,8 +44,8 @@ struct BridgesConfig { const std::vector& GetBuiltinBridges() const; - static absl::optional FromDict(const base::Value::Dict& dict); - static absl::optional FromValue(const base::Value* v); + static std::optional FromDict(const base::Value::Dict& dict); + static std::optional FromValue(const base::Value* v); base::Value::Dict ToDict() const; base::Value ToValue() const; diff --git a/components/url_sanitizer/browser/url_sanitizer_service.cc b/components/url_sanitizer/browser/url_sanitizer_service.cc index f1fd2373173..2835dacee19 100644 --- a/components/url_sanitizer/browser/url_sanitizer_service.cc +++ b/components/url_sanitizer/browser/url_sanitizer_service.cc @@ -6,6 +6,7 @@ #include "brave/components/url_sanitizer/browser/url_sanitizer_service.h" #include +#include #include #include "base/json/json_reader.h" @@ -15,7 +16,6 @@ #include "base/task/thread_pool.h" #include "base/values.h" #include "extensions/common/url_pattern.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h" namespace brave { @@ -36,10 +36,10 @@ bool CreateURLPatternSetFromList(const base::Value::List* value, return valid; } -absl::optional> CreateParamsList( +std::optional> CreateParamsList( const base::Value::List* value) { if (!value) { - return absl::nullopt; + return std::nullopt; } base::flat_set result; for (const auto& param : *value) { @@ -73,7 +73,7 @@ base::flat_set> ParseFromJson( continue; } auto* params_list = items->FindList("params"); - absl::optional> params = + std::optional> params = CreateParamsList(params_list); if (!params) { continue; diff --git a/ios/browser/api/ads/ads_client_bridge.h b/ios/browser/api/ads/ads_client_bridge.h index bb23ca6fa52..4a01ad41834 100644 --- a/ios/browser/api/ads/ads_client_bridge.h +++ b/ios/browser/api/ads/ads_client_bridge.h @@ -7,11 +7,13 @@ #define BRAVE_IOS_BROWSER_API_ADS_ADS_CLIENT_BRIDGE_H_ #import -#import "brave/components/brave_ads/core/public/client/ads_client.h" +#include #include #include +#import "brave/components/brave_ads/core/public/client/ads_client.h" + @protocol AdsClientBridge @required @@ -58,11 +60,11 @@ - (void)runDBTransaction:(brave_ads::mojom::DBTransactionInfoPtr)transaction callback:(brave_ads::RunDBTransactionCallback)callback; - (void)setProfilePref:(const std::string&)path value:(base::Value)value; -- (absl::optional)getProfilePref:(const std::string&)path; +- (std::optional)getProfilePref:(const std::string&)path; - (void)clearProfilePref:(const std::string&)path; - (bool)hasProfilePrefPath:(const std::string&)path; - (void)setLocalStatePref:(const std::string&)path value:(base::Value)value; -- (absl::optional)getLocalStatePref:(const std::string&)path; +- (std::optional)getLocalStatePref:(const std::string&)path; - (void)clearLocalStatePref:(const std::string&)path; - (bool)hasLocalStatePrefPath:(const std::string&)path; - (void)recordP2AEvents:(const std::vector&)events; diff --git a/ios/browser/api/ads/ads_client_ios.h b/ios/browser/api/ads/ads_client_ios.h index 2fbaca49d0c..55debc3d7fb 100644 --- a/ios/browser/api/ads/ads_client_ios.h +++ b/ios/browser/api/ads/ads_client_ios.h @@ -7,8 +7,11 @@ #define BRAVE_IOS_BROWSER_API_ADS_ADS_CLIENT_IOS_H_ #import + +#include #include #include + #import "brave/components/brave_ads/core/public/client/ads_client.h" @protocol AdsClientBridge; @@ -65,11 +68,11 @@ class AdsClientIOS : public brave_ads::AdsClient { void RunDBTransaction(brave_ads::mojom::DBTransactionInfoPtr transaction, brave_ads::RunDBTransactionCallback callback) override; void SetProfilePref(const std::string& path, base::Value value) override; - absl::optional GetProfilePref(const std::string& path) override; + std::optional GetProfilePref(const std::string& path) override; void ClearProfilePref(const std::string& path) override; bool HasProfilePrefPath(const std::string& path) const override; void SetLocalStatePref(const std::string& path, base::Value value) override; - absl::optional GetLocalStatePref( + std::optional GetLocalStatePref( const std::string& path) override; void ClearLocalStatePref(const std::string& path) override; bool HasLocalStatePrefPath(const std::string& path) const override; diff --git a/ios/browser/api/ads/ads_client_ios.mm b/ios/browser/api/ads/ads_client_ios.mm index 0036bf91177..2162abac6d4 100644 --- a/ios/browser/api/ads/ads_client_ios.mm +++ b/ios/browser/api/ads/ads_client_ios.mm @@ -3,10 +3,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -#import "ads_client_ios.h" -#import "ads_client_bridge.h" +#import "brave/ios/browser/api/ads/ads_client_ios.h" + +#include + #include "brave/components/brave_ads/core/mojom/brave_ads.mojom.h" #include "brave/components/brave_federated/public/interfaces/brave_federated.mojom.h" +#import "brave/ios/browser/api/ads/ads_client_bridge.h" #if !defined(__has_feature) || !__has_feature(objc_arc) #error "This file requires ARC support." @@ -148,7 +151,7 @@ void AdsClientIOS::SetProfilePref(const std::string& path, base::Value value) { [bridge_ setProfilePref:path value:std::move(value)]; } -absl::optional AdsClientIOS::GetProfilePref( +std::optional AdsClientIOS::GetProfilePref( const std::string& path) { return [bridge_ getProfilePref:path]; } @@ -166,7 +169,7 @@ void AdsClientIOS::SetLocalStatePref(const std::string& path, [bridge_ setLocalStatePref:path value:std::move(value)]; } -absl::optional AdsClientIOS::GetLocalStatePref( +std::optional AdsClientIOS::GetLocalStatePref( const std::string& path) { return [bridge_ getLocalStatePref:path]; } diff --git a/ios/browser/api/ads/brave_ads.mm b/ios/browser/api/ads/brave_ads.mm index 442d4ad6f47..b1001ba369b 100644 --- a/ios/browser/api/ads/brave_ads.mm +++ b/ios/browser/api/ads/brave_ads.mm @@ -3,9 +3,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ +#import "brave/ios/browser/api/ads/brave_ads.h" + #import #import +#include + #include "base/check.h" #include "base/containers/flat_map.h" #include "base/files/file.h" @@ -43,7 +47,6 @@ #include "brave/components/ntp_background_images/common/pref_names.h" #import "brave/ios/browser/api/ads/ads_client_bridge.h" #import "brave/ios/browser/api/ads/ads_client_ios.h" -#import "brave/ios/browser/api/ads/brave_ads.h" #import "brave/ios/browser/api/ads/brave_ads.mojom.objc+private.h" #import "brave/ios/browser/api/ads/inline_content_ad_ios.h" #import "brave/ios/browser/api/ads/notification_ad_ios.h" @@ -1484,7 +1487,7 @@ brave_ads::mojom::DBCommandResponseInfoPtr RunDBTransactionOnTaskRunner( callback:(brave_ads::LoadCallback)callback { const auto contents = [self.commonOps loadContentsFromFileWithName:name]; if (contents.empty()) { - return std::move(callback).Run(/*value*/ absl::nullopt); + return std::move(callback).Run(/*value*/ std::nullopt); } std::move(callback).Run(contents); @@ -1568,7 +1571,7 @@ brave_ads::mojom::DBCommandResponseInfoPtr RunDBTransactionOnTaskRunner( // federated learning. } -- (absl::optional)getProfilePref:(const std::string&)path { +- (std::optional)getProfilePref:(const std::string&)path { if (path == brave_news::prefs::kBraveNewsOptedIn || path == brave_news::prefs::kNewTabPageShowToday || path == ntp_background_images::prefs::kNewTabPageShowBackgroundImage || @@ -1596,7 +1599,7 @@ brave_ads::mojom::DBCommandResponseInfoPtr RunDBTransactionOnTaskRunner( return self.profilePrefService->HasPrefPath(path); } -- (absl::optional)getLocalStatePref:(const std::string&)path { +- (std::optional)getLocalStatePref:(const std::string&)path { return self.localStatePrefService->GetValue(path).Clone(); } @@ -1662,7 +1665,7 @@ brave_ads::mojom::DBCommandResponseInfoPtr RunDBTransactionOnTaskRunner( base::SysNSStringToUTF8(dimensionsArg), base::BindOnce( ^(const std::string& dimensions, - const absl::optional& ad) { + const std::optional& ad) { if (!ad) { completion(base::SysUTF8ToNSString(dimensions), nil); return; @@ -1716,7 +1719,7 @@ brave_ads::mojom::DBCommandResponseInfoPtr RunDBTransactionOnTaskRunner( return nil; } - const absl::optional ad = + const std::optional ad = ads->MaybeGetNotificationAd(identifier.UTF8String); if (!ad) { return nil; diff --git a/ios/browser/api/brave_rewards/brave_rewards_api.mm b/ios/browser/api/brave_rewards/brave_rewards_api.mm index 38063ee3328..18dd3416015 100644 --- a/ios/browser/api/brave_rewards/brave_rewards_api.mm +++ b/ios/browser/api/brave_rewards/brave_rewards_api.mm @@ -3,9 +3,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#import "brave_rewards_api.h" +#import "brave/ios/browser/api/brave_rewards/brave_rewards_api.h" + #import +#include + #include "base/base64.h" #include "base/containers/flat_map.h" #include "base/ios/ios_util.h" @@ -1400,10 +1403,10 @@ static const auto kOneDay = callback { std::string encrypted_value; if (!OSCrypt::EncryptString(value, &encrypted_value)) { - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(std::nullopt); return; } - std::move(callback).Run(absl::make_optional(encrypted_value)); + std::move(callback).Run(std::make_optional(encrypted_value)); } - (void) @@ -1413,10 +1416,10 @@ static const auto kOneDay = callback { std::string decrypted_value; if (!OSCrypt::DecryptString(value, &decrypted_value)) { - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(std::nullopt); return; } - std::move(callback).Run(absl::make_optional(decrypted_value)); + std::move(callback).Run(std::make_optional(decrypted_value)); } - (void)externalWalletConnected { diff --git a/ios/browser/api/brave_wallet/brave_wallet_provider_delegate_ios+private.h b/ios/browser/api/brave_wallet/brave_wallet_provider_delegate_ios+private.h index 186b2d44485..0125aa9b9ed 100644 --- a/ios/browser/api/brave_wallet/brave_wallet_provider_delegate_ios+private.h +++ b/ios/browser/api/brave_wallet/brave_wallet_provider_delegate_ios+private.h @@ -6,6 +6,7 @@ #ifndef BRAVE_IOS_BROWSER_API_BRAVE_WALLET_BRAVE_WALLET_PROVIDER_DELEGATE_IOS_PRIVATE_H_ #define BRAVE_IOS_BROWSER_API_BRAVE_WALLET_BRAVE_WALLET_PROVIDER_DELEGATE_IOS_PRIVATE_H_ +#include #include #include @@ -36,7 +37,7 @@ class BraveWalletProviderDelegateBridge RequestPermissionsCallback) override; bool IsAccountAllowed(mojom::CoinType type, const std::string& account) override; - absl::optional> GetAllowedAccounts( + std::optional> GetAllowedAccounts( mojom::CoinType type, const std::vector& accounts) override; bool IsPermissionDenied(mojom::CoinType type) override; diff --git a/ios/browser/api/brave_wallet/brave_wallet_provider_delegate_ios.mm b/ios/browser/api/brave_wallet/brave_wallet_provider_delegate_ios.mm index 783a7360166..6f2b2279434 100644 --- a/ios/browser/api/brave_wallet/brave_wallet_provider_delegate_ios.mm +++ b/ios/browser/api/brave_wallet/brave_wallet_provider_delegate_ios.mm @@ -5,6 +5,8 @@ #include "brave/ios/browser/api/brave_wallet/brave_wallet_provider_delegate_ios.h" +#include + #include "base/strings/sys_string_conversions.h" #include "brave/base/mac/conversions.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" @@ -51,7 +53,7 @@ void BraveWalletProviderDelegateBridge::RequestPermissions( } if (results == nil) { std::move(*callback).Run( - static_cast(error), absl::nullopt); + static_cast(error), std::nullopt); return; } std::vector v; @@ -73,7 +75,7 @@ bool BraveWalletProviderDelegateBridge::IsAccountAllowed( account:base::SysUTF8ToNSString(account)]; } -absl::optional> +std::optional> BraveWalletProviderDelegateBridge::GetAllowedAccounts( mojom::CoinType type, const std::vector& accounts) { @@ -81,7 +83,7 @@ BraveWalletProviderDelegateBridge::GetAllowedAccounts( [bridge_ getAllowedAccounts:static_cast(type) accounts:brave::vector_to_ns(accounts)]; if (!results) { - return absl::nullopt; + return std::nullopt; } return brave::ns_to_vector(results); diff --git a/ios/browser/api/brave_wallet/token_registry_utils.mm b/ios/browser/api/brave_wallet/token_registry_utils.mm index 7c803542a38..a38d4d04449 100644 --- a/ios/browser/api/brave_wallet/token_registry_utils.mm +++ b/ios/browser/api/brave_wallet/token_registry_utils.mm @@ -5,6 +5,8 @@ #include "brave/ios/browser/api/brave_wallet/token_registry_utils.h" +#include + #include "base/files/file_path.h" #include "base/path_service.h" #include "base/strings/sys_string_conversions.h" @@ -17,7 +19,7 @@ + (nullable NSURL*)tokenLogoBaseURL { base::FilePath path; - absl::optional version = + std::optional version = brave_wallet::GetLastInstalledWalletVersion(); if (base::PathService::Get(ios::DIR_USER_DATA, &path) && version) { path = path.AppendASCII(brave_wallet::kWalletBaseDirectory); diff --git a/ios/browser/api/favicon/favicon_driver.mm b/ios/browser/api/favicon/favicon_driver.mm index 9a8a3f92cea..71b8c1f0ae9 100644 --- a/ios/browser/api/favicon/favicon_driver.mm +++ b/ios/browser/api/favicon/favicon_driver.mm @@ -4,6 +4,9 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ #import "brave/ios/browser/api/favicon/favicon_driver.h" + +#include + #import "base/values.h" #import "brave/ios/browser/api/web/web_state/web_state+private.h" #import "brave/ios/browser/favicon/brave_ios_web_favicon_driver.h" @@ -129,7 +132,7 @@ void FaviconDriverObserver::OnFaviconUpdated( } NSURL* ns_url = scriptMessage.frameInfo.request.URL; - absl::optional url; + std::optional url; if (ns_url) { url = net::GURLWithNSURL(ns_url); } diff --git a/ios/browser/api/history/brave_history_api.mm b/ios/browser/api/history/brave_history_api.mm index 72e1dcfd2cd..fbe79b5c927 100644 --- a/ios/browser/api/history/brave_history_api.mm +++ b/ios/browser/api/history/brave_history_api.mm @@ -5,6 +5,8 @@ #include "brave/ios/browser/api/history/brave_history_api.h" +#include + #include "base/functional/bind.h" #include "base/strings/sys_string_conversions.h" #include "brave/ios/browser/api/history/brave_history_observer.h" @@ -181,15 +183,15 @@ DomainMetricTypeIOS const DomainMetricTypeIOSLast28DayMetric = /*url*/ net::GURLWithNSURL(history.url), /*time*/ base::Time::FromNSDate(history.dateAdded), /*context_id=*/0, - /*nav_entry_id=*/0, /*local_navigation_id=*/absl::nullopt, + /*nav_entry_id=*/0, /*local_navigation_id=*/std::nullopt, /*referrer=*/GURL(), /*redirect_list*/ history::RedirectList(), /*transition*/ ui::PAGE_TRANSITION_TYPED, /*hidden=*/false, /*visit_source*/ history::VisitSource::SOURCE_BROWSED, /*did_replace_entry=*/false, /*consider_for_ntp_most_visited=*/true, /*title*/ base::SysNSStringToUTF16(history.title), - /*opener*/ absl::nullopt, - /*bookmark_id*/ absl::nullopt); + /*opener*/ std::nullopt, + /*bookmark_id*/ std::nullopt); history_service_->AddPage(args); } diff --git a/ios/browser/api/query_filter/utils.h b/ios/browser/api/query_filter/utils.h index 77489085ba3..5e9575ac9a2 100644 --- a/ios/browser/api/query_filter/utils.h +++ b/ios/browser/api/query_filter/utils.h @@ -23,7 +23,7 @@ OBJC_EXPORT /// specifies where we are navigating to. `request_method` indicates the HTTP /// method of the request. `internal_redirect` indicates wether or not this is /// an internal redirect or not. This function returns the url we should -/// redirect to or a `absl::nullopt` value if nothing is changed. +/// redirect to or a `std::nullopt` value if nothing is changed. - (nullable NSURL*) brave_applyingQueryStringFilterWithInitiatorURL: (nullable NSURL*)initiatorURL diff --git a/ios/browser/qr_code_generator/qrcode_generator_service.cc b/ios/browser/qr_code_generator/qrcode_generator_service.cc index 70f5cc62ce1..873588cd385 100644 --- a/ios/browser/qr_code_generator/qrcode_generator_service.cc +++ b/ios/browser/qr_code_generator/qrcode_generator_service.cc @@ -4,9 +4,12 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "brave/ios/browser/qr_code_generator/qrcode_generator_service.h" + #include +#include #include #include + #include "base/functional/bind.h" #include "base/functional/callback.h" #include "base/strings/string_util.h" @@ -274,7 +277,7 @@ std::unique_ptr QRCodeGeneratorService::generateQRCode( // The QR version (i.e. size) must be >= 5 because otherwise the dino painted // over the middle covers too much of the code to be decodable. constexpr int kMinimumQRVersion = 5; - absl::optional qr_data = + std::optional qr_data = qr.Generate( base::span( reinterpret_cast(request->data.data()), diff --git a/net/http/partitioned_host_state_map.cc b/net/http/partitioned_host_state_map.cc index 719aace6cc4..8da7e9d6bc9 100644 --- a/net/http/partitioned_host_state_map.cc +++ b/net/http/partitioned_host_state_map.cc @@ -5,6 +5,7 @@ #include "brave/net/http/partitioned_host_state_map.h" +#include #include #include "base/ranges/algorithm.h" @@ -26,11 +27,11 @@ namespace net { PartitionedHostStateMapBase::PartitionedHostStateMapBase() = default; PartitionedHostStateMapBase::~PartitionedHostStateMapBase() = default; -base::AutoReset> +base::AutoReset> PartitionedHostStateMapBase::SetScopedPartitionHash( - absl::optional partition_hash) { - return base::AutoReset>(&partition_hash_, - std::move(partition_hash)); + std::optional partition_hash) { + return base::AutoReset>(&partition_hash_, + std::move(partition_hash)); } bool PartitionedHostStateMapBase::HasPartitionHash() const { diff --git a/net/http/partitioned_host_state_map.h b/net/http/partitioned_host_state_map.h index 891b141dd9a..4cee40574d4 100644 --- a/net/http/partitioned_host_state_map.h +++ b/net/http/partitioned_host_state_map.h @@ -7,6 +7,7 @@ #define BRAVE_NET_HTTP_PARTITIONED_HOST_STATE_MAP_H_ #include +#include #include #include "base/auto_reset.h" @@ -14,7 +15,6 @@ #include "base/ranges/algorithm.h" #include "crypto/sha2.h" #include "net/base/net_export.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace net { @@ -31,8 +31,8 @@ class NET_EXPORT PartitionedHostStateMapBase { delete; // Stores scoped partition hash for use in subsequent calls. - base::AutoReset> SetScopedPartitionHash( - absl::optional partition_hash); + base::AutoReset> SetScopedPartitionHash( + std::optional partition_hash); // Returns true if |partition_hash_| is set. The value may be empty. bool HasPartitionHash() const; // Returns true if |partition_hash_| contains a non empty valid hash. @@ -51,7 +51,7 @@ class NET_EXPORT PartitionedHostStateMapBase { // empty array - invalid/opaque partition, i.e. shouldn't be stored; // non-empty array - valid partition. // Where empty is defined as zero-initialized. - absl::optional partition_hash_; + std::optional partition_hash_; }; // Allows data partitioning using half key from PartitionHash. The class mimics diff --git a/net/proxy_resolution/proxy_config_service_tor.cc b/net/proxy_resolution/proxy_config_service_tor.cc index 875e706fa08..39aa5ae00cc 100644 --- a/net/proxy_resolution/proxy_config_service_tor.cc +++ b/net/proxy_resolution/proxy_config_service_tor.cc @@ -9,6 +9,7 @@ #include #include +#include #include #include @@ -145,7 +146,7 @@ std::string ProxyConfigServiceTor::CircuitAnonymizationKey(const GURL& url) { const auto network_anonymization_key = net::NetworkAnonymizationKey::CreateFromFrameSite(url_site, url_site); - const absl::optional& schemeful_site = + const std::optional& schemeful_site = network_anonymization_key.GetTopFrameSite(); DCHECK(schemeful_site.has_value()); std::string host = GURL(schemeful_site->Serialize()).host(); diff --git a/patches/extensions-browser-api-socket-tcp_socket.cc.patch b/patches/extensions-browser-api-socket-tcp_socket.cc.patch index 7e838a7d03b..b50b4dde9e0 100644 --- a/patches/extensions-browser-api-socket-tcp_socket.cc.patch +++ b/patches/extensions-browser-api-socket-tcp_socket.cc.patch @@ -14,7 +14,7 @@ index 11e55634fb1dd6d04c8dc3f336732088e07a9e49..ba963504511220b66c1bb63d12c45c70 + } + if (accept_callback_) { + std::move(accept_callback_) -+ .Run(net::ERR_CONNECTION_CLOSED, mojo::NullRemote(), absl::nullopt, ++ .Run(net::ERR_CONNECTION_CLOSED, mojo::NullRemote(), std::nullopt, + mojo::ScopedDataPipeConsumerHandle(), + mojo::ScopedDataPipeProducerHandle()); + } diff --git a/renderer/brave_wallet/brave_wallet_render_frame_observer.cc b/renderer/brave_wallet/brave_wallet_render_frame_observer.cc index a59221bca1b..7d18a9f5a00 100644 --- a/renderer/brave_wallet/brave_wallet_render_frame_observer.cc +++ b/renderer/brave_wallet/brave_wallet_render_frame_observer.cc @@ -6,13 +6,13 @@ #include "brave/renderer/brave_wallet/brave_wallet_render_frame_observer.h" #include +#include #include #include "brave/components/brave_wallet/renderer/v8_helper.h" #include "build/buildflag.h" #include "content/public/common/isolated_world_ids.h" #include "content/public/renderer/render_frame.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/blink/public/web/blink.h" #include "third_party/blink/public/web/web_local_frame.h" @@ -28,7 +28,7 @@ BraveWalletRenderFrameObserver::~BraveWalletRenderFrameObserver() = default; void BraveWalletRenderFrameObserver::DidStartNavigation( const GURL& url, - absl::optional navigation_type) { + std::optional navigation_type) { url_ = url; } diff --git a/renderer/brave_wallet/brave_wallet_render_frame_observer.h b/renderer/brave_wallet/brave_wallet_render_frame_observer.h index 4171b6ddee2..984ded930bd 100644 --- a/renderer/brave_wallet/brave_wallet_render_frame_observer.h +++ b/renderer/brave_wallet/brave_wallet_render_frame_observer.h @@ -6,6 +6,8 @@ #ifndef BRAVE_RENDERER_BRAVE_WALLET_BRAVE_WALLET_RENDER_FRAME_OBSERVER_H_ #define BRAVE_RENDERER_BRAVE_WALLET_BRAVE_WALLET_RENDER_FRAME_OBSERVER_H_ +#include + #include "brave/common/brave_renderer_configuration.mojom.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" #include "brave/components/brave_wallet/renderer/js_ethereum_provider.h" @@ -32,7 +34,7 @@ class BraveWalletRenderFrameObserver : public content::RenderFrameObserver { // RenderFrameObserver implementation. void DidStartNavigation( const GURL& url, - absl::optional navigation_type) override; + std::optional navigation_type) override; void DidClearWindowObject() override; void DidFinishLoad() override; diff --git a/renderer/test/js_ethereum_provider_browsertest.cc b/renderer/test/js_ethereum_provider_browsertest.cc index 91ed373aae1..a2b2a138016 100644 --- a/renderer/test/js_ethereum_provider_browsertest.cc +++ b/renderer/test/js_ethereum_provider_browsertest.cc @@ -4,6 +4,7 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ #include +#include #include "base/path_service.h" #include "base/strings/stringprintf.h" @@ -539,7 +540,7 @@ IN_PROC_BROWSER_TEST_F(JSEthereumProviderBrowserTest, OnlyWriteOwnProperty) { "0x1"); GetJsonRpcService()->SetNetwork("0x5", brave_wallet::mojom::CoinType::ETH, - absl::nullopt); + std::nullopt); // Needed so ChainChangedEvent observers run base::RunLoop().RunUntilIdle(); EXPECT_EQ(content::EvalJs(primary_main_frame(), get_chain_id).ExtractString(), @@ -556,7 +557,7 @@ IN_PROC_BROWSER_TEST_F(JSEthereumProviderBrowserTest, OnlyWriteOwnProperty) { "0x89"); GetJsonRpcService()->SetNetwork("0x4", brave_wallet::mojom::CoinType::ETH, - absl::nullopt); + std::nullopt); // Needed so ChainChangedEvent observers run base::RunLoop().RunUntilIdle(); EXPECT_EQ(content::EvalJs(primary_main_frame(), get_chain_id).ExtractString(), diff --git a/sandbox/win/src/module_file_name_interception.cc b/sandbox/win/src/module_file_name_interception.cc index 0ff5aec87fa..d0716ffcd45 100644 --- a/sandbox/win/src/module_file_name_interception.cc +++ b/sandbox/win/src/module_file_name_interception.cc @@ -6,13 +6,14 @@ #include "brave/sandbox/win/src/module_file_name_interception.h" #include + #include +#include #include #include #include "base/strings/string_util.h" #include "base/win/windows_types.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace { @@ -58,13 +59,13 @@ struct TestBraveToChrome { }; template