diff options
Diffstat (limited to 'content/browser/gpu')
-rw-r--r-- | content/browser/gpu/gpu_blacklist_unittest.cc | 4 | ||||
-rw-r--r-- | content/browser/gpu/gpu_crash_browsertest.cc | 2 | ||||
-rw-r--r-- | content/browser/gpu/gpu_data_manager_impl_unittest.cc | 4 | ||||
-rw-r--r-- | content/browser/gpu/gpu_memory_test.cc | 4 | ||||
-rw-r--r-- | content/browser/gpu/webgl_conformance_test.cc | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/content/browser/gpu/gpu_blacklist_unittest.cc b/content/browser/gpu/gpu_blacklist_unittest.cc index 374b23b..08a6cf2 100644 --- a/content/browser/gpu/gpu_blacklist_unittest.cc +++ b/content/browser/gpu/gpu_blacklist_unittest.cc @@ -37,7 +37,7 @@ class GpuBlacklistTest : public testing::Test { } protected: - void SetUp() { + virtual void SetUp() { gpu_info_.gpu.vendor_id = kNvidiaVendorId; gpu_info_.gpu.device_id = 0x0640; gpu_info_.driver_vendor = "NVIDIA"; @@ -51,7 +51,7 @@ class GpuBlacklistTest : public testing::Test { gpu_info_.performance_stats.overall = 5.0; } - void TearDown() { + virtual void TearDown() { } private: diff --git a/content/browser/gpu/gpu_crash_browsertest.cc b/content/browser/gpu/gpu_crash_browsertest.cc index 90b1fb3..df167e0 100644 --- a/content/browser/gpu/gpu_crash_browsertest.cc +++ b/content/browser/gpu/gpu_crash_browsertest.cc @@ -17,7 +17,7 @@ namespace content { class GpuCrashTest : public ContentBrowserTest { protected: - virtual void SetUpInProcessBrowserTestFixture() { + virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { base::FilePath test_dir; ASSERT_TRUE(PathService::Get(DIR_TEST_DATA, &test_dir)); gpu_test_dir_ = test_dir.AppendASCII("gpu"); diff --git a/content/browser/gpu/gpu_data_manager_impl_unittest.cc b/content/browser/gpu/gpu_data_manager_impl_unittest.cc index 678f43c..09b9cd6 100644 --- a/content/browser/gpu/gpu_data_manager_impl_unittest.cc +++ b/content/browser/gpu/gpu_data_manager_impl_unittest.cc @@ -81,10 +81,10 @@ class GpuDataManagerImplTest : public testing::Test { DISALLOW_COPY_AND_ASSIGN(ScopedGpuDataManagerImpl); }; - void SetUp() { + virtual void SetUp() { } - void TearDown() { + virtual void TearDown() { } base::Time JustBeforeExpiration(GpuDataManagerImpl* manager); diff --git a/content/browser/gpu/gpu_memory_test.cc b/content/browser/gpu/gpu_memory_test.cc index 00f7331..4a8beb5 100644 --- a/content/browser/gpu/gpu_memory_test.cc +++ b/content/browser/gpu/gpu_memory_test.cc @@ -73,13 +73,13 @@ class GpuMemoryTest : public content::ContentBrowserTest { virtual ~GpuMemoryTest() { } - virtual void SetUpInProcessBrowserTestFixture() { + virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { base::FilePath test_dir; ASSERT_TRUE(PathService::Get(content::DIR_TEST_DATA, &test_dir)); gpu_test_dir_ = test_dir.AppendASCII("gpu"); } - virtual void SetUpCommandLine(CommandLine* command_line) { + virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { command_line->AppendSwitch(switches::kEnableLogging); command_line->AppendSwitch(switches::kForceCompositingMode); command_line->AppendSwitchASCII(switches::kForceGpuMemAvailableMb, diff --git a/content/browser/gpu/webgl_conformance_test.cc b/content/browser/gpu/webgl_conformance_test.cc index 734d07e..ef5c33d 100644 --- a/content/browser/gpu/webgl_conformance_test.cc +++ b/content/browser/gpu/webgl_conformance_test.cc @@ -28,12 +28,12 @@ class WebGLConformanceTest : public ContentBrowserTest { WebGLConformanceTest() {} #if !defined(OS_WIN) - virtual void SetUpCommandLine(CommandLine* command_line) { + virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { // Allow privileged WebGL extensions. command_line->AppendSwitch(switches::kEnablePrivilegedWebGLExtensions); } - virtual void SetUpInProcessBrowserTestFixture() { + virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { base::FilePath webgl_conformance_path; PathService::Get(base::DIR_SOURCE_ROOT, &webgl_conformance_path); webgl_conformance_path = webgl_conformance_path.Append( |