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

Unified Diff: content/public/test/browser_test_base.cc

Issue 261013004: Allow use of EGL in browser tests with --use-gl=egl. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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
« no previous file with comments | « no previous file | ui/gl/gl_surface.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/test/browser_test_base.cc
diff --git a/content/public/test/browser_test_base.cc b/content/public/test/browser_test_base.cc
index d0a33f021150bf55cae8e285dfad8cd9bd3b8e40..c6216d49dfe03ea343d46684c27f659a6473f066 100644
--- a/content/public/test/browser_test_base.cc
+++ b/content/public/test/browser_test_base.cc
@@ -217,15 +217,8 @@ void BrowserTestBase::SetUp() {
use_osmesa = false;
#endif
- if (command_line->HasSwitch(switches::kUseGL)) {
- NOTREACHED() <<
- "kUseGL should not be used with tests. Try kUseGpuInTests instead.";
- }
-
- if (use_osmesa && !use_software_compositing_) {
- command_line->AppendSwitchASCII(
- switches::kUseGL, gfx::kGLImplementationOSMesaName);
- }
+ if (use_osmesa && !use_software_compositing_)
+ command_line->AppendSwitch(switches::kOverrideUseGLWithOSMesaForTests);
piman 2014/05/01 20:41:20 You need to add this to GpuProcessHost so that it'
danakj 2014/05/01 20:53:49 Done.
scoped_refptr<net::HostResolverProc> local_resolver =
new LocalHostResolverProc();
« no previous file with comments | « no previous file | ui/gl/gl_surface.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698