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

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

Issue 15836003: Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 6 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/extension_builder.h" 6 #include "chrome/common/extensions/extension_builder.h"
7 #include "chrome/common/extensions/extension_constants.h" 7 #include "chrome/common/extensions/extension_constants.h"
8 #include "chrome/common/extensions/extension_icon_set.h" 8 #include "chrome/common/extensions/extension_icon_set.h"
9 #include "chrome/common/extensions/extension_manifest_constants.h" 9 #include "chrome/common/extensions/extension_manifest_constants.h"
10 #include "chrome/common/extensions/feature_switch.h" 10 #include "chrome/common/extensions/feature_switch.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 .Set("icons", DictionaryBuilder() 46 .Set("icons", DictionaryBuilder()
47 .Set("16", "icon16.png") 47 .Set("16", "icon16.png")
48 .Set("32", "icon32.png") 48 .Set("32", "icon32.png")
49 .Set("19", "icon19.png") 49 .Set("19", "icon19.png")
50 .Set("48", "icon48.png")) 50 .Set("48", "icon48.png"))
51 .Set("script_badge", DictionaryBuilder() 51 .Set("script_badge", DictionaryBuilder()
52 .Set("default_popup", "popup.html"))) 52 .Set("default_popup", "popup.html")))
53 .Build()); 53 .Build());
54 ASSERT_TRUE(extension.get()); 54 ASSERT_TRUE(extension.get());
55 const ActionInfo* script_badge_info = 55 const ActionInfo* script_badge_info =
56 ActionInfo::GetScriptBadgeInfo(extension); 56 ActionInfo::GetScriptBadgeInfo(extension.get());
57 ASSERT_TRUE(script_badge_info); 57 ASSERT_TRUE(script_badge_info);
58 EXPECT_THAT(StripMissingFlagWarning(extension->install_warnings()), 58 EXPECT_THAT(StripMissingFlagWarning(extension->install_warnings()),
59 testing::ElementsAre(/*empty*/)); 59 testing::ElementsAre(/*empty*/));
60 60
61 const ExtensionIconSet& default_icon = 61 const ExtensionIconSet& default_icon =
62 script_badge_info->default_icon; 62 script_badge_info->default_icon;
63 // Should have a default icon set. 63 // Should have a default icon set.
64 ASSERT_FALSE(default_icon.empty()); 64 ASSERT_FALSE(default_icon.empty());
65 65
66 // Verify that correct icon paths are registered in default_icon. 66 // Verify that correct icon paths are registered in default_icon.
(...skipping 19 matching lines...) Expand all
86 .Set("description", 86 .Set("description",
87 "Check that a simple script_badge section parses") 87 "Check that a simple script_badge section parses")
88 .Set("icons", DictionaryBuilder() 88 .Set("icons", DictionaryBuilder()
89 .Set("16", "icon16.png")) 89 .Set("16", "icon16.png"))
90 .Set("script_badge", DictionaryBuilder() 90 .Set("script_badge", DictionaryBuilder()
91 .Set("default_title", "Other Extension") 91 .Set("default_title", "Other Extension")
92 .Set("default_icon", "malicious.png"))) 92 .Set("default_icon", "malicious.png")))
93 .Build()); 93 .Build());
94 ASSERT_TRUE(extension.get()); 94 ASSERT_TRUE(extension.get());
95 const ActionInfo* script_badge_info = 95 const ActionInfo* script_badge_info =
96 ActionInfo::GetScriptBadgeInfo(extension); 96 ActionInfo::GetScriptBadgeInfo(extension.get());
97 ASSERT_TRUE(script_badge_info); 97 ASSERT_TRUE(script_badge_info);
98 98
99 EXPECT_THAT(StripMissingFlagWarning(extension->install_warnings()), 99 EXPECT_THAT(StripMissingFlagWarning(extension->install_warnings()),
100 testing::ElementsAre( 100 testing::ElementsAre(
101 InstallWarning(InstallWarning::FORMAT_TEXT, 101 InstallWarning(InstallWarning::FORMAT_TEXT,
102 errors::kScriptBadgeTitleIgnored), 102 errors::kScriptBadgeTitleIgnored),
103 InstallWarning(InstallWarning::FORMAT_TEXT, 103 InstallWarning(InstallWarning::FORMAT_TEXT,
104 errors::kScriptBadgeIconIgnored))); 104 errors::kScriptBadgeIconIgnored)));
105 105
106 const ExtensionIconSet& default_icon = 106 const ExtensionIconSet& default_icon =
(...skipping 15 matching lines...) Expand all
122 .Set("manifest_version", 2) 122 .Set("manifest_version", 2)
123 .Set("name", "my extension") 123 .Set("name", "my extension")
124 .Set("version", "1.0.0.0") 124 .Set("version", "1.0.0.0")
125 .Set("description", 125 .Set("description",
126 "Check that a simple script_badge section parses") 126 "Check that a simple script_badge section parses")
127 .Set("icons", DictionaryBuilder() 127 .Set("icons", DictionaryBuilder()
128 .Set("128", "icon128.png"))) 128 .Set("128", "icon128.png")))
129 .Build()); 129 .Build());
130 ASSERT_TRUE(extension.get()); 130 ASSERT_TRUE(extension.get());
131 const ActionInfo* script_badge_info = 131 const ActionInfo* script_badge_info =
132 ActionInfo::GetScriptBadgeInfo(extension); 132 ActionInfo::GetScriptBadgeInfo(extension.get());
133 ASSERT_TRUE(script_badge_info); 133 ASSERT_TRUE(script_badge_info);
134 EXPECT_THAT(extension->install_warnings(), 134 EXPECT_THAT(extension->install_warnings(),
135 testing::ElementsAre(/*empty*/)); 135 testing::ElementsAre(/*empty*/));
136 136
137 const ExtensionIconSet& default_icon = 137 const ExtensionIconSet& default_icon =
138 script_badge_info->default_icon; 138 script_badge_info->default_icon;
139 ASSERT_FALSE(default_icon.empty()) << "Should fall back to the 128px icon."; 139 ASSERT_FALSE(default_icon.empty()) << "Should fall back to the 128px icon.";
140 EXPECT_EQ(2u, default_icon.map().size()); 140 EXPECT_EQ(2u, default_icon.map().size());
141 EXPECT_EQ("icon128.png", 141 EXPECT_EQ("icon128.png",
142 default_icon.Get(extension_misc::EXTENSION_ICON_BITTY, 142 default_icon.Get(extension_misc::EXTENSION_ICON_BITTY,
143 ExtensionIconSet::MATCH_EXACTLY)); 143 ExtensionIconSet::MATCH_EXACTLY));
144 EXPECT_EQ("icon128.png", 144 EXPECT_EQ("icon128.png",
145 default_icon.Get(2 * extension_misc::EXTENSION_ICON_BITTY, 145 default_icon.Get(2 * extension_misc::EXTENSION_ICON_BITTY,
146 ExtensionIconSet::MATCH_EXACTLY)); 146 ExtensionIconSet::MATCH_EXACTLY));
147 } 147 }
148 148
149 } // namespace extensions 149 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698