MD Settings: Redirect chrome://help and chrome://chrome to About page.

chrome/browser/browser_about_handler.cc

Index: chrome/browser/browser_about_handler.cc
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc
index 6006a1bf7d6b593b7210183a2f2a29365316a648..638c2e8f866a0fa1cd83360af809ad55603a99a4 100644
--- a/chrome/browser/browser_about_handler.cc
+++ b/chrome/browser/browser_about_handler.cc
@@ -118,8 +118,7 @@ bool WillHandleBrowserAboutURL(GURL* url,
   // Redirect chrome://help, unless MD settings is enabled.
   } else if (host == chrome::kChromeUIHelpHost) {
     if (base::FeatureList::IsEnabled(features::kMaterialDesignSettings)) {
-      host = chrome::kChromeUISettingsHost;
-      path = chrome::kChromeUIHelpHost;
+      return false;  // Handled in the HandleWebUI handler.
     } else if (::switches::AboutInSettingsEnabled()) {
       host = chrome::kChromeUISettingsFrameHost;
       if (url->path().empty() || url->path() == "/")
@@ -128,12 +127,6 @@ bool WillHandleBrowserAboutURL(GURL* url,
       host = chrome::kChromeUIUberHost;
       path = chrome::kChromeUIHelpHost + url->path();
     }
-  // Redirect chrome://chrome to chrome://settings/help, only for MD settings.
-  } else if (host == chrome::kChromeUIUberHost &&
-             base::FeatureList::IsEnabled(features::kMaterialDesignSettings) &&
-             (url->path().empty() || url->path() == "/")) {
-    host = chrome::kChromeUISettingsHost;
-    path = chrome::kChromeUIHelpHost;
   }
 
   GURL::Replacements replacements;