Chromium Code Reviews| 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(); |