Merge pull request #1745 from brave/cleanup_url_handler_registration

Remove redundant UrlHandler pair

Author: simonhong

browser/brave_content_browser_client.cc

@@ -89,7 +89,6 @@ bool HandleURLOverrideRewrite(GURL* url,
   return false;
 }
 
-
 bool HandleURLReverseOverrideRewrite(GURL* url,
                              content::BrowserContext* browser_context) {
   if (url->host() == chrome::kChromeUIWelcomeHost ||
@@ -142,8 +141,6 @@ void BraveContentBrowserClient::BrowserURLHandlerCreated(
   handler->AddHandlerPair(&HandleURLRewrite,
                           &HandleURLReverseOverrideRewrite);
   ChromeContentBrowserClient::BrowserURLHandlerCreated(handler);
-  handler->AddHandlerPair(&HandleURLOverrideRewrite,
-                          &HandleURLReverseOverrideRewrite);
 }
 
 bool BraveContentBrowserClient::AllowAccessCookie(

browser/brave_content_browser_client_browsertest.cc

@@ -205,15 +205,40 @@ IN_PROC_BROWSER_TEST_F(BraveContentBrowserClientTest,
   for (const std::string& scheme : schemes) {
     content::WebContents* contents =
         browser()->tab_strip_model()->GetActiveWebContents();
-    ui_test_utils::NavigateToURL(browser(), GURL(scheme + "sync-internals/"));
-      ASSERT_TRUE(WaitForLoadStop(contents));
+    ui_test_utils::NavigateToURL(
+        browser(), GURL(scheme + chrome::kChromeUISyncInternalsHost));
+    ASSERT_TRUE(WaitForLoadStop(contents));
 
-      EXPECT_STREQ(contents->GetController().GetLastCommittedEntry()
-                       ->GetVirtualURL().spec().c_str(),
-                   "brave://sync/");
-      EXPECT_STREQ(contents->GetController().GetLastCommittedEntry()
-                       ->GetURL().spec().c_str(),
-                   "chrome://sync/");
+    EXPECT_STREQ(contents->GetController().GetLastCommittedEntry()
+                     ->GetVirtualURL().spec().c_str(),
+                 "brave://sync/");
+    EXPECT_STREQ(contents->GetController().GetLastCommittedEntry()
+                     ->GetURL().spec().c_str(),
+                 "chrome://sync/");
+  }
+}
+
+IN_PROC_BROWSER_TEST_F(BraveContentBrowserClientTest,
+    RewriteWelcomeWin10Host) {
+  std::vector<std::string> schemes {
+    "brave://",
+    "chrome://",
+  };
+
+  for (const std::string& scheme : schemes) {
+    content::WebContents* contents =
+        browser()->tab_strip_model()->GetActiveWebContents();
+    ui_test_utils::NavigateToURL(
+        browser(),
+        GURL(scheme + chrome::kChromeUIWelcomeWin10Host));
+    ASSERT_TRUE(WaitForLoadStop(contents));
+
+    EXPECT_STREQ(contents->GetController().GetLastCommittedEntry()
+                     ->GetVirtualURL().spec().c_str(),
+                 "brave://welcome/");
+    EXPECT_STREQ(contents->GetController().GetLastCommittedEntry()
+                     ->GetURL().spec().c_str(),
+                 "chrome://welcome/");
   }
 }