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

Unified Diff: chrome/common/extensions/manifest_tests/extension_manifest_test.h

Issue 10544059: Change the platform app manifest structure. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update for getDisplayPath, implement restrictions via _manifest_features.json Created 8 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: chrome/common/extensions/manifest_tests/extension_manifest_test.h
diff --git a/chrome/common/extensions/manifest_tests/extension_manifest_test.h b/chrome/common/extensions/manifest_tests/extension_manifest_test.h
index b125dfaf341a2403d6f142bda71d2f9b1949a07b..4e8741ceefc37fe2977bfb9da2d206f44d80dae8 100644
--- a/chrome/common/extensions/manifest_tests/extension_manifest_test.h
+++ b/chrome/common/extensions/manifest_tests/extension_manifest_test.h
@@ -73,6 +73,20 @@ class ExtensionManifestTest : public testing::Test {
extensions::Extension::INTERNAL,
int flags = extensions::Extension::NO_FLAGS);
+ scoped_refptr<extensions::Extension> LoadAndExpectWarning(
+ const Manifest& manifest,
+ const std::string& expected_error,
+ extensions::Extension::Location location =
+ extensions::Extension::INTERNAL,
+ int flags = extensions::Extension::NO_FLAGS);
+
+ scoped_refptr<extensions::Extension> LoadAndExpectWarning(
+ char const* manifest_name,
+ const std::string& expected_error,
+ extensions::Extension::Location location =
+ extensions::Extension::INTERNAL,
+ int flags = extensions::Extension::NO_FLAGS);
+
void VerifyExpectedError(extensions::Extension* extension,
const std::string& name,
const std::string& error,
@@ -92,9 +106,13 @@ class ExtensionManifestTest : public testing::Test {
void AddPattern(URLPatternSet* extent, const std::string& pattern);
- // used to differentiate between calls to LoadAndExpectError and
- // LoadAndExpectSuccess via function RunTestcases
- enum EXPECT_TYPE { EXPECT_TYPE_ERROR, EXPECT_TYPE_SUCCESS };
+ // used to differentiate between calls to LoadAndExpectError,
+ // LoadAndExpectWarning and LoadAndExpectSuccess via function RunTestcases.
+ enum EXPECT_TYPE {
+ EXPECT_TYPE_ERROR,
+ EXPECT_TYPE_WARNING,
+ EXPECT_TYPE_SUCCESS
+ };
struct Testcase {
std::string manifest_filename_;
« no previous file with comments | « chrome/common/extensions/manifest.cc ('k') | chrome/common/extensions/manifest_tests/extension_manifest_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698