Merge pull request #1385 from /issues/1616

use `brave://` for the virtual url and `chrome://` for the internal u…
brave · Jan 31, 2019 · bf338a5 · bf338a5
2 parents c20ca87 + 0c92190
commit bf338a5
Show file tree

Hide file tree

Showing 14 changed files with 230 additions and 208 deletions.
diff --git a/browser/brave_content_browser_client.cc b/browser/brave_content_browser_client.cc
@@ -1,9 +1,13 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* Copyright (c) 2019 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * 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_content_browser_client.h"
 
+#include <string>
+#include <utility>
+
 #include "base/bind.h"
 #include "base/json/json_reader.h"
 #include "base/task/post_task.h"
@@ -43,6 +47,7 @@
 #include "ui/base/resource/resource_bundle.h"
 
 using content::BrowserThread;
+using content::ContentBrowserClient;
 using content::RenderFrameHost;
 using content::WebContents;
 using brave_shields::BraveShieldsWebContentsObserver;
@@ -61,44 +66,67 @@ using extensions::ChromeContentBrowserClientExtensionsPart;
 
 namespace {
 
-bool HandleURLRewrite(GURL* url,
-                      content::BrowserContext* browser_context) {
-  if (url->SchemeIs(content::kChromeUIScheme) &&
-      (url->host() == chrome::kChromeUIWelcomeHost ||
-       url->host() == chrome::kChromeUIWelcomeWin10Host)) {
-    *url = GURL(kBraveUIWelcomeURL);
+bool HandleURLOverrideRewrite(GURL* url,
+                              content::BrowserContext* browser_context) {
+  // redirect sync-internals
+  if (url->host() == chrome::kChromeUISyncInternalsHost ||
+      url->host() == chrome::kChromeUISyncHost) {
+    GURL::Replacements replacements;
+    replacements.SetHostStr(chrome::kChromeUISyncHost);
+    *url = url->ReplaceComponents(replacements);
     return true;
   }
-  if (url->SchemeIs(content::kChromeUIScheme) &&
-      (url->host() == kBraveUISyncHost)) {
-    *url = GURL(kBraveUISyncURL);
+
+  // no special win10 welcome page
+  if (url->host() == chrome::kChromeUIWelcomeWin10Host ||
+      url->host() == chrome::kChromeUIWelcomeHost) {
+    *url = GURL(chrome::kChromeUIWelcomeURL);
     return true;
   }
 
   return false;
 }
 
-bool HandleURLReverseRewrite(GURL* url,
+
+bool HandleURLReverseOverrideRewrite(GURL* url,
                              content::BrowserContext* browser_context) {
-  if (url->spec() == kBraveUIWelcomeURL ||
-      url->spec() == kBraveUISyncURL) {
+  if (url->host() == chrome::kChromeUIWelcomeHost ||
+      url->host() == chrome::kChromeUISyncHost) {
+    GURL::Replacements replacements;
+    replacements.SetSchemeStr(kBraveUIScheme);
+    *url = url->ReplaceComponents(replacements);
     return true;
   }
+
+  return false;
+}
+
+bool HandleURLRewrite(GURL* url,
+                      content::BrowserContext* browser_context) {
+  if (url->SchemeIs(kBraveUIScheme)) {
+    GURL::Replacements replacements;
+    replacements.SetSchemeStr(content::kChromeUIScheme);
+    *url = url->ReplaceComponents(replacements);
+  }
+
+  if (HandleURLOverrideRewrite(url, browser_context))
+    return true;
+
   return false;
 }
 
 }  // namespace
 
-BraveContentBrowserClient::BraveContentBrowserClient(ChromeFeatureListCreator* chrome_feature_list_creator) :
-    ChromeContentBrowserClient(chrome_feature_list_creator)
-{}
+BraveContentBrowserClient::BraveContentBrowserClient(
+    ChromeFeatureListCreator* chrome_feature_list_creator)
+    : ChromeContentBrowserClient(chrome_feature_list_creator) {}
 
 BraveContentBrowserClient::~BraveContentBrowserClient() {}
 
 content::BrowserMainParts* BraveContentBrowserClient::CreateBrowserMainParts(
       const content::MainFunctionParams& parameters) {
-  ChromeBrowserMainParts* main_parts = (ChromeBrowserMainParts*)
-      ChromeContentBrowserClient::CreateBrowserMainParts(parameters);
+  ChromeBrowserMainParts* main_parts = static_cast<ChromeBrowserMainParts*>(
+      ChromeContentBrowserClient::CreateBrowserMainParts(parameters));
   main_parts->AddParts(new BraveBrowserMainExtraParts());
   return main_parts;
 }
@@ -110,12 +138,18 @@ void BraveContentBrowserClient::BrowserURLHandlerCreated(
   handler->AddHandlerPair(&webtorrent::HandleTorrentURLRewrite,
                           &webtorrent::HandleTorrentURLReverseRewrite);
   handler->AddHandlerPair(&HandleURLRewrite,
-                          &HandleURLReverseRewrite);
+                          &HandleURLReverseOverrideRewrite);
   ChromeContentBrowserClient::BrowserURLHandlerCreated(handler);
+  handler->AddHandlerPair(&HandleURLOverrideRewrite,
+                          &HandleURLReverseOverrideRewrite);
 }
 
-bool BraveContentBrowserClient::AllowAccessCookie(const GURL& url, const GURL& first_party,
-    content::ResourceContext* context, int render_process_id, int render_frame_id) {
+bool BraveContentBrowserClient::AllowAccessCookie(
+    const GURL& url,
+    const GURL& first_party,
+    content::ResourceContext* context,
+    int render_process_id,
+    int render_frame_id) {
   GURL tab_origin =
       BraveShieldsWebContentsObserver::GetTabURLFromRenderFrameInfo(
           render_process_id, render_frame_id, -1).GetOrigin();
@@ -169,7 +203,7 @@ BraveContentBrowserClient::AllowWebBluetooth(
     content::BrowserContext* browser_context,
     const url::Origin& requesting_origin,
     const url::Origin& embedding_origin) {
-  return content::ContentBrowserClient::AllowWebBluetoothResult::BLOCK_GLOBALLY_DISABLED;
+  return ContentBrowserClient::AllowWebBluetoothResult::BLOCK_GLOBALLY_DISABLED;
 }
 
 bool BraveContentBrowserClient::HandleExternalProtocol(
@@ -188,7 +222,8 @@ bool BraveContentBrowserClient::HandleExternalProtocol(
   }
 
   return ChromeContentBrowserClient::HandleExternalProtocol(
-      url, web_contents_getter, child_id, navigation_data, is_main_frame, page_transition, has_user_gesture, method, headers);
+      url, web_contents_getter, child_id, navigation_data, is_main_frame,
+      page_transition, has_user_gesture, method, headers);
 }
 
 void BraveContentBrowserClient::RegisterOutOfProcessServices(
@@ -217,7 +252,6 @@ BraveContentBrowserClient::GetNavigationUIData(
   TorProfileServiceFactory::SetTorNavigationUIData(profile,
                                                    navigation_ui_data.get());
   return std::move(navigation_ui_data);
-
 }
 
 std::unique_ptr<base::Value>
@@ -285,11 +319,14 @@ void BraveContentBrowserClient::MaybeHideReferrer(
           GURL(),
           CONTENT_SETTINGS_TYPE_PLUGINS,
           brave_shields::kBraveShields);
-   brave_shields::ShouldSetReferrer(allow_referrers, shields_up,
-                                    referrer->url, document_url, request_url,
-                                    request_url.GetOrigin(),
-                                    referrer->policy,
-                                    referrer);
+  brave_shields::ShouldSetReferrer(allow_referrers,
+                                   shields_up,
+                                   referrer->url,
+                                   document_url,
+                                   request_url,
+                                   request_url.GetOrigin(),
+                                   referrer->policy,
+                                   referrer);
 }
 
 GURL BraveContentBrowserClient::GetEffectiveURL(

diff --git a/browser/brave_content_browser_client_browsertest.cc b/browser/brave_content_browser_client_browsertest.cc
@@ -1,4 +1,5 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* Copyright (c) 2019 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
@@ -19,6 +20,7 @@
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/buildflags.h"
 #include "chrome/common/chrome_content_client.h"
+#include "chrome/common/webui_url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
@@ -114,36 +116,127 @@ class BraveContentBrowserClientTest : public InProcessBrowserTest {
 };
 
 IN_PROC_BROWSER_TEST_F(BraveContentBrowserClientTest, CanLoadChromeURL) {
-  GURL chrome_settings_url("chrome://about/");
-  std::vector<GURL> urls{chrome_settings_url, GURL("about:about/"),
-                         GURL("brave://about/")};
-  std::for_each(urls.begin(), urls.end(),
-                [this, &chrome_settings_url](const GURL& url) {
-                  content::WebContents* contents =
-                      browser()->tab_strip_model()->GetActiveWebContents();
-                  ui_test_utils::NavigateToURL(browser(), url);
-                  ASSERT_TRUE(WaitForLoadStop(contents));
-                  EXPECT_STREQ(contents->GetLastCommittedURL().spec().c_str(),
-                               chrome_settings_url.spec().c_str());
-                });
+  std::vector<std::string> pages {
+    chrome::kChromeUIWelcomeHost,
+  };
+
+  std::vector<std::string> schemes {
+    "about:",
+    "brave://",
+    "chrome://",
+  };
+
+  for (const std::string& page : pages) {
+    for (const std::string& scheme : schemes) {
+      content::WebContents* contents =
+          browser()->tab_strip_model()->GetActiveWebContents();
+      ui_test_utils::NavigateToURL(browser(), GURL(scheme + page + "/"));
+      ASSERT_TRUE(WaitForLoadStop(contents));
+
+      EXPECT_STREQ(contents->GetController().GetLastCommittedEntry()
+                       ->GetVirtualURL().spec().c_str(),
+                   ("brave://" + page + "/").c_str());
+      EXPECT_STREQ(contents->GetController().GetLastCommittedEntry()
+                       ->GetURL().spec().c_str(),
+                   ("chrome://" + page + "/").c_str());
+    }
+  }
 }
 
 IN_PROC_BROWSER_TEST_F(BraveContentBrowserClientTest, CanLoadCustomBravePages) {
-  std::vector<GURL> urls {
-    GURL("chrome://adblock/"),
+  std::vector<std::string> pages {
+    "adblock",
 #if BUILDFLAG(BRAVE_REWARDS_ENABLED)
-        GURL("chrome://rewards/"),
+    "rewards",
 #endif
-        GURL("chrome://welcome/"), GURL("chrome://sync/")
+    chrome::kChromeUISyncHost,
+  };
+
+  std::vector<std::string> schemes {
+    "brave://",
+    "chrome://",
+  };
+
+  for (const std::string& page : pages) {
+    for (const std::string& scheme : schemes) {
+      content::WebContents* contents =
+          browser()->tab_strip_model()->GetActiveWebContents();
+      ui_test_utils::NavigateToURL(browser(), GURL(scheme + page + "/"));
+      ASSERT_TRUE(WaitForLoadStop(contents));
+
+      EXPECT_STREQ(contents->GetController().GetLastCommittedEntry()
+                       ->GetVirtualURL().spec().c_str(),
+                   ("brave://" + page + "/").c_str());
+      EXPECT_STREQ(contents->GetController().GetLastCommittedEntry()
+                       ->GetURL().spec().c_str(),
+                   ("chrome://" + page + "/").c_str());
+    }
+  }
+}
+
+IN_PROC_BROWSER_TEST_F(BraveContentBrowserClientTest, CanLoadAboutHost) {
+  std::vector<std::string> schemes {
+    "chrome://",
+    "brave://",
+  };
+
+  for (const std::string& scheme : schemes) {
+    content::WebContents* contents =
+        browser()->tab_strip_model()->GetActiveWebContents();
+    ui_test_utils::NavigateToURL(browser(), GURL(scheme + "about/"));
+      ASSERT_TRUE(WaitForLoadStop(contents));
+
+      EXPECT_STREQ(contents->GetController().GetLastCommittedEntry()
+                       ->GetVirtualURL().spec().c_str(),
+                   "brave://about/");
+      EXPECT_STREQ(contents->GetController().GetLastCommittedEntry()
+                       ->GetURL().spec().c_str(),
+                   "chrome://chrome-urls/");
+  }
+}
+
+IN_PROC_BROWSER_TEST_F(BraveContentBrowserClientTest,
+    RewriteChromeSyncInternals) {
+  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 + "sync-internals/"));
+      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/");
+  }
+}
+
+IN_PROC_BROWSER_TEST_F(BraveContentBrowserClientTest,
+    RewriteChromeWelcomeWin10) {
+  std::vector<std::string> schemes {
+    "brave://",
+    "chrome://",
   };
-  std::for_each(urls.begin(), urls.end(), [this](const GURL& url) {
+
+  for (const std::string& scheme : schemes) {
     content::WebContents* contents =
         browser()->tab_strip_model()->GetActiveWebContents();
-    ui_test_utils::NavigateToURL(browser(), url);
+    ui_test_utils::NavigateToURL(browser(), GURL(scheme + "welcome-win10/"));
     ASSERT_TRUE(WaitForLoadStop(contents));
-    EXPECT_STREQ(contents->GetLastCommittedURL().spec().c_str(),
-                 url.spec().c_str());
-  });
+
+    EXPECT_STREQ(contents->GetController().GetLastCommittedEntry()
+                     ->GetVirtualURL().spec().c_str(),
+                 "brave://welcome/");
+    EXPECT_STREQ(contents->GetController().GetLastCommittedEntry()
+                     ->GetURL().spec().c_str(),
+                 "chrome://welcome/");
+  }
 }
 
 IN_PROC_BROWSER_TEST_F(BraveContentBrowserClientTest, RewriteMagnetURLURLBar) {
@@ -327,7 +420,7 @@ IN_PROC_BROWSER_TEST_F(BraveContentBrowserClientTest,
 
 class BraveContentBrowserClientReferrerTest
     : public BraveContentBrowserClientTest {
-public:
+ public:
   HostContentSettingsMap* content_settings() {
     return HostContentSettingsMapFactory::GetForProfile(browser()->profile());
   }

diff --git a/browser/ui/webui/brave_web_ui_controller_factory.cc b/browser/ui/webui/brave_web_ui_controller_factory.cc
@@ -1,9 +1,12 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* Copyright (c) 2019 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * 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/webui/brave_web_ui_controller_factory.h"
 
+#include <memory>
+
 #include "brave/browser/ui/webui/brave_adblock_ui.h"
 #include "brave/browser/ui/webui/brave_md_settings_ui.h"
 #include "brave/browser/ui/webui/brave_new_tab_ui.h"
@@ -70,7 +73,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
       url.host_piece() == kDonateHost ||
 #endif
       url.host_piece() == kWelcomeHost ||
-      url.host_piece() == kBraveUIWelcomeURL ||
+      url.host_piece() == chrome::kChromeUIWelcomeURL ||
       (url.host_piece() == kBraveUISyncHost &&
           brave_sync::BraveSyncService::is_enabled()) ||
       url.host_piece() == chrome::kChromeUINewTabHost ||
@@ -85,7 +88,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
 
 WebUI::TypeID BraveWebUIControllerFactory::GetWebUIType(
       content::BrowserContext* browser_context, const GURL& url) const {
-
   WebUIFactoryFunction function = GetWebUIFactoryFunction(NULL, url);
   if (function) {
     return reinterpret_cast<WebUI::TypeID>(function);