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

Side by Side Diff: extensions/test/extensions_unittests_main.cc

Issue 622343002: replace OVERRIDE and FINAL with override and final in extensions/ (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 | « extensions/test/extension_test_message_listener.h ('k') | extensions/test/result_catcher.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 "content/public/common/content_client.h" 10 #include "content/public/common/content_client.h"
(...skipping 13 matching lines...) Expand all
24 // TODO(jamescook): Should this be merged with ShellContentClient? Should this 24 // TODO(jamescook): Should this be merged with ShellContentClient? Should this
25 // be a persistent object available to tests? 25 // be a persistent object available to tests?
26 class ExtensionsContentClient : public content::ContentClient { 26 class ExtensionsContentClient : public content::ContentClient {
27 public: 27 public:
28 ExtensionsContentClient() {} 28 ExtensionsContentClient() {}
29 virtual ~ExtensionsContentClient() {} 29 virtual ~ExtensionsContentClient() {}
30 30
31 // content::ContentClient overrides: 31 // content::ContentClient overrides:
32 virtual void AddAdditionalSchemes( 32 virtual void AddAdditionalSchemes(
33 std::vector<std::string>* standard_schemes, 33 std::vector<std::string>* standard_schemes,
34 std::vector<std::string>* savable_schemes) OVERRIDE { 34 std::vector<std::string>* savable_schemes) override {
35 standard_schemes->push_back(extensions::kExtensionScheme); 35 standard_schemes->push_back(extensions::kExtensionScheme);
36 savable_schemes->push_back(extensions::kExtensionScheme); 36 savable_schemes->push_back(extensions::kExtensionScheme);
37 standard_schemes->push_back(extensions::kExtensionResourceScheme); 37 standard_schemes->push_back(extensions::kExtensionResourceScheme);
38 savable_schemes->push_back(extensions::kExtensionResourceScheme); 38 savable_schemes->push_back(extensions::kExtensionResourceScheme);
39 } 39 }
40 40
41 private: 41 private:
42 DISALLOW_COPY_AND_ASSIGN(ExtensionsContentClient); 42 DISALLOW_COPY_AND_ASSIGN(ExtensionsContentClient);
43 }; 43 };
44 44
45 // The test suite for extensions_unittests. 45 // The test suite for extensions_unittests.
46 class ExtensionsTestSuite : public content::ContentTestSuiteBase { 46 class ExtensionsTestSuite : public content::ContentTestSuiteBase {
47 public: 47 public:
48 ExtensionsTestSuite(int argc, char** argv); 48 ExtensionsTestSuite(int argc, char** argv);
49 virtual ~ExtensionsTestSuite(); 49 virtual ~ExtensionsTestSuite();
50 50
51 private: 51 private:
52 // base::TestSuite: 52 // base::TestSuite:
53 virtual void Initialize() OVERRIDE; 53 virtual void Initialize() override;
54 virtual void Shutdown() OVERRIDE; 54 virtual void Shutdown() override;
55 55
56 scoped_ptr<extensions::TestExtensionsClient> client_; 56 scoped_ptr<extensions::TestExtensionsClient> client_;
57 57
58 DISALLOW_COPY_AND_ASSIGN(ExtensionsTestSuite); 58 DISALLOW_COPY_AND_ASSIGN(ExtensionsTestSuite);
59 }; 59 };
60 60
61 ExtensionsTestSuite::ExtensionsTestSuite(int argc, char** argv) 61 ExtensionsTestSuite::ExtensionsTestSuite(int argc, char** argv)
62 : content::ContentTestSuiteBase(argc, argv) {} 62 : content::ContentTestSuiteBase(argc, argv) {}
63 63
64 ExtensionsTestSuite::~ExtensionsTestSuite() {} 64 ExtensionsTestSuite::~ExtensionsTestSuite() {}
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 99
100 int main(int argc, char** argv) { 100 int main(int argc, char** argv) {
101 content::UnitTestTestSuite test_suite(new ExtensionsTestSuite(argc, argv)); 101 content::UnitTestTestSuite test_suite(new ExtensionsTestSuite(argc, argv));
102 102
103 mojo::embedder::test::InitWithSimplePlatformSupport(); 103 mojo::embedder::test::InitWithSimplePlatformSupport();
104 return base::LaunchUnitTests(argc, 104 return base::LaunchUnitTests(argc,
105 argv, 105 argv,
106 base::Bind(&content::UnitTestTestSuite::Run, 106 base::Bind(&content::UnitTestTestSuite::Run,
107 base::Unretained(&test_suite))); 107 base::Unretained(&test_suite)));
108 } 108 }
OLDNEW
« no previous file with comments | « extensions/test/extension_test_message_listener.h ('k') | extensions/test/result_catcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698