Remove certain gpu crash tests from gpu_tests.

chrome/test/gpu/webgl_infobar_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/api/infobars/confirm_infobar_delegate.h"
 #include "chrome/browser/api/infobars/infobar_service.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 30 matching lines @@
       GURL(chrome::kChromeUIGpuCrashURL),
       static_cast<content::PageTransition>(
           content::PAGE_TRANSITION_TYPED |
           content::PAGE_TRANSITION_FROM_ADDRESS_BAR));
   params.disposition = NEW_BACKGROUND_TAB;
   chrome::Navigate(&params);
 }
 
 } // namespace
 
-class GPUCrashTest : public InProcessBrowserTest {
+class WebGLInfobarTest : public InProcessBrowserTest {
  protected:
   virtual void SetUpCommandLine(CommandLine* command_line) {
     // GPU tests require gpu acceleration.
     // We do not care which GL backend is used.
     command_line->AppendSwitchASCII(switches::kUseGL, "any");
   }
   virtual void SetUpInProcessBrowserTestFixture() {
     FilePath test_dir;
     ASSERT_TRUE(PathService::Get(content::DIR_TEST_DATA, &test_dir));
     gpu_test_dir_ = test_dir.AppendASCII("gpu");
   }
   FilePath gpu_test_dir_;
 };
 
-IN_PROC_BROWSER_TEST_F(GPUCrashTest, Kill) {
+IN_PROC_BROWSER_TEST_F(WebGLInfobarTest, ContextLossRaisesInfobar) {
   // crbug.com/162982, flaky on Mac Retina Release.
   if (GPUTestBotConfig::CurrentConfigMatches("MAC NVIDIA 0x0fd5 RELEASE"))
     return;
 
-  content::DOMMessageQueue message_queue;
-
-  content::GpuDataManager::GetInstance()->
-      DisableDomainBlockingFor3DAPIsForTesting();
-
   // 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"));
   observer.Wait();
 
-  SimulateGPUCrash(browser());
-
-  std::string m;
-  ASSERT_TRUE(message_queue.WaitForMessage(&m));
-  EXPECT_EQ("\"SUCCESS\"", m);
-}
-
-IN_PROC_BROWSER_TEST_F(GPUCrashTest, ContextLossRaisesInfobar) {
-  // crbug.com/162982, flaky on Mac Retina Release.
-  if (GPUTestBotConfig::CurrentConfigMatches("MAC NVIDIA 0x0fd5 RELEASE"))
-    return;
-
-  // 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"));
-  observer.Wait();
-
   content::WindowedNotificationObserver infobar_added(
         chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED,
         content::NotificationService::AllSources());
   SimulateGPUCrash(browser());
   infobar_added.Wait();
   EXPECT_EQ(1u,
             InfoBarService::FromWebContents(
                 chrome::GetActiveWebContents(browser()))->GetInfoBarCount());
 }
 
-IN_PROC_BROWSER_TEST_F(GPUCrashTest, ContextLossInfobarReload) {
+IN_PROC_BROWSER_TEST_F(WebGLInfobarTest, ContextLossInfobarReload) {
   // crbug.com/162982, flaky on Mac Retina Release.
   if (GPUTestBotConfig::CurrentConfigMatches("MAC NVIDIA 0x0fd5 RELEASE"))
     return;
 
   content::DOMMessageQueue message_queue;
 
   // Load page and wait for it to load.
   content::WindowedNotificationObserver observer(
       content::NOTIFICATION_LOAD_STOP,
       content::NotificationService::AllSources());
@@ skipping 28 matching lines @@
   // The page should reload and another message sent to the
   // DomAutomationController.
   m = "";
   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.
-
-IN_PROC_BROWSER_TEST_F(GPUCrashTest, WebkitLoseContext) {
-  content::DOMMessageQueue message_queue;
-
-  ui_test_utils::NavigateToURL(
-      browser(),
-      content::GetFileUrlWithQuery(
-          gpu_test_dir_.AppendASCII("webgl.html"),
-          "query=WEBGL_lose_context"));
-
-  std::string m;
-  ASSERT_TRUE(message_queue.WaitForMessage(&m));
-  EXPECT_EQ("\"SUCCESS\"", m);
-}