summaryrefslogtreecommitdiffstats
path: root/content/browser
diff options
context:
space:
mode:
authorabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-16 18:50:44 +0000
committerabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-16 18:50:44 +0000
commit3744f914f8d4ec44ea474ded7f0f9e6fe8e6f5fa (patch)
treee7c646b274b57fd0bd059a6eb8c16dce17fb166c /content/browser
parent7d41311a9c4e070a6227f2f791fbcdc8df47bb72 (diff)
downloadchromium_src-3744f914f8d4ec44ea474ded7f0f9e6fe8e6f5fa.zip
chromium_src-3744f914f8d4ec44ea474ded7f0f9e6fe8e6f5fa.tar.gz
chromium_src-3744f914f8d4ec44ea474ded7f0f9e6fe8e6f5fa.tar.bz2
Disable some tests that will fail after the WebKit roll. These tests probably
just need to disable the popup blocker to work properly. Review URL: http://codereview.chromium.org/7187013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89373 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser')
-rw-r--r--content/browser/renderer_host/render_view_host_manager_browsertest.cc6
-rw-r--r--content/browser/renderer_host/resource_dispatcher_host_browsertest.cc8
2 files changed, 10 insertions, 4 deletions
diff --git a/content/browser/renderer_host/render_view_host_manager_browsertest.cc b/content/browser/renderer_host/render_view_host_manager_browsertest.cc
index 8a9ebce..6450f90 100644
--- a/content/browser/renderer_host/render_view_host_manager_browsertest.cc
+++ b/content/browser/renderer_host/render_view_host_manager_browsertest.cc
@@ -38,8 +38,9 @@ class RenderViewHostManagerTest : public InProcessBrowserTest {
// Test for crbug.com/24447. Following a cross-site link with rel=noreferrer
// and target=_blank should create a new SiteInstance.
+// Disabled for http://code.google.com/p/chromium/issues/detail?id=86346
IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
- SwapProcessWithRelNoreferrerAndTargetBlank) {
+ DISABLED_SwapProcessWithRelNoreferrerAndTargetBlank) {
// Start two servers with different sites.
ASSERT_TRUE(test_server()->Start());
net::TestServer https_server(
@@ -92,8 +93,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
// Test for crbug.com/24447. Following a cross-site link with just
// target=_blank should not create a new SiteInstance.
+// Disabled for http://code.google.com/p/chromium/issues/detail?id=86346
IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
- DontSwapProcessWithOnlyTargetBlank) {
+ DISABLED_DontSwapProcessWithOnlyTargetBlank) {
// Start two servers with different sites.
ASSERT_TRUE(test_server()->Start());
net::TestServer https_server(
diff --git a/content/browser/renderer_host/resource_dispatcher_host_browsertest.cc b/content/browser/renderer_host/resource_dispatcher_host_browsertest.cc
index 846ca3b..823296e 100644
--- a/content/browser/renderer_host/resource_dispatcher_host_browsertest.cc
+++ b/content/browser/renderer_host/resource_dispatcher_host_browsertest.cc
@@ -52,7 +52,9 @@ bool ResourceDispatcherHostBrowserTest::GetPopupTitle(const GURL& url,
// Test title for content created by javascript window.open().
// See http://crbug.com/5988
-IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest, DynamicTitle1) {
+// Disabled for http://code.google.com/p/chromium/issues/detail?id=86346
+IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest,
+ DISABLED_DynamicTitle1) {
ASSERT_TRUE(test_server()->Start());
GURL url(test_server()->GetURL("files/dynamic1.html"));
@@ -64,7 +66,9 @@ IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest, DynamicTitle1) {
// Test title for content created by javascript window.open().
// See http://crbug.com/5988
-IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest, DynamicTitle2) {
+// Disabled for http://code.google.com/p/chromium/issues/detail?id=86346
+IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest,
+ DISABLED_DynamicTitle2) {
ASSERT_TRUE(test_server()->Start());
GURL url(test_server()->GetURL("files/dynamic2.html"));