[Rebranding] Refactor |ReplaceChromeToBraveScheme| to use reference parameter and return boolean

And minor refactoring in other places.

browser/ui/brave_scheme_utils.cc

@@ -11,14 +11,15 @@ namespace brave_utils {
 constexpr char16_t kChromeSchema16[] = u"chrome://";
 constexpr char16_t kBraveSchema16[] = u"brave://";
 
-void ReplaceChromeToBraveScheme(std::u16string* url_string) {
-  if (base::StartsWith(*url_string, kChromeSchema16,
+bool ReplaceChromeToBraveScheme(std::u16string& url_string) {
+  if (base::StartsWith(url_string, kChromeSchema16,
                        base::CompareCase::INSENSITIVE_ASCII)) {
-    base::ReplaceFirstSubstringAfterOffset(url_string, 0, kChromeSchema16,
+    base::ReplaceFirstSubstringAfterOffset(&url_string, 0, kChromeSchema16,
                                            kBraveSchema16);
+    return true;
   }
 
-  return;
+  return false;
 }
 
 }  // namespace brave_utils

browser/ui/brave_scheme_utils.h

@@ -9,7 +9,8 @@
 #include <string>
 
 namespace brave_utils {
-void ReplaceChromeToBraveScheme(std::u16string* url_string);
+// Replaces the chrome:// scheme with brave:// scheme in the given |url_string|.
+bool ReplaceChromeToBraveScheme(std::u16string& url_string);
 }  // namespace brave_utils
 
 #endif  // BRAVE_BROWSER_UI_BRAVE_SCHEME_UTILS_H_

browser/ui/brave_scheme_utils_unittest.cc

@@ -9,14 +9,14 @@
 
 TEST(BraveSchemeUtilsTest, ReplaceChromeToBraveScheme) {
   std::u16string url_string = u"chrome://settings";
-  brave_utils::ReplaceChromeToBraveScheme(&url_string);
+  brave_utils::ReplaceChromeToBraveScheme(url_string);
   EXPECT_EQ(url_string, u"brave://settings");
 
   url_string = u"chrome://flags";
-  brave_utils::ReplaceChromeToBraveScheme(&url_string);
+  brave_utils::ReplaceChromeToBraveScheme(url_string);
   EXPECT_EQ(url_string, u"brave://flags");
 
   url_string = u"https://search.brave.com";
-  brave_utils::ReplaceChromeToBraveScheme(&url_string);
+  brave_utils::ReplaceChromeToBraveScheme(url_string);
   EXPECT_EQ(url_string, u"https://search.brave.com");
 }

browser/ui/toolbar/brave_location_bar_model_delegate.cc

@@ -38,7 +38,7 @@ void BraveLocationBarModelDelegate::FormattedStringFromURL(
     const GURL& url,
     std::u16string* new_formatted_url) {
   // Replace chrome:// with brave://
-  brave_utils::ReplaceChromeToBraveScheme(new_formatted_url);
+  brave_utils::ReplaceChromeToBraveScheme(*new_formatted_url);
 
 #if BUILDFLAG(ETHEREUM_REMOTE_CLIENT_ENABLED)
   if (url.SchemeIs(kChromeExtensionScheme) &&

chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc

@@ -30,9 +30,9 @@ void TabHoverCardBubbleView_ChromiumImpl::BraveUpdateCardContent(
   // Replace chrome:// with brave://. Since this is purely in the UI we can
   // just do a sub-string replacement instead of parsing into GURL.
   std::u16string domain = domain_label_->GetText();
-  brave_utils::ReplaceChromeToBraveScheme(&domain);
-
-  domain_label_->SetData({domain, /*is_filename*/ false});
+  if (brave_utils::ReplaceChromeToBraveScheme(domain)) {
+    domain_label_->SetData({domain, /*is_filename*/ false});
+  }
 }
 
 void TabHoverCardBubbleView::UpdateCardContent(const Tab* tab) {

chromium_src/chrome/browser/ui/views/web_apps/web_app_views_utils.cc

@@ -17,8 +17,9 @@ std::unique_ptr<views::Label> CreateOriginLabelFromStartUrl(
     bool is_primary_text) {
   std::unique_ptr<views::Label> origin_label =
       CreateOriginLabelFromStartUrl_ChromiumImpl(start_url, is_primary_text);
+  CHECK(origin_label);
   std::u16string label_text = origin_label->GetText();
-  brave_utils::ReplaceChromeToBraveScheme(&label_text);
+  brave_utils::ReplaceChromeToBraveScheme(label_text);
   origin_label->SetText(label_text);
 
   return origin_label;

chromium_src/chrome/browser/ui/web_applications/app_browser_controller.cc

@@ -18,7 +18,7 @@ std::u16string AppBrowserController::FormatUrlOrigin(
     const GURL& url,
     url_formatter::FormatUrlTypes format_types) {
   std::u16string url_string = FormatUrlOrigin_ChromiumImpl(url, format_types);
-  brave_utils::ReplaceChromeToBraveScheme(&url_string);
+  brave_utils::ReplaceChromeToBraveScheme(url_string);
 
   return url_string;
 }

chromium_src/chrome/browser/ui/web_applications/app_browser_controller.h

@@ -6,16 +6,9 @@
 #ifndef BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_WEB_APPLICATIONS_APP_BROWSER_CONTROLLER_H_
 #define BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_WEB_APPLICATIONS_APP_BROWSER_CONTROLLER_H_
 
-#define FormatUrlOrigin                                              \
-  FormatUrlOrigin_ChromiumImpl(                                      \
-      const GURL& url,                                               \
-      url_formatter::FormatUrlTypes format_types =                   \
-          url_formatter::kFormatUrlOmitUsernamePassword |            \
-          url_formatter::kFormatUrlOmitHTTPS |                       \
-          url_formatter::kFormatUrlOmitHTTP |                        \
-          url_formatter::kFormatUrlOmitTrailingSlashOnBareHostname | \
-          url_formatter::kFormatUrlOmitTrivialSubdomains);           \
-  static std::u16string FormatUrlOrigin
+#define FormatUrlOrigin(...)                 \
+  FormatUrlOrigin_ChromiumImpl(__VA_ARGS__); \
+  static std::u16string FormatUrlOrigin(__VA_ARGS__)
 
 #include "src/chrome/browser/ui/web_applications/app_browser_controller.h"  // IWYU pragma: export
 #undef FormatUrlOrigin