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 /extensions/common/test_util.h | |
| 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 'extensions/common/test_util.h')
| -rw-r--r-- | extensions/common/test_util.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/extensions/common/test_util.h b/extensions/common/test_util.h index 46ac5d08..862c469 100644 --- a/extensions/common/test_util.h +++ b/extensions/common/test_util.h @@ -8,11 +8,6 @@ #include <string> #include "base/memory/ref_counted.h" -#include "base/memory/scoped_ptr.h" - -namespace base { -class DictionaryValue; -} // namespace base namespace extensions { class Extension; @@ -30,12 +25,6 @@ scoped_refptr<Extension> CreateEmptyExtension(); // Return a very simple extension with a given |id|. scoped_refptr<Extension> CreateExtensionWithID(const std::string& id); -// Parses |json| allowing trailing commas and replacing single quotes with -// double quotes for test readability. If the json fails to parse, calls gtest's -// ADD_FAILURE and returns an empty dictionary. -scoped_ptr<base::DictionaryValue> ParseJsonDictionaryWithSingleQuotes( - std::string json); - } // namespace test_util } // namespace extensions |