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

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

Issue 508513002: Remove implicit conversions from scoped_refptr to T* in chrome/browser/extensions/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Two more Created 6 years, 4 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 "extensions/browser/extension_registry.h" 10 #include "extensions/browser/extension_registry.h"
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 // Test that the largest icon from the extension's "icons" key is chosen as a 114 // Test that the largest icon from the extension's "icons" key is chosen as a
115 // replacement for missing action default_icons keys. "19" should not be 115 // replacement for missing action default_icons keys. "19" should not be
116 // replaced because "38" can always be used in its place. 116 // replaced because "38" can always be used in its place.
117 scoped_refptr<Extension> extension = BuildExtension( 117 scoped_refptr<Extension> extension = BuildExtension(
118 DictionaryBuilder().Set("48", "icon48.png") 118 DictionaryBuilder().Set("48", "icon48.png")
119 .Set("128", "icon128.png"), 119 .Set("128", "icon128.png"),
120 DictionaryBuilder().Pass(), 120 DictionaryBuilder().Pass(),
121 action_type); 121 action_type);
122 122
123 ASSERT_TRUE(extension.get()); 123 ASSERT_TRUE(extension.get());
124 const ExtensionAction* action = GetAction(action_type, *extension); 124 const ExtensionAction* action = GetAction(action_type, *extension.get());
125 ASSERT_TRUE(action); 125 ASSERT_TRUE(action);
126 126
127 ASSERT_TRUE(TitlesMatch(*extension, *action)); 127 ASSERT_TRUE(TitlesMatch(*extension.get(), *action));
128 ASSERT_TRUE(IconsMatch(*extension, 128, *action, 38)); 128 ASSERT_TRUE(IconsMatch(*extension.get(), 128, *action, 38));
129 129
130 // Test that the action's missing default_icons are not replaced with smaller 130 // Test that the action's missing default_icons are not replaced with smaller
131 // icons. 131 // icons.
132 extension = BuildExtension( 132 extension = BuildExtension(
133 DictionaryBuilder().Set("24", "icon24.png"), 133 DictionaryBuilder().Set("24", "icon24.png"),
134 DictionaryBuilder().Pass(), 134 DictionaryBuilder().Pass(),
135 action_type); 135 action_type);
136 136
137 ASSERT_TRUE(extension.get()); 137 ASSERT_TRUE(extension.get());
138 action = GetAction(action_type, *extension); 138 action = GetAction(action_type, *extension.get());
139 ASSERT_TRUE(action); 139 ASSERT_TRUE(action);
140 140
141 ASSERT_TRUE(IconsMatch(*extension, 24, *action, 19)); 141 ASSERT_TRUE(IconsMatch(*extension.get(), 24, *action, 19));
142 ASSERT_FALSE(IconsMatch(*extension, 24, *action, 38)); 142 ASSERT_FALSE(IconsMatch(*extension.get(), 24, *action, 38));
143 143
144 // Test that an action's 19px icon is not replaced if a 38px action icon 144 // Test that an action's 19px icon is not replaced if a 38px action icon
145 // exists. 145 // exists.
146 extension = BuildExtension( 146 extension = BuildExtension(
147 DictionaryBuilder().Set("128", "icon128.png"), 147 DictionaryBuilder().Set("128", "icon128.png"),
148 DictionaryBuilder().Set("default_icon", DictionaryBuilder() 148 DictionaryBuilder().Set("default_icon", DictionaryBuilder()
149 .Set("38", "action38.png")), 149 .Set("38", "action38.png")),
150 action_type); 150 action_type);
151 151
152 ASSERT_TRUE(extension.get()); 152 ASSERT_TRUE(extension.get());
153 action = GetAction(action_type, *extension); 153 action = GetAction(action_type, *extension.get());
154 ASSERT_TRUE(action); 154 ASSERT_TRUE(action);
155 155
156 ASSERT_FALSE(IconsMatch(*extension, 128, *action, 19)); 156 ASSERT_FALSE(IconsMatch(*extension.get(), 128, *action, 19));
157 157
158 // Test that existing default_icons and default_title are not replaced. 158 // Test that existing default_icons and default_title are not replaced.
159 extension = BuildExtension( 159 extension = BuildExtension(
160 DictionaryBuilder().Set("128", "icon128.png"), 160 DictionaryBuilder().Set("128", "icon128.png"),
161 DictionaryBuilder().Set("default_title", "Action!") 161 DictionaryBuilder().Set("default_title", "Action!")
162 .Set("default_icon", DictionaryBuilder() 162 .Set("default_icon", DictionaryBuilder()
163 .Set("19", "action19.png") 163 .Set("19", "action19.png")
164 .Set("38", "action38.png")), 164 .Set("38", "action38.png")),
165 action_type); 165 action_type);
166 166
167 ASSERT_TRUE(extension.get()); 167 ASSERT_TRUE(extension.get());
168 action = GetAction(action_type, *extension); 168 action = GetAction(action_type, *extension.get());
169 ASSERT_TRUE(action); 169 ASSERT_TRUE(action);
170 170
171 ASSERT_FALSE(TitlesMatch(*extension, *action)); 171 ASSERT_FALSE(TitlesMatch(*extension.get(), *action));
172 ASSERT_FALSE(IconsMatch(*extension, 128, *action, 19)); 172 ASSERT_FALSE(IconsMatch(*extension.get(), 128, *action, 19));
173 ASSERT_FALSE(IconsMatch(*extension, 128, *action, 38)); 173 ASSERT_FALSE(IconsMatch(*extension.get(), 128, *action, 38));
174 } 174 }
175 175
176 namespace { 176 namespace {
177 177
178 TEST_F(ExtensionActionManagerTest, PopulateBrowserAction) { 178 TEST_F(ExtensionActionManagerTest, PopulateBrowserAction) {
179 TestPopulateMissingValues(kBrowserAction); 179 TestPopulateMissingValues(kBrowserAction);
180 } 180 }
181 181
182 TEST_F(ExtensionActionManagerTest, PopulatePageAction) { 182 TEST_F(ExtensionActionManagerTest, PopulatePageAction) {
183 TestPopulateMissingValues(kPageAction); 183 TestPopulateMissingValues(kPageAction);
184 } 184 }
185 185
186 TEST_F(ExtensionActionManagerTest, GetBestFitActionTest) { 186 TEST_F(ExtensionActionManagerTest, GetBestFitActionTest) {
187 // Create an extension with page action defaults. 187 // Create an extension with page action defaults.
188 scoped_refptr<Extension> extension = BuildExtension( 188 scoped_refptr<Extension> extension = BuildExtension(
189 DictionaryBuilder().Set("48", "icon48.png"), 189 DictionaryBuilder().Set("48", "icon48.png"),
190 DictionaryBuilder().Set("default_title", "Action!") 190 DictionaryBuilder().Set("default_title", "Action!")
191 .Set("default_icon", DictionaryBuilder() 191 .Set("default_icon", DictionaryBuilder()
192 .Set("38", "action38.png")), 192 .Set("38", "action38.png")),
193 kPageAction); 193 kPageAction);
194 ASSERT_TRUE(extension.get()); 194 ASSERT_TRUE(extension.get());
195 195
196 // Get a "best fit" browser action for |extension|. 196 // Get a "best fit" browser action for |extension|.
197 scoped_ptr<ExtensionAction> action = 197 scoped_ptr<ExtensionAction> action =
198 manager()->GetBestFitAction(*extension, ActionInfo::TYPE_BROWSER); 198 manager()->GetBestFitAction(*extension.get(), ActionInfo::TYPE_BROWSER);
199 ASSERT_TRUE(action.get()); 199 ASSERT_TRUE(action.get());
200 ASSERT_EQ(action->action_type(), ActionInfo::TYPE_BROWSER); 200 ASSERT_EQ(action->action_type(), ActionInfo::TYPE_BROWSER);
201 201
202 // |action|'s title and default icon should match |extension|'s page action's. 202 // |action|'s title and default icon should match |extension|'s page action's.
203 ASSERT_EQ(action->GetTitle(ExtensionAction::kDefaultTabId), "Action!"); 203 ASSERT_EQ(action->GetTitle(ExtensionAction::kDefaultTabId), "Action!");
204 ASSERT_EQ(action->default_icon()->Get(38, ExtensionIconSet::MATCH_EXACTLY), 204 ASSERT_EQ(action->default_icon()->Get(38, ExtensionIconSet::MATCH_EXACTLY),
205 "action38.png"); 205 "action38.png");
206 206
207 // Create a new extension without page action defaults. 207 // Create a new extension without page action defaults.
208 extension = BuildExtension( 208 extension = BuildExtension(
209 DictionaryBuilder().Set("48", "icon48.png"), 209 DictionaryBuilder().Set("48", "icon48.png"),
210 DictionaryBuilder().Pass(), 210 DictionaryBuilder().Pass(),
211 kPageAction); 211 kPageAction);
212 ASSERT_TRUE(extension.get()); 212 ASSERT_TRUE(extension.get());
213 213
214 action = manager()->GetBestFitAction(*extension, ActionInfo::TYPE_BROWSER); 214 action =
215 manager()->GetBestFitAction(*extension.get(), ActionInfo::TYPE_BROWSER);
215 216
216 // Now these values match because |extension| does not have page action 217 // Now these values match because |extension| does not have page action
217 // defaults. 218 // defaults.
218 ASSERT_TRUE(TitlesMatch(*extension, *action)); 219 ASSERT_TRUE(TitlesMatch(*extension.get(), *action));
219 ASSERT_TRUE(IconsMatch(*extension, 48, *action, 38)); 220 ASSERT_TRUE(IconsMatch(*extension.get(), 48, *action, 38));
220 } 221 }
221 222
222 } // namespace 223 } // namespace
223 } // namespace extensions 224 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698