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

Side by Side Diff: chrome/browser/extensions/extension_action_manager_unittest.cc

Issue 2152373003: [Extensions] Code Cleanup - Remove redundant smart-ptr get()s (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 5 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/browser/extensions/extension_action_manager.h" 5 #include "chrome/browser/extensions/extension_action_manager.h"
6 6
7 #include "base/strings/string_number_conversions.h" 7 #include "base/strings/string_number_conversions.h"
8 #include "chrome/browser/extensions/extension_action.h" 8 #include "chrome/browser/extensions/extension_action.h"
9 #include "chrome/test/base/testing_profile.h" 9 #include "chrome/test/base/testing_profile.h"
10 #include "content/public/test/test_browser_thread_bundle.h" 10 #include "content/public/test/test_browser_thread_bundle.h"
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 // replacement for missing action default_icons keys. "19" should not be 121 // replacement for missing action default_icons keys. "19" should not be
122 // replaced because "38" can always be used in its place. 122 // replaced because "38" can always be used in its place.
123 scoped_refptr<Extension> extension = 123 scoped_refptr<Extension> extension =
124 BuildExtension(DictionaryBuilder() 124 BuildExtension(DictionaryBuilder()
125 .Set("48", "icon48.png") 125 .Set("48", "icon48.png")
126 .Set("128", "icon128.png") 126 .Set("128", "icon128.png")
127 .Build(), 127 .Build(),
128 DictionaryBuilder().Build(), action_type); 128 DictionaryBuilder().Build(), action_type);
129 129
130 ASSERT_TRUE(extension.get()); 130 ASSERT_TRUE(extension.get());
131 const ExtensionAction* action = GetAction(action_type, *extension.get()); 131 const ExtensionAction* action = GetAction(action_type, *extension);
132 ASSERT_TRUE(action); 132 ASSERT_TRUE(action);
133 133
134 ASSERT_TRUE(TitlesMatch(*extension.get(), *action)); 134 ASSERT_TRUE(TitlesMatch(*extension, *action));
135 ASSERT_TRUE(IconsMatch(*extension.get(), 48, *action, 38)); 135 ASSERT_TRUE(IconsMatch(*extension, 48, *action, 38));
136 136
137 // Test that the action's missing default_icons are not replaced with smaller 137 // Test that the action's missing default_icons are not replaced with smaller
138 // icons. 138 // icons.
139 extension = 139 extension =
140 BuildExtension(DictionaryBuilder().Set("24", "icon24.png").Build(), 140 BuildExtension(DictionaryBuilder().Set("24", "icon24.png").Build(),
141 DictionaryBuilder().Build(), action_type); 141 DictionaryBuilder().Build(), action_type);
142 142
143 ASSERT_TRUE(extension.get()); 143 ASSERT_TRUE(extension.get());
144 action = GetAction(action_type, *extension.get()); 144 action = GetAction(action_type, *extension);
145 ASSERT_TRUE(action); 145 ASSERT_TRUE(action);
146 146
147 ASSERT_TRUE(IconsMatch(*extension.get(), 24, *action, 19)); 147 ASSERT_TRUE(IconsMatch(*extension, 24, *action, 19));
148 ASSERT_FALSE(IconsMatch(*extension.get(), 24, *action, 38)); 148 ASSERT_FALSE(IconsMatch(*extension, 24, *action, 38));
149 149
150 // Test that an action's 19px icon is not replaced if a 38px action icon 150 // Test that an action's 19px icon is not replaced if a 38px action icon
151 // exists. 151 // exists.
152 extension = BuildExtension( 152 extension = BuildExtension(
153 DictionaryBuilder().Set("128", "icon128.png").Build(), 153 DictionaryBuilder().Set("128", "icon128.png").Build(),
154 DictionaryBuilder() 154 DictionaryBuilder()
155 .Set("default_icon", 155 .Set("default_icon",
156 DictionaryBuilder().Set("38", "action38.png").Build()) 156 DictionaryBuilder().Set("38", "action38.png").Build())
157 .Build(), 157 .Build(),
158 action_type); 158 action_type);
159 159
160 ASSERT_TRUE(extension.get()); 160 ASSERT_TRUE(extension.get());
161 action = GetAction(action_type, *extension.get()); 161 action = GetAction(action_type, *extension);
162 ASSERT_TRUE(action); 162 ASSERT_TRUE(action);
163 163
164 ASSERT_FALSE(IconsMatch(*extension.get(), 128, *action, 19)); 164 ASSERT_FALSE(IconsMatch(*extension, 128, *action, 19));
165 165
166 // Test that existing default_icons and default_title are not replaced. 166 // Test that existing default_icons and default_title are not replaced.
167 extension = 167 extension =
168 BuildExtension(DictionaryBuilder().Set("128", "icon128.png").Build(), 168 BuildExtension(DictionaryBuilder().Set("128", "icon128.png").Build(),
169 DictionaryBuilder() 169 DictionaryBuilder()
170 .Set("default_title", "Action!") 170 .Set("default_title", "Action!")
171 .Set("default_icon", DictionaryBuilder() 171 .Set("default_icon", DictionaryBuilder()
172 .Set("19", "action19.png") 172 .Set("19", "action19.png")
173 .Set("38", "action38.png") 173 .Set("38", "action38.png")
174 .Build()) 174 .Build())
175 .Build(), 175 .Build(),
176 action_type); 176 action_type);
177 177
178 ASSERT_TRUE(extension.get()); 178 ASSERT_TRUE(extension.get());
179 action = GetAction(action_type, *extension.get()); 179 action = GetAction(action_type, *extension);
180 ASSERT_TRUE(action); 180 ASSERT_TRUE(action);
181 181
182 ASSERT_FALSE(TitlesMatch(*extension.get(), *action)); 182 ASSERT_FALSE(TitlesMatch(*extension, *action));
183 ASSERT_FALSE(IconsMatch(*extension.get(), 128, *action, 19)); 183 ASSERT_FALSE(IconsMatch(*extension, 128, *action, 19));
184 ASSERT_FALSE(IconsMatch(*extension.get(), 128, *action, 38)); 184 ASSERT_FALSE(IconsMatch(*extension, 128, *action, 38));
185 } 185 }
186 186
187 namespace { 187 namespace {
188 188
189 TEST_F(ExtensionActionManagerTest, PopulateBrowserAction) { 189 TEST_F(ExtensionActionManagerTest, PopulateBrowserAction) {
190 TestPopulateMissingValues(kBrowserAction); 190 TestPopulateMissingValues(kBrowserAction);
191 } 191 }
192 192
193 TEST_F(ExtensionActionManagerTest, PopulatePageAction) { 193 TEST_F(ExtensionActionManagerTest, PopulatePageAction) {
194 TestPopulateMissingValues(kPageAction); 194 TestPopulateMissingValues(kPageAction);
195 } 195 }
196 196
197 TEST_F(ExtensionActionManagerTest, GetBestFitActionTest) { 197 TEST_F(ExtensionActionManagerTest, GetBestFitActionTest) {
198 // Create an extension with page action defaults. 198 // Create an extension with page action defaults.
199 scoped_refptr<Extension> extension = BuildExtension( 199 scoped_refptr<Extension> extension = BuildExtension(
200 DictionaryBuilder().Set("48", "icon48.png").Build(), 200 DictionaryBuilder().Set("48", "icon48.png").Build(),
201 DictionaryBuilder() 201 DictionaryBuilder()
202 .Set("default_title", "Action!") 202 .Set("default_title", "Action!")
203 .Set("default_icon", 203 .Set("default_icon",
204 DictionaryBuilder().Set("38", "action38.png").Build()) 204 DictionaryBuilder().Set("38", "action38.png").Build())
205 .Build(), 205 .Build(),
206 kPageAction); 206 kPageAction);
207 ASSERT_TRUE(extension.get()); 207 ASSERT_TRUE(extension.get());
208 208
209 // Get a "best fit" browser action for |extension|. 209 // Get a "best fit" browser action for |extension|.
210 std::unique_ptr<ExtensionAction> action = 210 std::unique_ptr<ExtensionAction> action =
211 manager()->GetBestFitAction(*extension.get(), ActionInfo::TYPE_BROWSER); 211 manager()->GetBestFitAction(*extension, ActionInfo::TYPE_BROWSER);
212 ASSERT_TRUE(action.get()); 212 ASSERT_TRUE(action.get());
213 ASSERT_EQ(action->action_type(), ActionInfo::TYPE_BROWSER); 213 ASSERT_EQ(action->action_type(), ActionInfo::TYPE_BROWSER);
214 214
215 // |action|'s title and default icon should match |extension|'s page action's. 215 // |action|'s title and default icon should match |extension|'s page action's.
216 ASSERT_EQ(action->GetTitle(ExtensionAction::kDefaultTabId), "Action!"); 216 ASSERT_EQ(action->GetTitle(ExtensionAction::kDefaultTabId), "Action!");
217 ASSERT_EQ(action->default_icon()->Get(38, ExtensionIconSet::MATCH_EXACTLY), 217 ASSERT_EQ(action->default_icon()->Get(38, ExtensionIconSet::MATCH_EXACTLY),
218 "action38.png"); 218 "action38.png");
219 219
220 // Create a new extension without page action defaults. 220 // Create a new extension without page action defaults.
221 extension = 221 extension =
222 BuildExtension(DictionaryBuilder().Set("48", "icon48.png").Build(), 222 BuildExtension(DictionaryBuilder().Set("48", "icon48.png").Build(),
223 DictionaryBuilder().Build(), kPageAction); 223 DictionaryBuilder().Build(), kPageAction);
224 ASSERT_TRUE(extension.get()); 224 ASSERT_TRUE(extension.get());
225 225
226 action = 226 action = manager()->GetBestFitAction(*extension, ActionInfo::TYPE_BROWSER);
227 manager()->GetBestFitAction(*extension.get(), ActionInfo::TYPE_BROWSER);
228 227
229 // Now these values match because |extension| does not have page action 228 // Now these values match because |extension| does not have page action
230 // defaults. 229 // defaults.
231 ASSERT_TRUE(TitlesMatch(*extension.get(), *action)); 230 ASSERT_TRUE(TitlesMatch(*extension, *action));
232 ASSERT_TRUE(IconsMatch(*extension.get(), 48, *action, 38)); 231 ASSERT_TRUE(IconsMatch(*extension, 48, *action, 38));
233 } 232 }
234 233
235 } // namespace 234 } // namespace
236 } // namespace extensions 235 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698