| Index: chrome/test/gpu/gpu_feature_browsertest.cc
|
| ===================================================================
|
| --- chrome/test/gpu/gpu_feature_browsertest.cc (revision 181040)
|
| +++ chrome/test/gpu/gpu_feature_browsertest.cc (working copy)
|
| @@ -55,7 +55,7 @@
|
| gpu_test_dir_ = test_dir.AppendASCII("gpu");
|
| }
|
|
|
| - virtual void SetUpCommandLine(CommandLine* command_line) {
|
| + virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
|
| // Do not use mesa if real GPU is required.
|
| if (!command_line->HasSwitch(switches::kUseGpuInTests)) {
|
| #if !defined(OS_MACOSX)
|
| @@ -235,7 +235,7 @@
|
|
|
| class AcceleratedCompositingTest : public GpuFeatureTest {
|
| public:
|
| - virtual void SetUpCommandLine(CommandLine* command_line) {
|
| + virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
|
| GpuFeatureTest::SetUpCommandLine(command_line);
|
| command_line->AppendSwitch(switches::kDisableAcceleratedCompositing);
|
| }
|
| @@ -290,7 +290,7 @@
|
|
|
| class WebGLTest : public GpuFeatureTest {
|
| public:
|
| - virtual void SetUpCommandLine(CommandLine* command_line) {
|
| + virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
|
| GpuFeatureTest::SetUpCommandLine(command_line);
|
| #if !defined(OS_ANDROID)
|
| // On Android, WebGL is disabled by default
|
| @@ -357,7 +357,7 @@
|
|
|
| class WebGLMultisamplingTest : public GpuFeatureTest {
|
| public:
|
| - virtual void SetUpCommandLine(CommandLine* command_line) {
|
| + virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
|
| GpuFeatureTest::SetUpCommandLine(command_line);
|
| command_line->AppendSwitch(switches::kDisableGLMultisampling);
|
| }
|
| @@ -411,7 +411,7 @@
|
|
|
| class Canvas2DDisabledTest : public GpuFeatureTest {
|
| public:
|
| - virtual void SetUpCommandLine(CommandLine* command_line) {
|
| + virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
|
| GpuFeatureTest::SetUpCommandLine(command_line);
|
| command_line->AppendSwitch(switches::kDisableAccelerated2dCanvas);
|
| }
|
| @@ -435,7 +435,7 @@
|
|
|
| class ThreadedCompositorTest : public GpuFeatureTest {
|
| public:
|
| - virtual void SetUpCommandLine(CommandLine* command_line) {
|
| + virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
|
| GpuFeatureTest::SetUpCommandLine(command_line);
|
| command_line->AppendSwitch(switches::kEnableThreadedCompositing);
|
| }
|
|
|