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

Unified Diff: chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc

Issue 22293003: Clean up compositor initialization/destruction. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanupcompositor: UseRealGLBindings in NetInternalsTest Created 7 years, 4 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/ui/webui/net_internals/net_internals_ui_browsertest.cc
diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc
index cffe88f8caf59271d0884fcf5228af318472022a..d102d6569e60440eadbd7c0ac9d22e13aef51d28 100644
--- a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc
@@ -378,6 +378,16 @@ NetInternalsTest::NetInternalsTest()
NetInternalsTest::~NetInternalsTest() {
}
+void NetInternalsTest::SetUp() {
+#if defined(OS_WIN) && defined(USE_AURA)
+ // The NetInternalsTest.netInternalsTimelineViewScrollbar test requires real
+ // GL bindings to pass on Win7 Aura.
+ UseRealGLBindings();
+#endif
+
+ WebUIBrowserTest::SetUp();
+}
+
void NetInternalsTest::SetUpCommandLine(CommandLine* command_line) {
WebUIBrowserTest::SetUpCommandLine(command_line);
// Needed to test the prerender view.

Powered by Google App Engine
This is Rietveld 408576698