| Index: chrome/common/extensions/manifest_tests/extension_manifests_initvalue_unittest.cc
|
| diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_initvalue_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_initvalue_unittest.cc
|
| index 30e597d9ca61958876cf860edc67cd97255dca47..3e51e60652249b078c7950560896d07961011c2f 100644
|
| --- a/chrome/common/extensions/manifest_tests/extension_manifests_initvalue_unittest.cc
|
| +++ b/chrome/common/extensions/manifest_tests/extension_manifests_initvalue_unittest.cc
|
| @@ -8,8 +8,10 @@
|
| #include "base/path_service.h"
|
| #include "base/utf_string_conversions.h"
|
| #include "chrome/common/chrome_paths.h"
|
| +#include "chrome/common/extensions/api/content_scripts/content_scripts_handler.h"
|
| #include "chrome/common/extensions/extension.h"
|
| #include "chrome/common/extensions/extension_manifest_constants.h"
|
| +#include "chrome/common/extensions/manifest_handler.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
|
|
| @@ -19,7 +21,18 @@
|
|
|
| namespace errors = extension_manifest_errors;
|
|
|
| -TEST_F(ExtensionManifestTest, InitFromValueInvalid) {
|
| +namespace extensions {
|
| +
|
| +class InitFromValueManifestTest : public ExtensionManifestTest {
|
| + protected:
|
| + virtual void SetUp() OVERRIDE {
|
| + ExtensionManifestTest::SetUp();
|
| + ManifestHandler::Register(extension_manifest_keys::kContentScripts,
|
| + new ContentScriptsHandler);
|
| + }
|
| +};
|
| +
|
| +TEST_F(InitFromValueManifestTest, InitFromValueInvalid) {
|
| Testcase testcases[] = {
|
| Testcase("init_invalid_version_missing.json", errors::kInvalidVersion),
|
| Testcase("init_invalid_version_invalid.json", errors::kInvalidVersion),
|
| @@ -71,7 +84,7 @@ TEST_F(ExtensionManifestTest, InitFromValueInvalid) {
|
| EXPECT_TYPE_ERROR);
|
| }
|
|
|
| -TEST_F(ExtensionManifestTest, InitFromValueValid) {
|
| +TEST_F(InitFromValueManifestTest, InitFromValueValid) {
|
| scoped_refptr<extensions::Extension> extension(LoadAndExpectSuccess(
|
| "init_valid_minimal.json"));
|
|
|
| @@ -122,7 +135,7 @@ TEST_F(ExtensionManifestTest, InitFromValueValid) {
|
| EXPECT_TYPE_SUCCESS);
|
| }
|
|
|
| -TEST_F(ExtensionManifestTest, InitFromValueValidNameInRTL) {
|
| +TEST_F(InitFromValueManifestTest, InitFromValueValidNameInRTL) {
|
| #if defined(TOOLKIT_GTK)
|
| GtkTextDirection gtk_dir = gtk_widget_get_default_direction();
|
| gtk_widget_set_default_direction(GTK_TEXT_DIR_RTL);
|
| @@ -153,3 +166,5 @@ TEST_F(ExtensionManifestTest, InitFromValueValidNameInRTL) {
|
| base::i18n::SetICUDefaultLocale(locale);
|
| #endif
|
| }
|
| +
|
| +} // namespace extensions
|
|
|