diff options
author | jstritar@chromium.org <jstritar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-29 22:26:38 +0000 |
---|---|---|
committer | jstritar@chromium.org <jstritar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-29 22:26:38 +0000 |
commit | 2dbce20729b1db0c318590653fc132ea93551adf (patch) | |
tree | 454c73f1986615f6edea9f9c1c9c89aeac1af3fb /content/browser | |
parent | d8d797faa22a7b76d17a52b78a376752bd2596a8 (diff) | |
download | chromium_src-2dbce20729b1db0c318590653fc132ea93551adf.zip chromium_src-2dbce20729b1db0c318590653fc132ea93551adf.tar.gz chromium_src-2dbce20729b1db0c318590653fc132ea93551adf.tar.bz2 |
Add log statements to ChromeURLAfterDownload to see where exactly its timing out. I'll revert this after it builds.
BUG=77762
TEST=RenderViewHostManagerTest.ChromeURLAfterDownload
Review URL: http://codereview.chromium.org/6745034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79753 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser')
-rw-r--r-- | content/browser/renderer_host/render_view_host_manager_browsertest.cc | 10 |
1 files changed, 7 insertions, 3 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 d039454..0c95a6e 100644 --- a/content/browser/renderer_host/render_view_host_manager_browsertest.cc +++ b/content/browser/renderer_host/render_view_host_manager_browsertest.cc @@ -195,10 +195,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, // Test for crbug.com/14505. This tests that chrome:// urls are still functional // after download of a file while viewing another chrome://. -// Hangs flakily in Win, http://crbug.com/45040, and started hanging on Linux, -// Mac and ChromeOS, http://crbug.com/77762. IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, - DISABLED_ChromeURLAfterDownload) { + ChromeURLAfterDownload) { GURL downloads_url("chrome://downloads"); GURL extensions_url("chrome://extensions"); FilePath zip_download; @@ -206,20 +204,26 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, zip_download = zip_download.AppendASCII("zip").AppendASCII("test.zip"); GURL zip_url = net::FilePathToFileURL(zip_download); + LOG(INFO) << "Navigating to chrome URL."; ui_test_utils::NavigateToURL(browser(), downloads_url); + LOG(INFO) << "Navigating to zip URL."; ui_test_utils::NavigateToURL(browser(), zip_url); + LOG(INFO) << "Waiting for the zip download to complete."; ui_test_utils::WaitForDownloadCount( browser()->profile()->GetDownloadManager(), 1); + LOG(INFO) << "Download complete. Navigating to the extensions URL."; ui_test_utils::NavigateToURL(browser(), extensions_url); TabContents *contents = browser()->GetSelectedTabContents(); ASSERT_TRUE(contents); bool webui_responded = false; + LOG(INFO) << "Executing javascript."; EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( contents->render_view_host(), L"", L"window.domAutomationController.send(window.webui_responded_);", &webui_responded)); + LOG(INFO) << "Javascript executed."; EXPECT_TRUE(webui_responded); } |