Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(389)

Unified Diff: chrome/browser/collected_cookies_uitest.cc

Issue 8836006: Re-enable collected cookies uitest on windows (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 0612a09a5ab7bb5fa4d321d6da85a505fbc0f635..4d26ef4b7d789b68a2f35c2507f28ceb151c2a3f 100644
--- a/chrome/browser/collected_cookies_uitest.cc
+++ b/chrome/browser/collected_cookies_uitest.cc
@@ -21,13 +21,7 @@ const FilePath::CharType kDocRoot[] = FILE_PATH_LITERAL("chrome/test/data");
typedef UITest CollectedCookiesTest;
-// Crashing on Windows, see http://crbug.com/79331
-#if defined(OS_WIN)
-#define MAYBE_DoubleDisplay DISABLED_DoubleDisplay
-#else
-#define MAYBE_DoubleDisplay DoubleDisplay
-#endif
-TEST_F(CollectedCookiesTest, MAYBE_DoubleDisplay) {
+TEST_F(CollectedCookiesTest, DoubleDisplay) {
net::TestServer test_server(net::TestServer::TYPE_HTTP, FilePath(kDocRoot));
ASSERT_TRUE(test_server.Start());
@@ -49,13 +43,7 @@ TEST_F(CollectedCookiesTest, MAYBE_DoubleDisplay) {
ASSERT_TRUE(tab->ShowCollectedCookiesDialog());
}
-// Crashing on Windows, see http://crbug.com/79331
-#if defined(OS_WIN)
-#define MAYBE_NavigateAway DISABLED_NavigateAway
-#else
-#define MAYBE_NavigateAway NavigateAway
-#endif
-TEST_F(CollectedCookiesTest, MAYBE_NavigateAway) {
+TEST_F(CollectedCookiesTest, NavigateAway) {
net::TestServer test_server(net::TestServer::TYPE_HTTP, FilePath(kDocRoot));
ASSERT_TRUE(test_server.Start());
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698