| Index: chrome/common/extensions/extension_manifests_unittest.cc
|
| diff --git a/chrome/common/extensions/extension_manifests_unittest.cc b/chrome/common/extensions/extension_manifests_unittest.cc
|
| index cd3f5f5d73d771d361aae2e616ecec3ec67b3c54..f3eff85ecfda3d5f45c78f84885216145ba4f191 100644
|
| --- a/chrome/common/extensions/extension_manifests_unittest.cc
|
| +++ b/chrome/common/extensions/extension_manifests_unittest.cc
|
| @@ -589,7 +589,7 @@ TEST_F(ExtensionManifestTest, Sidebar) {
|
| TEST_F(ExtensionManifestTest, DisallowHybridApps) {
|
| LoadAndExpectError("disallow_hybrid_1.json",
|
| ExtensionErrorUtils::FormatErrorMessage(
|
| - errors::kHostedAppsCannotIncludeExtensionFeatures,
|
| + errors::kFeatureNotAllowed,
|
| keys::kBrowserAction));
|
| LoadAndExpectError("disallow_hybrid_2.json",
|
| errors::kBackgroundPermissionNeeded);
|
| @@ -735,8 +735,14 @@ TEST_F(ExtensionManifestTest, NormalizeIconPaths) {
|
|
|
| TEST_F(ExtensionManifestTest, DisallowMultipleUISurfaces) {
|
| LoadAndExpectError("multiple_ui_surfaces_1.json", errors::kOneUISurfaceOnly);
|
| - LoadAndExpectError("multiple_ui_surfaces_2.json", errors::kOneUISurfaceOnly);
|
| - LoadAndExpectError("multiple_ui_surfaces_3.json", errors::kOneUISurfaceOnly);
|
| + LoadAndExpectError("multiple_ui_surfaces_2.json",
|
| + ExtensionErrorUtils::FormatErrorMessage(
|
| + errors::kFeatureNotAllowed,
|
| + keys::kBrowserAction));
|
| + LoadAndExpectError("multiple_ui_surfaces_3.json",
|
| + ExtensionErrorUtils::FormatErrorMessage(
|
| + errors::kFeatureNotAllowed,
|
| + keys::kBrowserAction));
|
| }
|
|
|
| TEST_F(ExtensionManifestTest, ParseHomepageURLs) {
|
|
|