summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorrafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-02 15:52:17 +0000
committerrafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-02 15:52:17 +0000
commit574d5c165f055e21a93ac97e8f5f66a2aea5b65a (patch)
tree56c61d036292d676319bb8eb7da69697b46a410e /chrome
parent2141664b2160cdff498f212a87e296afebe5e734 (diff)
downloadchromium_src-574d5c165f055e21a93ac97e8f5f66a2aea5b65a.zip
chromium_src-574d5c165f055e21a93ac97e8f5f66a2aea5b65a.tar.gz
chromium_src-574d5c165f055e21a93ac97e8f5f66a2aea5b65a.tar.bz2
TBR:
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19817 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rwxr-xr-xchrome/browser/renderer_host/render_view_host_manager_browsertest.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/renderer_host/render_view_host_manager_browsertest.cc b/chrome/browser/renderer_host/render_view_host_manager_browsertest.cc
index b3cb08a..86bf069 100755
--- a/chrome/browser/renderer_host/render_view_host_manager_browsertest.cc
+++ b/chrome/browser/renderer_host/render_view_host_manager_browsertest.cc
@@ -30,7 +30,8 @@ class RenderViewHostManagerTest : public InProcessBrowserTest {
// Test for crbug.com/14505. This tests that chrome:// urls are still functional
// after download of a file while viewing another chrome://.
-IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, ChromeURLAfterDownload) {
+IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
+ DISABLED_ChromeURLAfterDownload) {
GURL downloads_url("chrome://downloads");
GURL extensions_url("chrome://extensions");
FilePath zip_download;
@@ -81,7 +82,8 @@ class BrowserClosedObserver : public NotificationObserver {
// Test for crbug.com/12745. This tests that if a download is initiated from
// a chrome:// page that has registered and onunload handler, the browser
// will be able to close.
-IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, BrowserCloseAfterDownload) {
+IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
+ DISABLED_BrowserCloseAfterDownload) {
GURL downloads_url("chrome://downloads");
FilePath zip_download;
ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &zip_download));