diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-15 21:44:35 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-15 21:44:35 +0000 |
| commit | e23a70d98ffcb0b9140b757ec01dbf7d1d3cf720 (patch) | |
| tree | 17a8d2785ba7a2b5ac232488559f8becbdcdfaac /chrome/test/in_process_browser_test.cc | |
| parent | 11fc764f26abbf31211618f538134b8bc98f4490 (diff) | |
| download | chromium_src-e23a70d98ffcb0b9140b757ec01dbf7d1d3cf720.zip chromium_src-e23a70d98ffcb0b9140b757ec01dbf7d1d3cf720.tar.gz chromium_src-e23a70d98ffcb0b9140b757ec01dbf7d1d3cf720.tar.bz2 | |
Removed --use-gl=osmesa as default for ui and browser tests.
Some tests require regular GL and appear not to be flaky.
This command line switch is now only passed to tests that are flaky on bots using regular GL.
TEST=run affected tests locally, try
BUG=55477, 62602
Review URL: http://codereview.chromium.org/4784001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66177 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/in_process_browser_test.cc')
| -rw-r--r-- | chrome/test/in_process_browser_test.cc | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/chrome/test/in_process_browser_test.cc b/chrome/test/in_process_browser_test.cc index 78781fc..c690cd2 100644 --- a/chrome/test/in_process_browser_test.cc +++ b/chrome/test/in_process_browser_test.cc @@ -4,8 +4,6 @@ #include "chrome/test/in_process_browser_test.h" -#include "app/app_switches.h" -#include "app/gfx/gl/gl_implementation.h" #include "base/command_line.h" #include "base/file_path.h" #include "base/file_util.h" @@ -154,14 +152,6 @@ void InProcessBrowserTest::SetUp() { // This is a Browser test. command_line->AppendSwitchASCII(switches::kTestType, kBrowserTestType); - // Force tests to use OSMesa if they launch the GPU process. - command_line->AppendSwitchASCII(switches::kUseGL, - gfx::kGLImplementationOSMesaName); - - // Mac does not support accelerated compositing with OSMesa. Disable on all - // platforms so it is consistent. http://crbug.com/58343 - command_line->AppendSwitch(switches::kDisableAcceleratedCompositing); - // Single-process mode is not set in BrowserMain so it needs to be processed // explicitly. original_single_process_ = RenderProcessHost::run_renderer_in_process(); |