| Index: chrome/browser/collected_cookies_uitest.cc
|
| ===================================================================
|
| --- chrome/browser/collected_cookies_uitest.cc (revision 113603)
|
| +++ chrome/browser/collected_cookies_uitest.cc (working copy)
|
| @@ -21,7 +21,13 @@
|
|
|
| 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 @@
|
| 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());
|
|
|
|
|