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

Side by Side Diff: athena/test/base/athena_unittests.cc

Issue 623103002: replace OVERRIDE and FINAL with override and final in athena/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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 | « athena/test/base/athena_test_base.h ('k') | athena/test/base/sample_activity.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "base/base_paths.h" 5 #include "base/base_paths.h"
6 #include "base/bind.h" 6 #include "base/bind.h"
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/test/launcher/unit_test_launcher.h" 9 #include "base/test/launcher/unit_test_launcher.h"
10 #include "base/test/test_suite.h" 10 #include "base/test/test_suite.h"
11 #include "testing/gtest/include/gtest/gtest.h" 11 #include "testing/gtest/include/gtest/gtest.h"
12 #include "ui/base/resource/resource_bundle.h" 12 #include "ui/base/resource/resource_bundle.h"
13 #include "ui/base/ui_base_paths.h" 13 #include "ui/base/ui_base_paths.h"
14 #include "ui/gfx/gfx_paths.h" 14 #include "ui/gfx/gfx_paths.h"
15 #include "ui/gl/gl_surface.h" 15 #include "ui/gl/gl_surface.h"
16 16
17 namespace { 17 namespace {
18 18
19 class AthenaTestSuite : public base::TestSuite { 19 class AthenaTestSuite : public base::TestSuite {
20 public: 20 public:
21 AthenaTestSuite(int argc, char** argv) : TestSuite(argc, argv) {} 21 AthenaTestSuite(int argc, char** argv) : TestSuite(argc, argv) {}
22 virtual ~AthenaTestSuite() {} 22 virtual ~AthenaTestSuite() {}
23 23
24 protected: 24 protected:
25 // base::TestSuite: 25 // base::TestSuite:
26 virtual void Initialize() OVERRIDE { 26 virtual void Initialize() override {
27 base::TestSuite::Initialize(); 27 base::TestSuite::Initialize();
28 gfx::GLSurface::InitializeOneOffForTests(); 28 gfx::GLSurface::InitializeOneOffForTests();
29 gfx::RegisterPathProvider(); 29 gfx::RegisterPathProvider();
30 ui::RegisterPathProvider(); 30 ui::RegisterPathProvider();
31 31
32 base::FilePath test_pak_path; 32 base::FilePath test_pak_path;
33 ASSERT_TRUE(PathService::Get(base::DIR_MODULE, &test_pak_path)); 33 ASSERT_TRUE(PathService::Get(base::DIR_MODULE, &test_pak_path));
34 test_pak_path = test_pak_path.AppendASCII("athena_resources.pak"); 34 test_pak_path = test_pak_path.AppendASCII("athena_resources.pak");
35 ui::ResourceBundle::InitSharedInstanceWithPakPath(test_pak_path); 35 ui::ResourceBundle::InitSharedInstanceWithPakPath(test_pak_path);
36 } 36 }
37 virtual void Shutdown() OVERRIDE { 37 virtual void Shutdown() override {
38 ui::ResourceBundle::CleanupSharedInstance(); 38 ui::ResourceBundle::CleanupSharedInstance();
39 base::TestSuite::Shutdown(); 39 base::TestSuite::Shutdown();
40 } 40 }
41 41
42 private: 42 private:
43 DISALLOW_COPY_AND_ASSIGN(AthenaTestSuite); 43 DISALLOW_COPY_AND_ASSIGN(AthenaTestSuite);
44 }; 44 };
45 45
46 } // namespace 46 } // namespace
47 47
48 int main(int argc, char** argv) { 48 int main(int argc, char** argv) {
49 AthenaTestSuite test_suite(argc, argv); 49 AthenaTestSuite test_suite(argc, argv);
50 50
51 return base::LaunchUnitTestsSerially( 51 return base::LaunchUnitTestsSerially(
52 argc, 52 argc,
53 argv, 53 argv,
54 base::Bind(&AthenaTestSuite::Run, base::Unretained(&test_suite))); 54 base::Bind(&AthenaTestSuite::Run, base::Unretained(&test_suite)));
55 } 55 }
OLDNEW
« no previous file with comments | « athena/test/base/athena_test_base.h ('k') | athena/test/base/sample_activity.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698