summaryrefslogtreecommitdiffstats
path: root/chrome/browser/tab_contents/web_contents_unittest.cc
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-12 01:04:50 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-12 01:04:50 +0000
commitc6cbb5d383660af7569db4e6fd0c6d891e586d40 (patch)
tree5f164d7bd51b512d4a05e478a980054523aaef42 /chrome/browser/tab_contents/web_contents_unittest.cc
parent96487c0166a81dadc34731f5e86abcfde61fa9ef (diff)
downloadchromium_src-c6cbb5d383660af7569db4e6fd0c6d891e586d40.zip
chromium_src-c6cbb5d383660af7569db4e6fd0c6d891e586d40.tar.gz
chromium_src-c6cbb5d383660af7569db4e6fd0c6d891e586d40.tar.bz2
Oops, disable the correct test this time :)
http://crbug.com/13937 Review URL: http://codereview.chromium.org/126026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18239 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents/web_contents_unittest.cc')
-rw-r--r--chrome/browser/tab_contents/web_contents_unittest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/tab_contents/web_contents_unittest.cc b/chrome/browser/tab_contents/web_contents_unittest.cc
index b6225fb..53da8fb 100644
--- a/chrome/browser/tab_contents/web_contents_unittest.cc
+++ b/chrome/browser/tab_contents/web_contents_unittest.cc
@@ -837,8 +837,7 @@ TEST_F(TabContentsTest,
// Test navigating to a page that shows an interstitial without creating a new
// navigation entry (this happens when the interstitial is triggered by a
// sub-resource in the page), then proceeding.
-// http://crbug.com/13937: Disabling because it's leaky on win/mac.
-TEST_F(TabContentsTest, DISABLED_ShowInterstitialNoNewNavigationProceed) {
+TEST_F(TabContentsTest, ShowInterstitialNoNewNavigationProceed) {
// Navigate to a page so we have a navigation entry in the controller.
GURL url1("http://www.google.com");
rvh()->SendNavigate(1, url1);
@@ -937,7 +936,8 @@ TEST_F(TabContentsTest, ShowInterstitialThenGoBack) {
// Test navigating to a page that shows an interstitial, has a renderer crash,
// and then goes back.
-TEST_F(TabContentsTest, ShowInterstitialCrashRendererThenGoBack) {
+// http://crbug.com/13937: Disabling because it's leaky on win/mac.
+TEST_F(TabContentsTest, DISABLED_ShowInterstitialCrashRendererThenGoBack) {
// Navigate to a page so we have a navigation entry in the controller.
GURL url1("http://www.google.com");
rvh()->SendNavigate(1, url1);