summaryrefslogtreecommitdiffstats
path: root/chrome/browser/history
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-27 22:43:38 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-27 22:43:38 +0000
commit0572d4f6ead89fd19176d0c8346ef1a281458073 (patch)
tree8c3b56ae86ce76fd0879c81222f677edaa8265d4 /chrome/browser/history
parente5390a4d7d04cf148ace753239662a1bb32e5e4a (diff)
downloadchromium_src-0572d4f6ead89fd19176d0c8346ef1a281458073.zip
chromium_src-0572d4f6ead89fd19176d0c8346ef1a281458073.tar.gz
chromium_src-0572d4f6ead89fd19176d0c8346ef1a281458073.tar.bz2
Retry r48417.
Disable UnloadTest.BrowserCloseTabWhenOtherTabHasListener on windows because it is failing. BUG=45281 TEST=tree is green Review URL: http://codereview.chromium.org/2279006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48442 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/history')
-rw-r--r--chrome/browser/history/redirect_uitest.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/history/redirect_uitest.cc b/chrome/browser/history/redirect_uitest.cc
index a94000e..b2d4fb8 100644
--- a/chrome/browser/history/redirect_uitest.cc
+++ b/chrome/browser/history/redirect_uitest.cc
@@ -138,9 +138,7 @@ TEST_F(RedirectTest, DISABLED_ClientCancelled) {
}
// Tests a client->server->server redirect
-// TODO(creis): This is disabled temporarily while I figure out why it is
-// failing.
-TEST_F(RedirectTest, DISABLED_ClientServerServer) {
+TEST_F(RedirectTest, ClientServerServer) {
scoped_refptr<HTTPTestServer> server =
HTTPTestServer::CreateServer(kDocRoot, NULL);
ASSERT_TRUE(NULL != server.get());
@@ -243,6 +241,7 @@ TEST_F(RedirectTest, ClientFragments) {
// alternatively load the second page from disk, but we would need to start
// the browser for this testcase with --process-per-tab, and I don't think
// we can do this at test-case-level granularity at the moment.
+// http://crbug.com/45056
TEST_F(RedirectTest,
DISABLED_ClientCancelledByNewNavigationAfterProvisionalLoad) {
// We want to initiate a second navigation after the provisional load for