WebUI cleanup: Remove support for obsolete chrome://extensions-frame URL.

Since M59, this URL simply forwards to chrome://extensions. This CL
removes the redirect.

reached" page.

Bug: None
Test: Visit chrome://extensions-frame, should see "This site can’t be
Change-Id: Iff52fdf5cfbd6e945b1565945f786e77591edfce
Reviewed-on: https://chromium-review.googlesource.com/c/1495864Reviewed-by: Devlin <rdevlin.cronin@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Auto-Submit: Demetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#636634}

chrome/browser/browser_about_handler.cc

@@ -67,11 +67,10 @@ bool WillHandleBrowserAboutURL(GURL* url,
   if (host == chrome::kChromeUISyncHost) {
     // Replace sync with sync-internals (for legacy reasons).
     host = chrome::kChromeUISyncInternalsHost;
-// Redirect chrome://extensions, chrome://extensions-frame, and
-// chrome://settings/extensions all to chrome://extensions and forward path.
+// Redirect chrome://extensions and chrome://settings/extensions all to
+// chrome://extensions and forward path.
 #if BUILDFLAG(ENABLE_EXTENSIONS)
   } else if (host == chrome::kChromeUIExtensionsHost ||
-             host == chrome::kChromeUIExtensionsFrameHost ||
              (host == chrome::kChromeUISettingsHost &&
               url->path() ==
                   std::string("/") + chrome::kDeprecatedExtensionsSubPage)) {

chrome/browser/extensions/options_page_apitest.cc

@@ -51,7 +51,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, DISABLED_OptionsPage) {
   content::RenderFrameHost* frame = content::FrameMatchingPredicate(
       tab_strip->GetActiveWebContents(),
       base::Bind(&content::FrameHasSourceUrl,
-                 GURL(chrome::kChromeUIExtensionsFrameURL)));
+                 GURL(chrome::kChromeUIExtensionsURL)));
   EXPECT_TRUE(content::ExecuteScript(
       frame,
       kScriptClickOptionButton));

chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

@@ -618,10 +618,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
     return &NewWebUI<ManagementUI>;
 #endif
 
-#if BUILDFLAG(ENABLE_EXTENSIONS)
-  if (url.host_piece() == chrome::kChromeUIExtensionsFrameHost)
-    return &NewWebUI<extensions::ExtensionsUI>;
-#endif
 #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
   if (url.host_piece() == chrome::kChromeUIPrintHost &&
       !profile->GetPrefs()->GetBoolean(prefs::kPrintPreviewDisabled)) {
@@ -893,8 +889,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory::GetFaviconResourceBytes(
     return ManagementUI::GetFaviconResourceBytes(scale_factor);
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
-  if (page_url.host_piece() == chrome::kChromeUIExtensionsHost ||
-      page_url.host_piece() == chrome::kChromeUIExtensionsFrameHost) {
+  if (page_url.host_piece() == chrome::kChromeUIExtensionsHost) {
     return extensions::ExtensionsUI::GetFaviconResourceBytes(scale_factor);
   }
 #endif  // BUILDFLAG(ENABLE_EXTENSIONS)

chrome/common/webui_url_constants.cc

@@ -61,8 +61,6 @@ const char kChromeUIDownloadsURL[] = "chrome://downloads/";
 const char kChromeUIDriveInternalsHost[] = "drive-internals";
 const char kChromeUIExtensionIconHost[] = "extension-icon";
 const char kChromeUIExtensionIconURL[] = "chrome://extension-icon/";
-const char kChromeUIExtensionsFrameHost[] = "extensions-frame";
-const char kChromeUIExtensionsFrameURL[] = "chrome://extensions-frame/";
 const char kChromeUIExtensionsHost[] = "extensions";
 const char kChromeUIExtensionsInternalsHost[] = "extensions-internals";
 const char kChromeUIExtensionsURL[] = "chrome://extensions/";

chrome/common/webui_url_constants.h

@@ -66,8 +66,6 @@ extern const char kChromeUIDownloadsURL[];
 extern const char kChromeUIDriveInternalsHost[];
 extern const char kChromeUIExtensionIconHost[];
 extern const char kChromeUIExtensionIconURL[];
-extern const char kChromeUIExtensionsFrameHost[];
-extern const char kChromeUIExtensionsFrameURL[];
 extern const char kChromeUIExtensionsHost[];
 extern const char kChromeUIExtensionsInternalsHost[];
 extern const char kChromeUIExtensionsURL[];