Mark following tests as flaky due to an assertion failure:

- KeyboardAccessTest.TestShiftAltMenuKeyboardAccess
- KeyboardAccessTest.ReserveKeyboardAccelerators
- CollectedCookiesTest.DoubleDisplay
- CollectedCookiesTest.NavigateAway
- TabDraggingTest.Tab1Tab2
- TabDraggingTest.Tab1Tab3
- TabDraggingTest.Tab2OutOfTabStrip
- NotificationsPermissionTest.TestUserGestureInfobar
- NotificationsPermissionTest.TestNoUserGestureInfobar

TBR=hbono, pkasting, jochen, sidchat, johnnyg

BUG=62311
TEST=interactive_ui_tests

Review URL: http://codereview.chromium.org/4676001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65360 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 18 insertions, 10 deletions

diff --git a/chrome/browser/collected_cookies_uitest.cc b/chrome/browser/collected_cookies_uitest.cc
index 169f072..3c2009d 100644
--- a/chrome/browser/collected_cookies_uitest.cc
+++ b/chrome/browser/collected_cookies_uitest.cc
@@ -21,7 +21,8 @@ const FilePath::CharType kDocRoot[] = FILE_PATH_LITERAL("chrome/test/data");
 
 typedef UITest CollectedCookiesTest;
 
-TEST_F(CollectedCookiesTest, DoubleDisplay) {
+// Flaky, http://crbug.com/62311.
+TEST_F(CollectedCookiesTest, FLAKY_DoubleDisplay) {
   net::TestServer test_server(net::TestServer::TYPE_HTTP, FilePath(kDocRoot));
   ASSERT_TRUE(test_server.Start());
 
@@ -43,7 +44,8 @@ TEST_F(CollectedCookiesTest, DoubleDisplay) {
   ASSERT_TRUE(tab->ShowCollectedCookiesDialog());
 }
 
-TEST_F(CollectedCookiesTest, NavigateAway) {
+// Flaky, http://crbug.com/62311.
+TEST_F(CollectedCookiesTest, FLAKY_NavigateAway) {
   net::TestServer test_server(net::TestServer::TYPE_HTTP, FilePath(kDocRoot));
   ASSERT_TRUE(test_server.Start());
 
diff --git a/chrome/browser/notifications/notifications_interactive_uitest.cc b/chrome/browser/notifications/notifications_interactive_uitest.cc
index afd44d7..43d905f 100644
--- a/chrome/browser/notifications/notifications_interactive_uitest.cc
+++ b/chrome/browser/notifications/notifications_interactive_uitest.cc
@@ -17,7 +17,8 @@ class NotificationsPermissionTest : public UITest {
   }
 };
 
-TEST_F(NotificationsPermissionTest, TestUserGestureInfobar) {
+// Flaky, http://crbug.com/62311.
+TEST_F(NotificationsPermissionTest, FLAKY_TestUserGestureInfobar) {
   net::TestServer test_server(net::TestServer::TYPE_HTTP,
                               FilePath(FILE_PATH_LITERAL("chrome/test/data")));
   ASSERT_TRUE(test_server.Start());
@@ -43,7 +44,8 @@ TEST_F(NotificationsPermissionTest, TestUserGestureInfobar) {
   EXPECT_TRUE(tab->WaitForInfoBarCount(1));
 }
 
-TEST_F(NotificationsPermissionTest, TestNoUserGestureInfobar) {
+// Flaky, http://crbug.com/62311.
+TEST_F(NotificationsPermissionTest, FLAKY_TestNoUserGestureInfobar) {
   net::TestServer test_server(net::TestServer::TYPE_HTTP,
                               FilePath(FILE_PATH_LITERAL("chrome/test/data")));
   ASSERT_TRUE(test_server.Start());
diff --git a/chrome/browser/views/tabs/tab_dragging_test.cc b/chrome/browser/views/tabs/tab_dragging_test.cc
index b30989e..2c41f5b 100644
--- a/chrome/browser/views/tabs/tab_dragging_test.cc
+++ b/chrome/browser/views/tabs/tab_dragging_test.cc
@@ -23,7 +23,8 @@
 // tabs out.
 #define MAYBE_Tab2OutOfTabStrip DISABLED_Tab2OutOfTabStrip
 #else
-#define MAYBE_Tab2OutOfTabStrip Tab2OutOfTabStrip
+// Flaky, http://crbug.com/62311.
+#define MAYBE_Tab2OutOfTabStrip FLAKY_Tab2OutOfTabStrip
 #endif
 
 #if defined(OS_LINUX)
@@ -42,8 +43,9 @@
 #define MAYBE_Tab1Tab2 DISABLED_Tab1Tab2
 #define MAYBE_Tab1Tab3 DISABLED_Tab1Tab3
 #else
-#define MAYBE_Tab1Tab2 Tab1Tab2
-#define MAYBE_Tab1Tab3 Tab1Tab3
+// Flaky, http://crbug.com/62311.
+#define MAYBE_Tab1Tab2 FLAKY_Tab1Tab2
+#define MAYBE_Tab1Tab3 FLAKY_Tab1Tab3
 #endif
 
 class TabDraggingTest : public UITest {
diff --git a/chrome/test/interactive_ui/keyboard_access_uitest.cc b/chrome/test/interactive_ui/keyboard_access_uitest.cc
index 0f90465..4bb92a8 100644
--- a/chrome/test/interactive_ui/keyboard_access_uitest.cc
+++ b/chrome/test/interactive_ui/keyboard_access_uitest.cc
@@ -115,16 +115,18 @@ TEST_F(KeyboardAccessTest, DISABLED_TestAltMenuKeyboardAccess) {
   TestMenuKeyboardAccess(true, 0);
 }
 
-TEST_F(KeyboardAccessTest, TestShiftAltMenuKeyboardAccess) {
+// Flaky, http://crbug.com/62311.
+TEST_F(KeyboardAccessTest, FLAKY_TestShiftAltMenuKeyboardAccess) {
   TestMenuKeyboardAccess(true, views::Event::EF_SHIFT_DOWN);
 }
 
+#if defined(OS_CHROMEOS)
 // TODO(isherman): This test times out on ChromeOS.  We should merge it with
 // BrowserKeyEventsTest.ReservedAccelerators, but just disable for now.
-#if defined(OS_CHROMEOS)
 #define MAYBE_ReserveKeyboardAccelerators DISABLED_ReserveKeyboardAccelerators
 #else
-#define MAYBE_ReserveKeyboardAccelerators ReserveKeyboardAccelerators
+// Flaky, http://crbug.com/62311.
+#define MAYBE_ReserveKeyboardAccelerators FLAKY_ReserveKeyboardAccelerators
 #endif
 
 // Test that JavaScript cannot intercept reserved keyboard accelerators like