summaryrefslogtreecommitdiffstats
path: root/chrome/browser/safe_browsing
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-07 07:39:11 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-07 07:39:11 +0000
commite85f519c9c2fabcb02e4f724d586707bc4de8267 (patch)
treece69dabfa7e1544a292ad2a015c9ddff8d3486c1 /chrome/browser/safe_browsing
parentd3f27313e2a4af3dbea5fa388fd4f199c1a7d0ea (diff)
downloadchromium_src-e85f519c9c2fabcb02e4f724d586707bc4de8267.zip
chromium_src-e85f519c9c2fabcb02e4f724d586707bc4de8267.tar.gz
chromium_src-e85f519c9c2fabcb02e4f724d586707bc4de8267.tar.bz2
Disable crashy SafeBrowsingBlockingPageTest.MalwareIframeProceed
TBR=panayiotis BUG=68834 TEST=browser_tests Review URL: http://codereview.chromium.org/6148002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70723 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/safe_browsing')
-rw-r--r--chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
index 19eae29..0c9f40c 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
@@ -280,7 +280,9 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, MalwareIframeDontProceed) {
browser()->GetSelectedTabContents()->GetURL());
}
-IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, MalwareIframeProceed) {
+// Crashy, http://crbug.com/68834.
+IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest,
+ DISABLED_MalwareIframeProceed) {
GURL url = test_server()->GetURL(kMalwarePage);
GURL iframe_url = test_server()->GetURL(kMalwareIframe);
AddURLResult(iframe_url, SafeBrowsingService::URL_MALWARE);