diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-15 12:27:37 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-15 12:27:37 +0000 |
| commit | 712a9a05370715409d44e66479e863af5f3568e1 (patch) | |
| tree | 853c9f52328b63b4b12c861ea2ef7129747d8dba /chrome/browser/collected_cookies_uitest.cc | |
| parent | 3e3342690f7c69fa6e5802782c33a12eec000129 (diff) | |
| download | chromium_src-712a9a05370715409d44e66479e863af5f3568e1.zip chromium_src-712a9a05370715409d44e66479e863af5f3568e1.tar.gz chromium_src-712a9a05370715409d44e66479e863af5f3568e1.tar.bz2 | |
Use copies of canned browsing data helpers to populate the cookies tree model.
If the fetching of data is cancelled, the helpers might not be ready yet to be reused, triggering an assertion.
BUG=62311
TEST=interactive ui tests:CollectedCookies.*
Review URL: http://codereview.chromium.org/6670033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78198 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/collected_cookies_uitest.cc')
| -rw-r--r-- | chrome/browser/collected_cookies_uitest.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/collected_cookies_uitest.cc b/chrome/browser/collected_cookies_uitest.cc index ce60e04..5b2f597 100644 --- a/chrome/browser/collected_cookies_uitest.cc +++ b/chrome/browser/collected_cookies_uitest.cc @@ -20,8 +20,7 @@ const FilePath::CharType kDocRoot[] = FILE_PATH_LITERAL("chrome/test/data"); typedef UITest CollectedCookiesTest; -// Flaky, http://crbug.com/62311. -TEST_F(CollectedCookiesTest, FLAKY_DoubleDisplay) { +TEST_F(CollectedCookiesTest, DoubleDisplay) { net::TestServer test_server(net::TestServer::TYPE_HTTP, FilePath(kDocRoot)); ASSERT_TRUE(test_server.Start()); @@ -43,8 +42,7 @@ TEST_F(CollectedCookiesTest, FLAKY_DoubleDisplay) { ASSERT_TRUE(tab->ShowCollectedCookiesDialog()); } -// Flaky, http://crbug.com/62311. -TEST_F(CollectedCookiesTest, FLAKY_NavigateAway) { +TEST_F(CollectedCookiesTest, NavigateAway) { net::TestServer test_server(net::TestServer::TYPE_HTTP, FilePath(kDocRoot)); ASSERT_TRUE(test_server.Start()); |