Commit 05cb5f19 authored by dpapad's avatar dpapad Committed by Commit Bot

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

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

reached" page.

Bug: None
Test: Visit chrome://history-frame, should see "This site can’t be
Change-Id: I6642b4be8b1b28ba9471b1dc64aa24a444aaeed2
Reviewed-on: https://chromium-review.googlesource.com/c/1496494
Commit-Queue: Demetrios Papadopoulos <dpapad@chromium.org>
Reviewed-by: default avatarLei Zhang <thestig@chromium.org>
Reviewed-by: default avatarMarc Treib <treib@chromium.org>
Reviewed-by: default avatarChris Hamilton <chrisha@chromium.org>
Cr-Commit-Position: refs/heads/master@{#636935}
parent 7996d081
...@@ -31,8 +31,7 @@ bool HandleAndroidNativePageURL(GURL* url, ...@@ -31,8 +31,7 @@ bool HandleAndroidNativePageURL(GURL* url,
// TODO(twellington): stop redirecting chrome://history to // TODO(twellington): stop redirecting chrome://history to
// chrome-native://history when M57 is a distant memory. // chrome-native://history when M57 is a distant memory.
// See http://crbug.com/654071. // See http://crbug.com/654071.
if (url->host() == kChromeUIHistoryHost || if (url->host() == kChromeUIHistoryHost) {
url->host() == kDeprecatedChromeUIHistoryFrameHost) {
*url = GURL(kChromeUINativeHistoryURL); *url = GURL(kChromeUINativeHistoryURL);
return true; return true;
} }
......
...@@ -60,10 +60,6 @@ bool WillHandleBrowserAboutURL(GURL* url, ...@@ -60,10 +60,6 @@ bool WillHandleBrowserAboutURL(GURL* url,
if (host == chrome::kChromeUIAboutHost) if (host == chrome::kChromeUIAboutHost)
host = chrome::kChromeUIChromeURLsHost; host = chrome::kChromeUIChromeURLsHost;
// Legacy redirect from chrome://history-frame to chrome://history.
if (host == chrome::kDeprecatedChromeUIHistoryFrameHost)
host = chrome::kChromeUIHistoryHost;
if (host == chrome::kChromeUISyncHost) { if (host == chrome::kChromeUISyncHost) {
// Replace sync with sync-internals (for legacy reasons). // Replace sync with sync-internals (for legacy reasons).
host = chrome::kChromeUISyncInternalsHost; host = chrome::kChromeUISyncInternalsHost;
......
...@@ -85,13 +85,9 @@ TEST_F(BrowserAboutHandlerTest, WillHandleBrowserAboutURLForMDSettings) { ...@@ -85,13 +85,9 @@ TEST_F(BrowserAboutHandlerTest, WillHandleBrowserAboutURLForMDSettings) {
TEST_F(BrowserAboutHandlerTest, WillHandleBrowserAboutURLForHistory) { TEST_F(BrowserAboutHandlerTest, WillHandleBrowserAboutURLForHistory) {
TestWillHandleBrowserAboutURL(std::vector<AboutURLTestCase>({ TestWillHandleBrowserAboutURL(std::vector<AboutURLTestCase>({
{GURL("about:history"), GURL("chrome://history/")}, {GURL("about:history"), GURL("chrome://history/")},
{GURL("about:history-frame"), GURL("chrome://history/")},
{GURL("chrome://history"), GURL("chrome://history/")}, {GURL("chrome://history"), GURL("chrome://history/")},
{GURL("chrome://history-frame"), GURL("chrome://history/")},
{GURL("chrome://history/"), GURL("chrome://history/")}, {GURL("chrome://history/"), GURL("chrome://history/")},
{GURL("chrome://history-frame/"), GURL("chrome://history/")},
{GURL("chrome://history/?q=foo"), GURL("chrome://history/?q=foo")}, {GURL("chrome://history/?q=foo"), GURL("chrome://history/?q=foo")},
{GURL("chrome://history-frame/?q=foo"), GURL("chrome://history/?q=foo")},
})); }));
} }
......
...@@ -77,9 +77,7 @@ void ChromeSerializedNavigationDriver::Sanitize( ...@@ -77,9 +77,7 @@ void ChromeSerializedNavigationDriver::Sanitize(
} }
if (navigation->virtual_url().SchemeIs(content::kChromeUIScheme) && if (navigation->virtual_url().SchemeIs(content::kChromeUIScheme) &&
(navigation->virtual_url().host_piece() == chrome::kChromeUIHistoryHost || navigation->virtual_url().host_piece() == chrome::kChromeUIHistoryHost) {
navigation->virtual_url().host_piece() ==
chrome::kDeprecatedChromeUIHistoryFrameHost)) {
// Rewrite the old history Web UI to the new android native history. // Rewrite the old history Web UI to the new android native history.
navigation->set_virtual_url(GURL(chrome::kChromeUINativeHistoryURL)); navigation->set_virtual_url(GURL(chrome::kChromeUINativeHistoryURL));
navigation->set_original_request_url(navigation->virtual_url()); navigation->set_original_request_url(navigation->virtual_url());
......
...@@ -162,8 +162,6 @@ const char kChromeUIWelcomeHost[] = "welcome"; ...@@ -162,8 +162,6 @@ const char kChromeUIWelcomeHost[] = "welcome";
const char kChromeUIWelcomeURL[] = "chrome://welcome/"; const char kChromeUIWelcomeURL[] = "chrome://welcome/";
const char kChromeUIWelcomeWin10Host[] = "welcome-win10"; const char kChromeUIWelcomeWin10Host[] = "welcome-win10";
const char kChromeUIWelcomeWin10URL[] = "chrome://welcome-win10/"; const char kChromeUIWelcomeWin10URL[] = "chrome://welcome-win10/";
const char kDeprecatedChromeUIHistoryFrameHost[] = "history-frame";
const char kDeprecatedChromeUIHistoryFrameURL[] = "chrome://history-frame/";
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
const char kChromeUIEocInternalsHost[] = "eoc-internals"; const char kChromeUIEocInternalsHost[] = "eoc-internals";
......
...@@ -163,8 +163,6 @@ extern const char kChromeUIWelcomeHost[]; ...@@ -163,8 +163,6 @@ extern const char kChromeUIWelcomeHost[];
extern const char kChromeUIWelcomeURL[]; extern const char kChromeUIWelcomeURL[];
extern const char kChromeUIWelcomeWin10Host[]; extern const char kChromeUIWelcomeWin10Host[];
extern const char kChromeUIWelcomeWin10URL[]; extern const char kChromeUIWelcomeWin10URL[];
extern const char kDeprecatedChromeUIHistoryFrameHost[];
extern const char kDeprecatedChromeUIHistoryFrameURL[];
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
extern const char kChromeUIExploreSitesInternalsHost[]; extern const char kChromeUIExploreSitesInternalsHost[];
......
...@@ -83,17 +83,6 @@ function filtersForPage(pageName, isRTL) { ...@@ -83,17 +83,6 @@ function filtersForPage(pageName, isRTL) {
bidichecker.FilterFactory.atText('חדשות תוכן ועדכונים - ידיעות אחרונות') bidichecker.FilterFactory.atText('חדשות תוכן ועדכונים - ידיעות אחרונות')
] ]
}, },
'chrome://history-frame': {
'LTR': [
// BUG: http://crbug.com/119595
bidichecker.FilterFactory.atText('בדיקה')
],
'RTL': [
// BUG: http://crbug.com/119595
bidichecker.FilterFactory.atText('Google'),
bidichecker.FilterFactory.atText('www.google.com')
],
},
}; };
var globalFilters = { var globalFilters = {
'RTL': [ 'RTL': [
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment