Disable WebViewCaptureTest.Shim_ScreenshotCapture

chrome/browser/apps/web_view_browsertest.cc

 // Copyright 2013 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 "apps/ui/native_app_window.h"
 #include "base/path_service.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "chrome/browser/automation/automation_util.h"
@@ skipping 1845 matching lines @@
     WebViewTest::SetUp();
   }
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     command_line->AppendSwitch(GetParam());
     // http://crbug.com/327035
     command_line->AppendSwitch(switches::kDisableDelegatedRenderer);
     WebViewTest::SetUpCommandLine(command_line);
   }
 };
 
-#if defined(USE_AURA) && defined(OS_LINUX)
-// Keeps failing on LinuxAura try server, tentatively disable this
-// so that CQ becomes sane.
-// crbug.com/330146
-#define MAYBE_Shim_ScreenshotCapture DISABLED_Shim_ScreenshotCapture
-#else
-#define MAYBE_Shim_ScreenshotCapture Shim_ScreenshotCapture
-#endif
+// <webview> screenshot capture fails with ubercomp.
+// See http://crbug.com/327035.
 IN_PROC_BROWSER_TEST_P(WebViewCaptureTest,
-                       MAYBE_Shim_ScreenshotCapture) {
+                       DISABLED_Shim_ScreenshotCapture) {
   TestHelper("testScreenshotCapture", "web_view/shim", NO_TEST_SERVER);
 }
 
 INSTANTIATE_TEST_CASE_P(WithoutThreadedCompositor,
     WebViewCaptureTest,
     ::testing::Values(std::string(switches::kDisableThreadedCompositing)));
 
 // http://crbug.com/171744
 #if !defined(OS_MACOSX)
 INSTANTIATE_TEST_CASE_P(WithThreadedCompositor,
     WebViewCaptureTest,
     ::testing::Values(std::string(switches::kEnableThreadedCompositing)));
 #endif