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

Side by Side Diff: ui/wm/test/run_all_unittests.cc

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (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 | « ui/wm/public/scoped_tooltip_disabler.h ('k') | ui/wm/test/wm_test_helper.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/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/bind.h" 6 #include "base/bind.h"
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.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/gl/gl_surface.h" 14 #include "ui/gl/gl_surface.h"
15 15
16 class WMTestSuite : public base::TestSuite { 16 class WMTestSuite : public base::TestSuite {
17 public: 17 public:
18 WMTestSuite(int argc, char** argv) : base::TestSuite(argc, argv) {} 18 WMTestSuite(int argc, char** argv) : base::TestSuite(argc, argv) {}
19 19
20 protected: 20 protected:
21 virtual void Initialize() OVERRIDE { 21 virtual void Initialize() override {
22 base::TestSuite::Initialize(); 22 base::TestSuite::Initialize();
23 gfx::GLSurface::InitializeOneOffForTests(); 23 gfx::GLSurface::InitializeOneOffForTests();
24 ui::RegisterPathProvider(); 24 ui::RegisterPathProvider();
25 25
26 base::FilePath ui_test_pak_path; 26 base::FilePath ui_test_pak_path;
27 ASSERT_TRUE(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path)); 27 ASSERT_TRUE(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path));
28 ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path); 28 ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path);
29 } 29 }
30 30
31 virtual void Shutdown() OVERRIDE { 31 virtual void Shutdown() override {
32 ui::ResourceBundle::CleanupSharedInstance(); 32 ui::ResourceBundle::CleanupSharedInstance();
33 base::TestSuite::Shutdown(); 33 base::TestSuite::Shutdown();
34 } 34 }
35 35
36 private: 36 private:
37 DISALLOW_COPY_AND_ASSIGN(WMTestSuite); 37 DISALLOW_COPY_AND_ASSIGN(WMTestSuite);
38 }; 38 };
39 39
40 int main(int argc, char** argv) { 40 int main(int argc, char** argv) {
41 WMTestSuite test_suite(argc, argv); 41 WMTestSuite test_suite(argc, argv);
42 42
43 return base::LaunchUnitTests( 43 return base::LaunchUnitTests(
44 argc, argv, base::Bind(&WMTestSuite::Run, base::Unretained(&test_suite))); 44 argc, argv, base::Bind(&WMTestSuite::Run, base::Unretained(&test_suite)));
45 } 45 }
OLDNEW
« no previous file with comments | « ui/wm/public/scoped_tooltip_disabler.h ('k') | ui/wm/test/wm_test_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698