diff options
author | James Cook <jamescook@chromium.org> | 2014-09-16 16:11:10 -0700 |
---|---|---|
committer | James Cook <jamescook@chromium.org> | 2014-09-16 23:11:46 +0000 |
commit | 2bc038699947d1b05b15d35c5c5b3d4eac934f5d (patch) | |
tree | 0581666f67d88e9535f65abe348f63d0989d8b10 /chrome/chrome_tests_unit.gypi | |
parent | 23fdae2acd89612f5198651e51c5aa7557667a2b (diff) | |
download | chromium_src-2bc038699947d1b05b15d35c5c5b3d4eac934f5d.zip chromium_src-2bc038699947d1b05b15d35c5c5b3d4eac934f5d.tar.gz chromium_src-2bc038699947d1b05b15d35c5c5b3d4eac934f5d.tar.bz2 |
Revert "Refactor ExtensionManifestTest to allow usage in src/extensions"
This reverts commit bd1cc624f6fd9761409ee8a8ac5cfd3a5896c87a.
Original CL:
Refactor ExtensionManifestTest to allow usage in src/extensions
https://codereview.chromium.org/572813002
Reason:
Broke the official Win builders due to differences in how they report their
version channel.
http://master.chrome.corp.google.com:8011/builders/win%20trunk/builds/26150
BUG=414917
TEST=unit_tests
TBR=rockot@chromium.org
Review URL: https://codereview.chromium.org/578653005
Cr-Commit-Position: refs/heads/master@{#295172}
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 2ee572e..a8cb9dc 100644 --- a/chrome/chrome_tests_unit.gypi +++ b/chrome/chrome_tests_unit.gypi @@ -19,6 +19,7 @@ '../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. @@ -1279,8 +1280,7 @@ '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/chrome_manifest_test.cc', - 'common/extensions/manifest_tests/chrome_manifest_test.h', + 'common/extensions/manifest_tests/extension_manifest_test.cc', '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', |