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

Side by Side Diff: gpu/command_buffer/service/feature_info_unittest.cc

Issue 629913002: Replacing the OVERRIDE with override and FINAL with final in gpu (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Included autogen python file for OVERRIDE Created 6 years, 2 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "gpu/command_buffer/service/feature_info.h" 5 #include "gpu/command_buffer/service/feature_info.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "gpu/command_buffer/service/gpu_service_test.h" 10 #include "gpu/command_buffer/service/gpu_service_test.h"
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 info_ = new FeatureInfo(command_line); 67 info_ = new FeatureInfo(command_line);
68 info_->Initialize(); 68 info_->Initialize();
69 } 69 }
70 70
71 void SetupWithoutInit() { 71 void SetupWithoutInit() {
72 GpuServiceTest::SetUp(); 72 GpuServiceTest::SetUp();
73 info_ = new FeatureInfo(); 73 info_ = new FeatureInfo();
74 } 74 }
75 75
76 protected: 76 protected:
77 virtual void SetUp() OVERRIDE { 77 virtual void SetUp() override {
78 // Do nothing here, since we are using the explicit Setup*() functions. 78 // Do nothing here, since we are using the explicit Setup*() functions.
79 } 79 }
80 80
81 virtual void TearDown() OVERRIDE { 81 virtual void TearDown() override {
82 info_ = NULL; 82 info_ = NULL;
83 GpuServiceTest::TearDown(); 83 GpuServiceTest::TearDown();
84 } 84 }
85 85
86 scoped_refptr<FeatureInfo> info_; 86 scoped_refptr<FeatureInfo> info_;
87 }; 87 };
88 88
89 namespace { 89 namespace {
90 90
91 struct FormatInfo { 91 struct FormatInfo {
(...skipping 1195 matching lines...) Expand 10 before | Expand all | Expand 10 after
1287 1287
1288 TEST_F(FeatureInfoTest, InitializeNoCHROMIUM_path_rendering2) { 1288 TEST_F(FeatureInfoTest, InitializeNoCHROMIUM_path_rendering2) {
1289 SetupInitExpectationsWithGLVersion("GL_NV_path_rendering", "", "4.3"); 1289 SetupInitExpectationsWithGLVersion("GL_NV_path_rendering", "", "4.3");
1290 EXPECT_FALSE(info_->feature_flags().chromium_path_rendering); 1290 EXPECT_FALSE(info_->feature_flags().chromium_path_rendering);
1291 EXPECT_THAT(info_->extensions(), 1291 EXPECT_THAT(info_->extensions(),
1292 Not(HasSubstr("GL_CHROMIUM_path_rendering"))); 1292 Not(HasSubstr("GL_CHROMIUM_path_rendering")));
1293 } 1293 }
1294 1294
1295 } // namespace gles2 1295 } // namespace gles2
1296 } // namespace gpu 1296 } // namespace gpu
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/error_state.cc ('k') | gpu/command_buffer/service/framebuffer_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698