diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-18 18:32:45 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-11-18 18:38:07 +0000 |
| commit | 513209b27ff55e2841eac0e4120199c23acce758 (patch) | |
| tree | aeba30bb08c5f47c57003544e378a377c297eee6 /chrome/browser/notifications/notifications_interactive_uitest.cc | |
| parent | 164f7496de0fbee436b385a79ead9e3cb81a50c1 (diff) | |
| download | external_chromium-513209b27ff55e2841eac0e4120199c23acce758.zip external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.gz external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.bz2 | |
Merge Chromium at r65505: Initial merge by git.
Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
Diffstat (limited to 'chrome/browser/notifications/notifications_interactive_uitest.cc')
| -rw-r--r-- | chrome/browser/notifications/notifications_interactive_uitest.cc | 6 |
1 files changed, 4 insertions, 2 deletions
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()); |