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/common/extensions/manifest_handlers/content_scripts_manifest_unittest.cc | |
| 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/common/extensions/manifest_handlers/content_scripts_manifest_unittest.cc')
| -rw-r--r-- | chrome/common/extensions/manifest_handlers/content_scripts_manifest_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/common/extensions/manifest_handlers/content_scripts_manifest_unittest.cc b/chrome/common/extensions/manifest_handlers/content_scripts_manifest_unittest.cc index 907ab92..8b831da 100644 --- a/chrome/common/extensions/manifest_handlers/content_scripts_manifest_unittest.cc +++ b/chrome/common/extensions/manifest_handlers/content_scripts_manifest_unittest.cc @@ -5,7 +5,7 @@ #include "base/command_line.h" #include "base/strings/string_number_conversions.h" #include "chrome/common/extensions/manifest_handlers/content_scripts_handler.h" -#include "chrome/common/extensions/manifest_tests/extension_manifest_test.h" +#include "chrome/common/extensions/manifest_tests/chrome_manifest_test.h" #include "extensions/common/error_utils.h" #include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" @@ -16,7 +16,7 @@ namespace extensions { namespace errors = manifest_errors; -class ContentScriptsManifestTest : public ExtensionManifestTest { +class ContentScriptsManifestTest : public ChromeManifestTest { }; TEST_F(ContentScriptsManifestTest, MatchPattern) { |