summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-30 09:29:12 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-30 09:29:12 +0000
commit1c8c042ae28c9bb81a03d0920120c8a31ef99714 (patch)
tree78f01bcff379403d0deff838fbf07c4444ec66c0
parentc72602b306cf01af31903246ac272849874d8ce9 (diff)
downloadchromium_src-1c8c042ae28c9bb81a03d0920120c8a31ef99714.zip
chromium_src-1c8c042ae28c9bb81a03d0920120c8a31ef99714.tar.gz
chromium_src-1c8c042ae28c9bb81a03d0920120c8a31ef99714.tar.bz2
Remove FLAKY mark from CollectedCookiesTest.
BUG=49539 TEST=CollectedCookiesTest.* Review URL: http://codereview.chromium.org/3584001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61044 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/collected_cookies_uitest.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/collected_cookies_uitest.cc b/chrome/browser/collected_cookies_uitest.cc
index 92b97b0..169f072 100644
--- a/chrome/browser/collected_cookies_uitest.cc
+++ b/chrome/browser/collected_cookies_uitest.cc
@@ -21,8 +21,7 @@ const FilePath::CharType kDocRoot[] = FILE_PATH_LITERAL("chrome/test/data");
typedef UITest CollectedCookiesTest;
-// Test is flaky. http://crbug.com/49539
-TEST_F(CollectedCookiesTest, FLAKY_DoubleDisplay) {
+TEST_F(CollectedCookiesTest, DoubleDisplay) {
net::TestServer test_server(net::TestServer::TYPE_HTTP, FilePath(kDocRoot));
ASSERT_TRUE(test_server.Start());
@@ -44,8 +43,7 @@ TEST_F(CollectedCookiesTest, FLAKY_DoubleDisplay) {
ASSERT_TRUE(tab->ShowCollectedCookiesDialog());
}
-// Test is flaky. http://crbug.com/49539
-TEST_F(CollectedCookiesTest, FLAKY_NavigateAway) {
+TEST_F(CollectedCookiesTest, NavigateAway) {
net::TestServer test_server(net::TestServer::TYPE_HTTP, FilePath(kDocRoot));
ASSERT_TRUE(test_server.Start());