Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(281)

Unified Diff: chrome/browser/browser_about_handler_unittest.cc

Issue 7064052: Revert 88142 to fix sync_integration_tests offline. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/browser_about_handler.cc ('k') | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_about_handler_unittest.cc
===================================================================
--- chrome/browser/browser_about_handler_unittest.cc (revision 88158)
+++ chrome/browser/browser_about_handler_unittest.cc (working copy)
@@ -16,8 +16,6 @@
typedef TestingBrowserProcessTest BrowserAboutHandlerTest;
TEST_F(BrowserAboutHandlerTest, WillHandleBrowserAboutURL) {
- std::string chrome_prefix(chrome::kChromeUIScheme);
- chrome_prefix.append(chrome::kStandardSchemeSeparator);
struct AboutURLTestData {
GURL test_url;
GURL result_url;
@@ -37,71 +35,71 @@
false
},
{
- GURL(chrome_prefix + chrome::kChromeUICrashHost),
- GURL(chrome_prefix + chrome::kChromeUICrashHost),
- true,
- false
- },
- {
- GURL(chrome_prefix + chrome::kChromeUIKillHost),
- GURL(chrome_prefix + chrome::kChromeUIKillHost),
- true,
- false
- },
- {
- GURL(chrome_prefix + chrome::kChromeUIHangHost),
- GURL(chrome_prefix + chrome::kChromeUIHangHost),
- true,
- false
- },
- {
- GURL(chrome_prefix + chrome::kChromeUIShorthangHost),
- GURL(chrome_prefix + chrome::kChromeUIShorthangHost),
- true,
- false
- },
- {
- GURL(chrome_prefix + chrome::kChromeUIMemoryHost),
- GURL(chrome_prefix + chrome::kChromeUIMemoryHost),
+ GURL(std::string(chrome::kAboutCacheURL) + "/mercury"),
+ GURL(std::string(chrome::kNetworkViewCacheURL) + "mercury"),
false,
true
},
{
- GURL(chrome_prefix + chrome::kChromeUIDefaultHost),
- GURL(chrome_prefix + chrome::kChromeUIVersionHost),
+ GURL(std::string(chrome::kAboutNetInternalsURL) + "/venus"),
+ GURL(std::string(chrome::kNetworkViewInternalsURL) + "venus"),
false,
true
},
{
- GURL(chrome_prefix + chrome::kChromeUIAboutHost),
- GURL(chrome_prefix + chrome::kChromeUIChromeURLsHost),
+ GURL(std::string(chrome::kAboutGpuURL) + "/jupiter"),
+ GURL(std::string(chrome::kGpuInternalsURL) + "jupiter"),
false,
true
},
{
- GURL(chrome_prefix + chrome::kChromeUICacheHost),
- GURL(chrome_prefix + chrome::kChromeUINetworkViewCacheHost),
+ GURL(std::string(chrome::kAboutAppCacheInternalsURL) + "/earth"),
+ GURL(std::string(chrome::kAppCacheViewInternalsURL) + "earth"),
false,
true
},
{
- GURL(chrome_prefix + chrome::kChromeUIGpuHost),
- GURL(chrome_prefix + chrome::kChromeUIGpuInternalsHost),
+ GURL(chrome::kAboutPluginsURL),
+ GURL(chrome::kChromeUIPluginsURL),
false,
true
},
{
- GURL(chrome_prefix + chrome::kChromeUISyncHost),
- GURL(chrome_prefix + chrome::kChromeUISyncInternalsHost),
+ GURL(chrome::kAboutCrashURL),
+ GURL(chrome::kAboutCrashURL),
+ true,
+ false
+ },
+ {
+ GURL(chrome::kAboutKillURL),
+ GURL(chrome::kAboutKillURL),
+ true,
+ false
+ },
+ {
+ GURL(chrome::kAboutHangURL),
+ GURL(chrome::kAboutHangURL),
+ true,
+ false
+ },
+ {
+ GURL(chrome::kAboutShorthangURL),
+ GURL(chrome::kAboutShorthangURL),
+ true,
+ false
+ },
+ {
+ GURL("about:memory"),
+ GURL("chrome://about/memory-redirect"),
false,
true
},
{
- GURL(chrome_prefix + "host/path?query#ref"),
- GURL(chrome_prefix + "host/path?query#ref"),
+ GURL("about:mars"),
+ GURL("chrome://about/mars"),
false,
true
- }
+ },
};
MessageLoopForUI message_loop;
BrowserThread ui_thread(BrowserThread::UI, &message_loop);
« no previous file with comments | « chrome/browser/browser_about_handler.cc ('k') | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698