| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/common/extensions/api/extension_action/action_info.h" | 5 #include "chrome/common/extensions/api/extension_action/action_info.h" |
| 6 #include "chrome/common/extensions/api/extension_action/script_badge_handler.h" | 6 #include "chrome/common/extensions/api/extension_action/script_badge_handler.h" |
| 7 #include "chrome/common/extensions/extension_builder.h" | 7 #include "chrome/common/extensions/extension_builder.h" |
| 8 #include "chrome/common/extensions/extension_constants.h" | 8 #include "chrome/common/extensions/extension_constants.h" |
| 9 #include "chrome/common/extensions/extension_icon_set.h" | 9 #include "chrome/common/extensions/extension_icon_set.h" |
| 10 #include "chrome/common/extensions/extension_manifest_constants.h" | 10 #include "chrome/common/extensions/extension_manifest_constants.h" |
| 11 #include "chrome/common/extensions/feature_switch.h" | 11 #include "chrome/common/extensions/feature_switch.h" |
| 12 #include "chrome/common/extensions/manifest_handler.h" | 12 #include "chrome/common/extensions/manifest_handler.h" |
| 13 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h" | 13 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h" |
| 14 #include "extensions/common/install_warning.h" |
| 14 #include "testing/gmock/include/gmock/gmock.h" | 15 #include "testing/gmock/include/gmock/gmock.h" |
| 15 #include "testing/gtest/include/gtest/gtest.h" | 16 #include "testing/gtest/include/gtest/gtest.h" |
| 16 | 17 |
| 17 namespace errors = extension_manifest_errors; | 18 namespace errors = extension_manifest_errors; |
| 18 | 19 |
| 19 namespace extensions { | 20 namespace extensions { |
| 20 | 21 |
| 21 namespace { | 22 namespace { |
| 22 | 23 |
| 23 std::vector<Extension::InstallWarning> StripMissingFlagWarning( | 24 std::vector<InstallWarning> StripMissingFlagWarning( |
| 24 const std::vector<Extension::InstallWarning>& install_warnings) { | 25 const std::vector<InstallWarning>& install_warnings) { |
| 25 std::vector<Extension::InstallWarning> result; | 26 std::vector<InstallWarning> result; |
| 26 for (size_t i = 0; i < install_warnings.size(); ++i) { | 27 for (size_t i = 0; i < install_warnings.size(); ++i) { |
| 27 if (install_warnings[i].message != errors::kScriptBadgeRequiresFlag) | 28 if (install_warnings[i].message != errors::kScriptBadgeRequiresFlag) |
| 28 result.push_back(install_warnings[i]); | 29 result.push_back(install_warnings[i]); |
| 29 } | 30 } |
| 30 return result; | 31 return result; |
| 31 } | 32 } |
| 32 | 33 |
| 33 class ScriptBadgeManifestTest : public ExtensionManifestTest { | 34 class ScriptBadgeManifestTest : public ExtensionManifestTest { |
| 34 protected: | 35 protected: |
| 35 virtual void SetUp() OVERRIDE { | 36 virtual void SetUp() OVERRIDE { |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 97 .Set("default_title", "Other Extension") | 98 .Set("default_title", "Other Extension") |
| 98 .Set("default_icon", "malicious.png"))) | 99 .Set("default_icon", "malicious.png"))) |
| 99 .Build()); | 100 .Build()); |
| 100 ASSERT_TRUE(extension.get()); | 101 ASSERT_TRUE(extension.get()); |
| 101 const ActionInfo* script_badge_info = | 102 const ActionInfo* script_badge_info = |
| 102 ActionInfo::GetScriptBadgeInfo(extension); | 103 ActionInfo::GetScriptBadgeInfo(extension); |
| 103 ASSERT_TRUE(script_badge_info); | 104 ASSERT_TRUE(script_badge_info); |
| 104 | 105 |
| 105 EXPECT_THAT(StripMissingFlagWarning(extension->install_warnings()), | 106 EXPECT_THAT(StripMissingFlagWarning(extension->install_warnings()), |
| 106 testing::ElementsAre( | 107 testing::ElementsAre( |
| 107 Extension::InstallWarning( | 108 InstallWarning(InstallWarning::FORMAT_TEXT, |
| 108 Extension::InstallWarning::FORMAT_TEXT, | 109 errors::kScriptBadgeTitleIgnored), |
| 109 errors::kScriptBadgeTitleIgnored), | 110 InstallWarning(InstallWarning::FORMAT_TEXT, |
| 110 Extension::InstallWarning( | 111 errors::kScriptBadgeIconIgnored))); |
| 111 Extension::InstallWarning::FORMAT_TEXT, | |
| 112 errors::kScriptBadgeIconIgnored))); | |
| 113 | 112 |
| 114 const ExtensionIconSet& default_icon = | 113 const ExtensionIconSet& default_icon = |
| 115 script_badge_info->default_icon; | 114 script_badge_info->default_icon; |
| 116 ASSERT_FALSE(default_icon.empty()); | 115 ASSERT_FALSE(default_icon.empty()); |
| 117 | 116 |
| 118 EXPECT_EQ(1u, default_icon.map().size()); | 117 EXPECT_EQ(1u, default_icon.map().size()); |
| 119 EXPECT_EQ("icon16.png", | 118 EXPECT_EQ("icon16.png", |
| 120 default_icon.Get(extension_misc::EXTENSION_ICON_BITTY, | 119 default_icon.Get(extension_misc::EXTENSION_ICON_BITTY, |
| 121 ExtensionIconSet::MATCH_EXACTLY)); | 120 ExtensionIconSet::MATCH_EXACTLY)); |
| 122 | 121 |
| (...skipping 25 matching lines...) Expand all Loading... |
| 148 EXPECT_EQ(2u, default_icon.map().size()); | 147 EXPECT_EQ(2u, default_icon.map().size()); |
| 149 EXPECT_EQ("icon128.png", | 148 EXPECT_EQ("icon128.png", |
| 150 default_icon.Get(extension_misc::EXTENSION_ICON_BITTY, | 149 default_icon.Get(extension_misc::EXTENSION_ICON_BITTY, |
| 151 ExtensionIconSet::MATCH_EXACTLY)); | 150 ExtensionIconSet::MATCH_EXACTLY)); |
| 152 EXPECT_EQ("icon128.png", | 151 EXPECT_EQ("icon128.png", |
| 153 default_icon.Get(2 * extension_misc::EXTENSION_ICON_BITTY, | 152 default_icon.Get(2 * extension_misc::EXTENSION_ICON_BITTY, |
| 154 ExtensionIconSet::MATCH_EXACTLY)); | 153 ExtensionIconSet::MATCH_EXACTLY)); |
| 155 } | 154 } |
| 156 | 155 |
| 157 } // namespace extensions | 156 } // namespace extensions |
| OLD | NEW |