From 5b90ce22905521a806283e6c1c679735defdd07b Mon Sep 17 00:00:00 2001 From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com> Date: Thu, 13 Feb 2025 11:30:40 +0100 Subject: [PATCH] refactor: follow upstream's suggestions on when to use EmptyGURL() (#45521) - Prefer GURL() when we want to return a non-reference empty URL. - In ServiceWorkerMain::GetStorageKey(), use a reference instead of instantiating a new temporary GURL. From url/gurl.h: > // Returns a reference to a singleton empty GURL. This object is for > // callers who return references but don't have anything to return in > // some cases. If you just want an empty URL for normal use, prefer > // GURL(). Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr --- shell/browser/api/electron_api_service_worker_main.cc | 4 ++-- shell/browser/api/electron_api_web_frame_main.cc | 2 +- .../api/management/electron_management_api_delegate.cc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/shell/browser/api/electron_api_service_worker_main.cc b/shell/browser/api/electron_api_service_worker_main.cc index 6c135894e23f..2c397a9e86ee 100644 --- a/shell/browser/api/electron_api_service_worker_main.cc +++ b/shell/browser/api/electron_api_service_worker_main.cc @@ -192,7 +192,7 @@ bool ServiceWorkerMain::IsDestroyed() const { } const blink::StorageKey ServiceWorkerMain::GetStorageKey() { - GURL scope = version_info_ ? version_info()->scope : GURL::EmptyGURL(); + const GURL& scope = version_info_ ? version_info()->scope : GURL::EmptyGURL(); return blink::StorageKey::CreateFirstParty(url::Origin::Create(scope)); } @@ -279,7 +279,7 @@ int64_t ServiceWorkerMain::VersionID() const { GURL ServiceWorkerMain::ScopeURL() const { if (version_destroyed_) - return GURL::EmptyGURL(); + return {}; return version_info()->scope; } diff --git a/shell/browser/api/electron_api_web_frame_main.cc b/shell/browser/api/electron_api_web_frame_main.cc index cc3d142eef04..560131a35bd8 100644 --- a/shell/browser/api/electron_api_web_frame_main.cc +++ b/shell/browser/api/electron_api_web_frame_main.cc @@ -375,7 +375,7 @@ int WebFrameMain::RoutingID() const { GURL WebFrameMain::URL() const { if (!CheckRenderFrame()) - return GURL::EmptyGURL(); + return {}; return render_frame_->GetLastCommittedURL(); } diff --git a/shell/browser/extensions/api/management/electron_management_api_delegate.cc b/shell/browser/extensions/api/management/electron_management_api_delegate.cc index b49a30581237..f01c8969de24 100644 --- a/shell/browser/extensions/api/management/electron_management_api_delegate.cc +++ b/shell/browser/extensions/api/management/electron_management_api_delegate.cc @@ -214,7 +214,7 @@ GURL ElectronManagementAPIDelegate::GetEffectiveUpdateURL( const extensions::Extension& extension, content::BrowserContext* context) const { // TODO(codebytere): we do not currently support ExtensionManagement. - return GURL::EmptyGURL(); + return {}; } void ElectronManagementAPIDelegate::ShowMv2DeprecationReEnableDialog(