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

Unified Diff: chrome/common/extensions/manifest_tests/extension_manifests_chromepermission_unittest.cc

Issue 572813002: Refactor ExtensionManifestTest to allow usage in src/extensions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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_manifests_chromepermission_unittest.cc
diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_chromepermission_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_chromepermission_unittest.cc
index ad0525076ee6fe35b3234eca03ad02aa28567a57..d5b112f16e5cd12bcab0d630796b9af7fc218a3f 100644
--- a/chrome/common/extensions/manifest_tests/extension_manifests_chromepermission_unittest.cc
+++ b/chrome/common/extensions/manifest_tests/extension_manifests_chromepermission_unittest.cc
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "base/command_line.h"
-#include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"
+#include "chrome/common/extensions/manifest_tests/chrome_manifest_test.h"
#include "chrome/common/url_constants.h"
#include "extensions/common/error_utils.h"
#include "extensions/common/extension.h"
@@ -17,14 +17,16 @@ namespace extensions {
namespace errors = manifest_errors;
-TEST_F(ExtensionManifestTest, ChromeURLPermissionInvalid) {
+typedef ChromeManifestTest ChromePermissionManifestTest;
+
+TEST_F(ChromePermissionManifestTest, ChromeURLPermissionInvalid) {
LoadAndExpectWarning("permission_chrome_url_invalid.json",
ErrorUtils::FormatErrorMessage(
errors::kInvalidPermissionScheme,
chrome::kChromeUINewTabURL));
}
-TEST_F(ExtensionManifestTest, ChromeURLPermissionAllowedWithFlag) {
+TEST_F(ChromePermissionManifestTest, ChromeURLPermissionAllowedWithFlag) {
// Ignore the policy delegate for this test.
PermissionsData::SetPolicyDelegate(NULL);
CommandLine::ForCurrentProcess()->AppendSwitch(
@@ -39,13 +41,14 @@ TEST_F(ExtensionManifestTest, ChromeURLPermissionAllowedWithFlag) {
<< error;
}
-TEST_F(ExtensionManifestTest, ChromeResourcesPermissionValidOnlyForComponents) {
+TEST_F(ChromePermissionManifestTest,
+ ChromeResourcesPermissionValidOnlyForComponents) {
LoadAndExpectWarning("permission_chrome_resources_url.json",
ErrorUtils::FormatErrorMessage(
errors::kInvalidPermissionScheme,
"chrome://resources/"));
std::string error;
- LoadExtension(Manifest("permission_chrome_resources_url.json"),
+ LoadExtension(ManifestData("permission_chrome_resources_url.json"),
&error,
extensions::Manifest::COMPONENT,
Extension::NO_FLAGS);

Powered by Google App Engine
This is Rietveld 408576698