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

Unified Diff: content/browser/renderer_host/render_widget_host_view_browsertest.cc

Issue 137403005: Remove some code inside USE_AURA and OS_WIN ifdefs. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 6 years, 11 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: content/browser/renderer_host/render_widget_host_view_browsertest.cc
===================================================================
--- content/browser/renderer_host/render_widget_host_view_browsertest.cc (revision 244508)
+++ content/browser/renderer_host/render_widget_host_view_browsertest.cc (working copy)
@@ -229,11 +229,6 @@
} else {
// We expect real pixel output for these tests.
UseRealGLContexts();
-
-#if defined(OS_WIN) && !defined(USE_AURA)
- // On legacy windows, these tests need real GL bindings to pass.
- UseRealGLBindings();
-#endif
}
RenderWidgetHostViewBrowserTest::SetUp();
@@ -399,9 +394,8 @@
// always called, even when the RenderWidgetHost is deleting in the middle of
// an async copy.
//
-// Test is flaky on Win Aura. http://crbug.com/276783
-#if (defined(OS_WIN) && defined(USE_AURA)) || \
- (defined(OS_CHROMEOS) && !defined(NDEBUG))
+// Test is flaky on Win. http://crbug.com/276783
+#if defined(OS_WIN) || (defined(OS_CHROMEOS) && !defined(NDEBUG))
#define MAYBE_CopyFromCompositingSurface_CallbackDespiteDelete \
DISABLED_CopyFromCompositingSurface_CallbackDespiteDelete
#else

Powered by Google App Engine
This is Rietveld 408576698