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

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());