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

Side by Side Diff: content/test/content_test_suite.cc

Issue 630813002: Replace OVERRIDE and FINAL with override and final in content/test/[a-s]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « content/test/content_test_suite.h ('k') | content/test/image_decoder_test.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "content/test/content_test_suite.h" 5 #include "content/test/content_test_suite.h"
6 6
7 #include "base/base_paths.h" 7 #include "base/base_paths.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "content/public/common/content_client.h" 9 #include "content/public/common/content_client.h"
10 #include "content/public/common/content_paths.h" 10 #include "content/public/common/content_paths.h"
(...skipping 16 matching lines...) Expand all
27 #include "ui/gl/gl_surface.h" 27 #include "ui/gl/gl_surface.h"
28 #endif 28 #endif
29 29
30 namespace { 30 namespace {
31 31
32 class TestInitializationListener : public testing::EmptyTestEventListener { 32 class TestInitializationListener : public testing::EmptyTestEventListener {
33 public: 33 public:
34 TestInitializationListener() : test_content_client_initializer_(NULL) { 34 TestInitializationListener() : test_content_client_initializer_(NULL) {
35 } 35 }
36 36
37 virtual void OnTestStart(const testing::TestInfo& test_info) OVERRIDE { 37 virtual void OnTestStart(const testing::TestInfo& test_info) override {
38 test_content_client_initializer_ = 38 test_content_client_initializer_ =
39 new content::TestContentClientInitializer(); 39 new content::TestContentClientInitializer();
40 } 40 }
41 41
42 virtual void OnTestEnd(const testing::TestInfo& test_info) OVERRIDE { 42 virtual void OnTestEnd(const testing::TestInfo& test_info) override {
43 delete test_content_client_initializer_; 43 delete test_content_client_initializer_;
44 } 44 }
45 45
46 private: 46 private:
47 content::TestContentClientInitializer* test_content_client_initializer_; 47 content::TestContentClientInitializer* test_content_client_initializer_;
48 48
49 DISALLOW_COPY_AND_ASSIGN(TestInitializationListener); 49 DISALLOW_COPY_AND_ASSIGN(TestInitializationListener);
50 }; 50 };
51 51
52 } // namespace 52 } // namespace
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 gfx::GLSurface::InitializeOneOffForTests(); 84 gfx::GLSurface::InitializeOneOffForTests();
85 gpu::ApplyGpuDriverBugWorkarounds(CommandLine::ForCurrentProcess()); 85 gpu::ApplyGpuDriverBugWorkarounds(CommandLine::ForCurrentProcess());
86 } 86 }
87 #endif 87 #endif
88 testing::TestEventListeners& listeners = 88 testing::TestEventListeners& listeners =
89 testing::UnitTest::GetInstance()->listeners(); 89 testing::UnitTest::GetInstance()->listeners();
90 listeners.Append(new TestInitializationListener); 90 listeners.Append(new TestInitializationListener);
91 } 91 }
92 92
93 } // namespace content 93 } // namespace content
OLDNEW
« no previous file with comments | « content/test/content_test_suite.h ('k') | content/test/image_decoder_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698