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

Side by Side Diff: chrome/common/extensions/api/extension_action/script_badge_manifest_unittest.cc

Issue 12093036: Move Extension Location and Type enums to Manifest, and move InstallWarning to its own file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/manifest_handler.h" 11 #include "chrome/common/extensions/manifest_handler.h"
12 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h" 12 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"
13 #include "extensions/common/install_warning.h"
13 #include "testing/gmock/include/gmock/gmock.h" 14 #include "testing/gmock/include/gmock/gmock.h"
14 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
15 16
16 namespace errors = extension_manifest_errors; 17 namespace errors = extension_manifest_errors;
17 18
18 namespace extensions { 19 namespace extensions {
19 20
20 namespace { 21 namespace {
21 22
22 std::vector<Extension::InstallWarning> StripMissingFlagWarning( 23 std::vector<InstallWarning> StripMissingFlagWarning(
23 const std::vector<Extension::InstallWarning>& install_warnings) { 24 const InstallWarning::Vector& install_warnings) {
24 std::vector<Extension::InstallWarning> result; 25 InstallWarning::Vector result;
25 for (size_t i = 0; i < install_warnings.size(); ++i) { 26 for (size_t i = 0; i < install_warnings.size(); ++i) {
26 if (install_warnings[i].message != errors::kScriptBadgeRequiresFlag) 27 if (install_warnings[i].message != errors::kScriptBadgeRequiresFlag)
27 result.push_back(install_warnings[i]); 28 result.push_back(install_warnings[i]);
28 } 29 }
29 return result; 30 return result;
30 } 31 }
31 32
32 class ScriptBadgeManifestTest : public ExtensionManifestTest { 33 class ScriptBadgeManifestTest : public ExtensionManifestTest {
33 protected: 34 protected:
34 virtual void SetUp() OVERRIDE { 35 virtual void SetUp() OVERRIDE {
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 .Set("default_title", "Other Extension") 97 .Set("default_title", "Other Extension")
97 .Set("default_icon", "malicious.png"))) 98 .Set("default_icon", "malicious.png")))
98 .Build()); 99 .Build());
99 ASSERT_TRUE(extension.get()); 100 ASSERT_TRUE(extension.get());
100 const ActionInfo* script_badge_info = 101 const ActionInfo* script_badge_info =
101 ActionInfo::GetScriptBadgeInfo(extension); 102 ActionInfo::GetScriptBadgeInfo(extension);
102 ASSERT_TRUE(script_badge_info); 103 ASSERT_TRUE(script_badge_info);
103 104
104 EXPECT_THAT(StripMissingFlagWarning(extension->install_warnings()), 105 EXPECT_THAT(StripMissingFlagWarning(extension->install_warnings()),
105 testing::ElementsAre( 106 testing::ElementsAre(
106 Extension::InstallWarning( 107 InstallWarning(
107 Extension::InstallWarning::FORMAT_TEXT, 108 InstallWarning::FORMAT_TEXT,
108 errors::kScriptBadgeTitleIgnored), 109 errors::kScriptBadgeTitleIgnored),
109 Extension::InstallWarning( 110 InstallWarning(
110 Extension::InstallWarning::FORMAT_TEXT, 111 InstallWarning::FORMAT_TEXT,
111 errors::kScriptBadgeIconIgnored))); 112 errors::kScriptBadgeIconIgnored)));
112 113
113 const ExtensionIconSet& default_icon = 114 const ExtensionIconSet& default_icon =
114 script_badge_info->default_icon; 115 script_badge_info->default_icon;
115 ASSERT_FALSE(default_icon.empty()); 116 ASSERT_FALSE(default_icon.empty());
116 117
117 EXPECT_EQ(1u, default_icon.map().size()); 118 EXPECT_EQ(1u, default_icon.map().size());
118 EXPECT_EQ("icon16.png", 119 EXPECT_EQ("icon16.png",
119 default_icon.Get(extension_misc::EXTENSION_ICON_BITTY, 120 default_icon.Get(extension_misc::EXTENSION_ICON_BITTY,
120 ExtensionIconSet::MATCH_EXACTLY)); 121 ExtensionIconSet::MATCH_EXACTLY));
(...skipping 26 matching lines...) Expand all
147 EXPECT_EQ(2u, default_icon.map().size()); 148 EXPECT_EQ(2u, default_icon.map().size());
148 EXPECT_EQ("icon128.png", 149 EXPECT_EQ("icon128.png",
149 default_icon.Get(extension_misc::EXTENSION_ICON_BITTY, 150 default_icon.Get(extension_misc::EXTENSION_ICON_BITTY,
150 ExtensionIconSet::MATCH_EXACTLY)); 151 ExtensionIconSet::MATCH_EXACTLY));
151 EXPECT_EQ("icon128.png", 152 EXPECT_EQ("icon128.png",
152 default_icon.Get(2 * extension_misc::EXTENSION_ICON_BITTY, 153 default_icon.Get(2 * extension_misc::EXTENSION_ICON_BITTY,
153 ExtensionIconSet::MATCH_EXACTLY)); 154 ExtensionIconSet::MATCH_EXACTLY));
154 } 155 }
155 156
156 } // namespace extensions 157 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698