| Index: chrome/test/gpu/webgl_infobar_browsertest.cc
|
| diff --git a/chrome/test/gpu/webgl_infobar_browsertest.cc b/chrome/test/gpu/webgl_infobar_browsertest.cc
|
| index 038aa5cd3553e7d89d3cd7e1eab059ed6ae6496a..23fa8c78c3840be353fec9f046fa1325f1fba2d9 100644
|
| --- a/chrome/test/gpu/webgl_infobar_browsertest.cc
|
| +++ b/chrome/test/gpu/webgl_infobar_browsertest.cc
|
| @@ -88,50 +88,6 @@ IN_PROC_BROWSER_TEST_F(WebGLInfoBarTest, DISABLED_ContextLossRaisesInfoBar) {
|
| infobar_count());
|
| }
|
|
|
| -// This test is flaky. http://crbug.com/324555
|
| -IN_PROC_BROWSER_TEST_F(WebGLInfoBarTest, DISABLED_ContextLossInfoBarReload) {
|
| - if (gpu::GPUTestBotConfig::CurrentConfigMatches("XP"))
|
| - return;
|
| -
|
| - content::DOMMessageQueue message_queue;
|
| -
|
| - // Load page and wait for it to load.
|
| - content::WindowedNotificationObserver observer(
|
| - content::NOTIFICATION_LOAD_STOP,
|
| - content::NotificationService::AllSources());
|
| - ui_test_utils::NavigateToURL(
|
| - browser(),
|
| - content::GetFileUrlWithQuery(
|
| - gpu_test_dir_.AppendASCII("webgl.html"),
|
| - "query=kill_after_notification"));
|
| - observer.Wait();
|
| -
|
| - std::string m;
|
| - ASSERT_TRUE(message_queue.WaitForMessage(&m));
|
| - EXPECT_EQ("\"LOADED\"", m);
|
| -
|
| - message_queue.ClearQueue();
|
| -
|
| - content::WindowedNotificationObserver infobar_added(
|
| - chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED,
|
| - content::NotificationService::AllSources());
|
| - SimulateGPUCrash(browser());
|
| - infobar_added.Wait();
|
| - InfoBarService* infobar_service = InfoBarService::FromWebContents(
|
| - browser()->tab_strip_model()->GetActiveWebContents());
|
| - ASSERT_EQ(1u, infobar_service->infobar_count());
|
| - infobars::InfoBarDelegate* delegate =
|
| - infobar_service->infobar_at(0)->delegate();
|
| - ASSERT_TRUE(delegate->AsThreeDAPIInfoBarDelegate());
|
| - delegate->AsConfirmInfoBarDelegate()->Cancel();
|
| -
|
| - // The page should reload and another message sent to the
|
| - // DomAutomationController.
|
| - m.clear();
|
| - ASSERT_TRUE(message_queue.WaitForMessage(&m));
|
| - EXPECT_EQ("\"LOADED\"", m);
|
| -}
|
| -
|
| // There isn't any point in adding a test which calls Accept() on the
|
| // ThreeDAPIInfoBarDelegate; doing so doesn't remove the infobar, and
|
| // there's no concrete event that could be observed in response.
|
|
|