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

Side by Side Diff: chrome/common/extensions/manifest_tests/chrome_manifest_test.h

Issue 622373003: Replacing the OVERRIDE with override in chrome/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resolved Error 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 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 #ifndef CHROME_COMMON_EXTENSIONS_MANIFEST_TESTS_CHROME_MANIFEST_TEST_H_ 5 #ifndef CHROME_COMMON_EXTENSIONS_MANIFEST_TESTS_CHROME_MANIFEST_TEST_H_
6 #define CHROME_COMMON_EXTENSIONS_MANIFEST_TESTS_CHROME_MANIFEST_TEST_H_ 6 #define CHROME_COMMON_EXTENSIONS_MANIFEST_TESTS_CHROME_MANIFEST_TEST_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "chrome/common/extensions/features/feature_channel.h" 9 #include "chrome/common/extensions/features/feature_channel.h"
10 #include "extensions/common/manifest_test.h" 10 #include "extensions/common/manifest_test.h"
11 11
12 // Base class for unit tests that load manifest data from Chrome TEST_DATA_DIR. 12 // Base class for unit tests that load manifest data from Chrome TEST_DATA_DIR.
13 // TODO(jamescook): Move this class and all subclasses into the extensions 13 // TODO(jamescook): Move this class and all subclasses into the extensions
14 // namespace. 14 // namespace.
15 class ChromeManifestTest : public extensions::ManifestTest { 15 class ChromeManifestTest : public extensions::ManifestTest {
16 public: 16 public:
17 ChromeManifestTest(); 17 ChromeManifestTest();
18 virtual ~ChromeManifestTest(); 18 virtual ~ChromeManifestTest();
19 19
20 // ManifestTest overrides: 20 // ManifestTest overrides:
21 virtual base::FilePath GetTestDataDir() OVERRIDE; 21 virtual base::FilePath GetTestDataDir() override;
22 22
23 private: 23 private:
24 // Force the manifest tests to run as though they are on trunk, since several 24 // Force the manifest tests to run as though they are on trunk, since several
25 // tests rely on manifest features being available that aren't on 25 // tests rely on manifest features being available that aren't on
26 // stable/beta. 26 // stable/beta.
27 // 27 //
28 // These objects nest, so if a test wants to explicitly test the behaviour 28 // These objects nest, so if a test wants to explicitly test the behaviour
29 // on stable or beta, declare it inside that test. 29 // on stable or beta, declare it inside that test.
30 extensions::ScopedCurrentChannel current_channel_; 30 extensions::ScopedCurrentChannel current_channel_;
31 31
32 DISALLOW_COPY_AND_ASSIGN(ChromeManifestTest); 32 DISALLOW_COPY_AND_ASSIGN(ChromeManifestTest);
33 }; 33 };
34 34
35 #endif // CHROME_COMMON_EXTENSIONS_MANIFEST_TESTS_CHROME_MANIFEST_TEST_H_ 35 #endif // CHROME_COMMON_EXTENSIONS_MANIFEST_TESTS_CHROME_MANIFEST_TEST_H_
OLDNEW
« no previous file with comments | « chrome/common/extensions/manifest_handlers/ui_overrides_handler.cc ('k') | chrome/common/extensions/manifest_url_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698