diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-08 15:46:24 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-08 15:46:24 +0000 |
| commit | 878a4c5e7b9245abacc5ab849f7da57915dc5c9f (patch) | |
| tree | a5f53333f0b5c607dce4e27f0871c5ac211ada46 /chrome/browser | |
| parent | b68a0e500b8067b65af4cf13e417b63cc2f794b8 (diff) | |
| download | chromium_src-878a4c5e7b9245abacc5ab849f7da57915dc5c9f.zip chromium_src-878a4c5e7b9245abacc5ab849f7da57915dc5c9f.tar.gz chromium_src-878a4c5e7b9245abacc5ab849f7da57915dc5c9f.tar.bz2 | |
Revert 113383 - Re-enable collected cookies uitest on windows
BUG=79331
TEST=collected cookies test
Review URL: http://codereview.chromium.org/8836006
TBR=jochen@chromium.org
Review URL: http://codereview.chromium.org/8872017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113604 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/collected_cookies_uitest.cc | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/chrome/browser/collected_cookies_uitest.cc b/chrome/browser/collected_cookies_uitest.cc index 4d26ef4..0612a09 100644 --- a/chrome/browser/collected_cookies_uitest.cc +++ b/chrome/browser/collected_cookies_uitest.cc @@ -21,7 +21,13 @@ const FilePath::CharType kDocRoot[] = FILE_PATH_LITERAL("chrome/test/data"); typedef UITest CollectedCookiesTest; -TEST_F(CollectedCookiesTest, DoubleDisplay) { +// 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) { net::TestServer test_server(net::TestServer::TYPE_HTTP, FilePath(kDocRoot)); ASSERT_TRUE(test_server.Start()); @@ -43,7 +49,13 @@ TEST_F(CollectedCookiesTest, DoubleDisplay) { ASSERT_TRUE(tab->ShowCollectedCookiesDialog()); } -TEST_F(CollectedCookiesTest, NavigateAway) { +// 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) { net::TestServer test_server(net::TestServer::TYPE_HTTP, FilePath(kDocRoot)); ASSERT_TRUE(test_server.Start()); |