diff options
| author | jamescook <jamescook@chromium.org> | 2014-09-16 21:05:10 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-17 04:05:20 +0000 |
| commit | f79df3346ce523b2c44c7d99e0b819788c432203 (patch) | |
| tree | e23b3c8901069867ee43fb42e07bff0ecc74df91 /chrome/chrome_tests_unit.gypi | |
| parent | 0c0930e5a6d6ca2921f6121f20d5de7604af3e5a (diff) | |
| download | chromium_src-f79df3346ce523b2c44c7d99e0b819788c432203.zip chromium_src-f79df3346ce523b2c44c7d99e0b819788c432203.tar.gz chromium_src-f79df3346ce523b2c44c7d99e0b819788c432203.tar.bz2 | |
Reland: Refactor ExtensionManifestTest to allow usage in src/extensions
Original CL broke the Win official bots because they report their default
version channel as "canary" instead of "trunk".
https://codereview.chromium.org/572813002
Original description:
This refactor will allow some manifest tests running in Chrome's unit_tests
suite to move to the extensions_unittests suite.
* Rename ExtensionManifestTest to extensions::ManifestTest and move it into
src/extensions.
* Introduce ChromeManifestTest to load manifests from Chrome's test data dir.
* Eliminate some unnecessary use of chrome::VersionInfo::Channel.
* Move SharedModuleManifestTest to extensions_unittests as an example.
FileHandlerManifestTest and ExternallyConnectableManifestTest will be next,
but require more refactoring (e.g. of permissions).
BUG=397165
TEST=unit_tests, extensions_unittests
TBR=rockot@chromium.org
Review URL: https://codereview.chromium.org/574173002
Cr-Commit-Position: refs/heads/master@{#295225}
Diffstat (limited to 'chrome/chrome_tests_unit.gypi')
| -rw-r--r-- | chrome/chrome_tests_unit.gypi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi index a8cb9dc..2ee572e 100644 --- a/chrome/chrome_tests_unit.gypi +++ b/chrome/chrome_tests_unit.gypi @@ -19,7 +19,6 @@ '../extensions/common/file_util_unittest.cc', '../extensions/common/manifest_handlers/externally_connectable_unittest.cc', '../extensions/common/manifest_handlers/file_handler_manifest_unittest.cc', - '../extensions/common/manifest_handlers/shared_module_manifest_unittest.cc', # histograms.xml is analyzed by AboutFlagsHistogramTest, so this # dependency is needed to make commit bots run unit_tests on # histograms.xml changes. @@ -1280,7 +1279,8 @@ 'common/extensions/manifest_handlers/exclude_matches_manifest_unittest.cc', 'common/extensions/manifest_handlers/settings_overrides_handler_unittest.cc', 'common/extensions/manifest_handlers/ui_overrides_handler_unittest.cc', - 'common/extensions/manifest_tests/extension_manifest_test.cc', + 'common/extensions/manifest_tests/chrome_manifest_test.cc', + 'common/extensions/manifest_tests/chrome_manifest_test.h', 'common/extensions/manifest_tests/extension_manifests_about_unittest.cc', 'common/extensions/manifest_tests/extension_manifests_background_unittest.cc', 'common/extensions/manifest_tests/extension_manifests_chromepermission_unittest.cc', |