chrome/browser/collected_cookies_uitest.cc - Issue 6670033: Use copies of canned browsing data helpers to populate the cookies tree model.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/collected_cookies_uitest.cc

Issue 6670033: Use copies of canned browsing data helpers to populate the cookies tree model. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/browsing_data_local_storage_helper.cc ('k') | chrome/browser/tab_contents/tab_specific_content_settings.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/collected_cookies_uitest.cc

diff --git a/chrome/browser/collected_cookies_uitest.cc b/chrome/browser/collected_cookies_uitest.cc

index ce60e046b9370be5f3b2966d17a4b60cbc0d6551..5b2f597038effadc0bfa65a682465ed67c9dc28e 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());