Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(191)

Unified Diff: chrome/browser/apps/web_view_browsertest.cc

Issue 131443007: aura: Remove old GL paths from RenderWidgetHostViewAura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: dcheck Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/apps/web_view_browsertest.cc
diff --git a/chrome/browser/apps/web_view_browsertest.cc b/chrome/browser/apps/web_view_browsertest.cc
index a5ed016fbe4edb28a3489c2cd1ae1052ef328d87..22263f1f96cc8573116ca17214f564365b575738 100644
--- a/chrome/browser/apps/web_view_browsertest.cc
+++ b/chrome/browser/apps/web_view_browsertest.cc
@@ -632,8 +632,7 @@ IN_PROC_BROWSER_TEST_F(WebViewTest, AutoSize) {
#if !defined(OS_CHROMEOS)
// This test ensures <webview> doesn't crash in SW rendering when autosize is
// turned on.
-// Flaky on Windows http://crbug.com/299507
-#if defined(OS_WIN) || defined(OS_MACOSX)
+#if defined(OS_MACOSX) || defined(USE_AURA)
#define MAYBE_AutoSizeSW DISABLED_AutoSizeSW
#else
#define MAYBE_AutoSizeSW AutoSizeSW
@@ -1860,9 +1859,12 @@ IN_PROC_BROWSER_TEST_P(WebViewCaptureTest,
TestHelper("testScreenshotCapture", "web_view/shim", NO_TEST_SERVER);
}
+// Threaded compositing is always enabled on Aura.
+#if !defined(USE_AURA)
INSTANTIATE_TEST_CASE_P(WithoutThreadedCompositor,
WebViewCaptureTest,
::testing::Values(std::string(switches::kDisableThreadedCompositing)));
+#endif
// http://crbug.com/171744
#if !defined(OS_MACOSX)

Powered by Google App Engine
This is Rietveld 408576698