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

Unified Diff: chrome/browser/browser_about_handler_unittest.cc

Issue 9349010: Move handling of debug urls like chrome://crash, chrome://gpuclean to content. These are for test... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 8 years, 10 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
Index: chrome/browser/browser_about_handler_unittest.cc
===================================================================
--- chrome/browser/browser_about_handler_unittest.cc (revision 120733)
+++ chrome/browser/browser_about_handler_unittest.cc (working copy)
@@ -6,7 +6,6 @@
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
#include "chrome/browser/browser_about_handler.h"
-#include "chrome/common/about_handler.h"
#include "chrome/common/url_constants.h"
#include "chrome/test/base/testing_profile.h"
#include "content/test/test_browser_thread.h"
@@ -23,86 +22,42 @@
struct AboutURLTestData {
GURL test_url;
GURL result_url;
- bool about_handled;
- bool browser_handled;
} test_data[] = {
{
GURL("http://google.com"),
- GURL("http://google.com"),
- false,
- false
+ GURL("http://google.com")
},
{
GURL(chrome::kAboutBlankURL),
- GURL(chrome::kAboutBlankURL),
- false,
- false
+ GURL(chrome::kAboutBlankURL)
},
{
- 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),
- false,
- false
+ GURL(chrome_prefix + chrome::kChromeUIMemoryHost)
},
{
GURL(chrome_prefix + chrome::kChromeUIDefaultHost),
- GURL(chrome_prefix + chrome::kChromeUIVersionHost),
- false,
- false
+ GURL(chrome_prefix + chrome::kChromeUIVersionHost)
},
{
GURL(chrome_prefix + chrome::kChromeUIAboutHost),
- GURL(chrome_prefix + chrome::kChromeUIChromeURLsHost),
- false,
- false
+ GURL(chrome_prefix + chrome::kChromeUIChromeURLsHost)
},
{
GURL(chrome_prefix + chrome::kChromeUICacheHost),
- GURL(chrome_prefix + chrome::kChromeUINetworkViewCacheHost),
- false,
- false
+ GURL(chrome_prefix + chrome::kChromeUINetworkViewCacheHost)
},
{
GURL(chrome_prefix + chrome::kChromeUIGpuHost),
- GURL(chrome_prefix + chrome::kChromeUIGpuInternalsHost),
- false,
- false
+ GURL(chrome_prefix + chrome::kChromeUIGpuInternalsHost)
},
{
GURL(chrome_prefix + chrome::kChromeUISyncHost),
- GURL(chrome_prefix + chrome::kChromeUISyncInternalsHost),
- false,
- false
+ GURL(chrome_prefix + chrome::kChromeUISyncInternalsHost)
},
{
GURL(chrome_prefix + "host/path?query#ref"),
GURL(chrome_prefix + "host/path?query#ref"),
- false,
- false
}
};
MessageLoopForUI message_loop;
@@ -111,14 +66,7 @@
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_data); ++i) {
GURL url(test_data[i].test_url);
- EXPECT_EQ(test_data[i].about_handled,
- chrome_about_handler::WillHandle(url));
- EXPECT_EQ(test_data[i].browser_handled,
- WillHandleBrowserAboutURL(&url, &profile));
+ WillHandleBrowserAboutURL(&url, &profile);
EXPECT_EQ(test_data[i].result_url, url);
}
-
- // Crash the browser process for chrome://inducebrowsercrashforrealz.
- GURL url(chrome_prefix + chrome::kChromeUIBrowserCrashHost);
- EXPECT_DEATH(HandleNonNavigationAboutURL(url), "");
}

Powered by Google App Engine
This is Rietveld 408576698