| Index: chrome/common/extensions/manifest_tests/extension_manifests_web_unittest.cc
|
| diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_web_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_web_unittest.cc
|
| index fd89eda3488a24c366551af7a66d151f323f15b7..2406112eefc05c8a3430475d9b89d4c03ca64b86 100644
|
| --- a/chrome/common/extensions/manifest_tests/extension_manifests_web_unittest.cc
|
| +++ b/chrome/common/extensions/manifest_tests/extension_manifests_web_unittest.cc
|
| @@ -2,11 +2,12 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"
|
| -
|
| #include "base/strings/string_number_conversions.h"
|
| -#include "base/utf_string_conversions.h"
|
| +#include "chrome/common/extensions/app_launch_manifest_handler.h"
|
| +#include "chrome/common/extensions/extension.h"
|
| #include "chrome/common/extensions/extension_manifest_constants.h"
|
| +#include "chrome/common/extensions/manifest_handler.h"
|
| +#include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"
|
| #include "extensions/common/error_utils.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| @@ -15,7 +16,21 @@ using extensions::Extension;
|
|
|
| namespace errors = extension_manifest_errors;
|
|
|
| -TEST_F(ExtensionManifestTest, AppWebUrls) {
|
| +class WebManifestTest : public ExtensionManifestTest {
|
| + virtual void SetUp() OVERRIDE {
|
| + ExtensionManifestTest::SetUp();
|
| + std::vector<std::string> app_launch_keys(
|
| + extensions::AppLaunchManifestHandler::keys());
|
| + linked_ptr<extensions::AppLaunchManifestHandler> app_launch_handler(
|
| + new extensions::AppLaunchManifestHandler);
|
| + for (size_t i = 0; i < app_launch_keys.size(); ++i) {
|
| + extensions::ManifestHandler::Register(app_launch_keys[i],
|
| + app_launch_handler);
|
| + }
|
| + }
|
| +};
|
| +
|
| +TEST_F(WebManifestTest, AppWebUrls) {
|
| Testcase testcases[] = {
|
| Testcase("web_urls_wrong_type.json", errors::kInvalidWebURLs),
|
| Testcase("web_urls_invalid_1.json",
|
|
|