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/browser/extensions/extension_prefs_unittest.h" | 5 #include "chrome/browser/extensions/extension_prefs_unittest.h" |
6 #include "chrome/browser/extensions/extension_sorting.h" | 6 #include "chrome/browser/extensions/extension_sorting.h" |
7 #include "chrome/common/extensions/extension_manifest_constants.h" | 7 #include "chrome/common/extensions/extension_manifest_constants.h" |
8 #include "testing/gtest/include/gtest/gtest.h" | 8 #include "testing/gtest/include/gtest/gtest.h" |
9 | 9 |
10 using extensions::Extension; | 10 using extensions::Extension; |
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
164 | 164 |
165 scoped_prefs->UpdateExtensionPref(ext3_->id(), | 165 scoped_prefs->UpdateExtensionPref(ext3_->id(), |
166 kPrefAppLaunchIndexDeprecated, | 166 kPrefAppLaunchIndexDeprecated, |
167 Value::CreateIntegerValue(0)); | 167 Value::CreateIntegerValue(0)); |
168 scoped_prefs->UpdateExtensionPref(ext3_->id(), | 168 scoped_prefs->UpdateExtensionPref(ext3_->id(), |
169 kPrefPageIndexDeprecated, | 169 kPrefPageIndexDeprecated, |
170 Value::CreateIntegerValue(1)); | 170 Value::CreateIntegerValue(1)); |
171 | 171 |
172 // We insert the ids in reserve order so that we have to deal with the | 172 // We insert the ids in reserve order so that we have to deal with the |
173 // element on the 2nd page before the 1st page is seen. | 173 // element on the 2nd page before the 1st page is seen. |
174 extensions::ExtensionPrefs::ExtensionIdSet ids; | 174 extensions::ExtensionPrefs::ExtensionIds ids; |
175 ids.push_back(ext3_->id()); | 175 ids.push_back(ext3_->id()); |
176 ids.push_back(ext2_->id()); | 176 ids.push_back(ext2_->id()); |
177 ids.push_back(ext1_->id()); | 177 ids.push_back(ext1_->id()); |
178 | 178 |
179 prefs()->extension_sorting()->Initialize(ids); | 179 prefs()->extension_sorting()->Initialize(ids); |
180 } | 180 } |
181 virtual void Verify() OVERRIDE { | 181 virtual void Verify() OVERRIDE { |
182 StringOrdinal first_ordinal = StringOrdinal::CreateInitialOrdinal(); | 182 StringOrdinal first_ordinal = StringOrdinal::CreateInitialOrdinal(); |
183 ExtensionSorting* extension_sorting = prefs()->extension_sorting(); | 183 ExtensionSorting* extension_sorting = prefs()->extension_sorting(); |
184 | 184 |
(...skipping 25 matching lines...) Expand all Loading... |
210 virtual void Initialize() OVERRIDE { | 210 virtual void Initialize() OVERRIDE { |
211 ExtensionSorting* extension_sorting = prefs()->extension_sorting(); | 211 ExtensionSorting* extension_sorting = prefs()->extension_sorting(); |
212 | 212 |
213 // Make sure that the web store has valid ordinals. | 213 // Make sure that the web store has valid ordinals. |
214 StringOrdinal initial_ordinal = StringOrdinal::CreateInitialOrdinal(); | 214 StringOrdinal initial_ordinal = StringOrdinal::CreateInitialOrdinal(); |
215 extension_sorting->SetPageOrdinal(extension_misc::kWebStoreAppId, | 215 extension_sorting->SetPageOrdinal(extension_misc::kWebStoreAppId, |
216 initial_ordinal); | 216 initial_ordinal); |
217 extension_sorting->SetAppLaunchOrdinal(extension_misc::kWebStoreAppId, | 217 extension_sorting->SetAppLaunchOrdinal(extension_misc::kWebStoreAppId, |
218 initial_ordinal); | 218 initial_ordinal); |
219 | 219 |
220 extensions::ExtensionPrefs::ExtensionIdSet ids; | 220 extensions::ExtensionPrefs::ExtensionIds ids; |
221 extension_sorting->Initialize(ids); | 221 extension_sorting->Initialize(ids); |
222 } | 222 } |
223 virtual void Verify() OVERRIDE { | 223 virtual void Verify() OVERRIDE { |
224 ExtensionSorting* extension_sorting = prefs()->extension_sorting(); | 224 ExtensionSorting* extension_sorting = prefs()->extension_sorting(); |
225 | 225 |
226 StringOrdinal page = | 226 StringOrdinal page = |
227 extension_sorting->GetPageOrdinal(extension_misc::kWebStoreAppId); | 227 extension_sorting->GetPageOrdinal(extension_misc::kWebStoreAppId); |
228 EXPECT_TRUE(page.IsValid()); | 228 EXPECT_TRUE(page.IsValid()); |
229 | 229 |
230 ExtensionSorting::PageOrdinalMap::iterator page_it = | 230 ExtensionSorting::PageOrdinalMap::iterator page_it = |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
262 // Setup the deprecated preference. | 262 // Setup the deprecated preference. |
263 ExtensionScopedPrefs* scoped_prefs = | 263 ExtensionScopedPrefs* scoped_prefs = |
264 static_cast<ExtensionScopedPrefs*>(prefs()); | 264 static_cast<ExtensionScopedPrefs*>(prefs()); |
265 scoped_prefs->UpdateExtensionPref(ext1_->id(), | 265 scoped_prefs->UpdateExtensionPref(ext1_->id(), |
266 kPrefAppLaunchIndexDeprecated, | 266 kPrefAppLaunchIndexDeprecated, |
267 Value::CreateIntegerValue(0)); | 267 Value::CreateIntegerValue(0)); |
268 scoped_prefs->UpdateExtensionPref(ext1_->id(), | 268 scoped_prefs->UpdateExtensionPref(ext1_->id(), |
269 kPrefPageIndexDeprecated, | 269 kPrefPageIndexDeprecated, |
270 Value::CreateIntegerValue(-1)); | 270 Value::CreateIntegerValue(-1)); |
271 | 271 |
272 extensions::ExtensionPrefs::ExtensionIdSet ids; | 272 extensions::ExtensionPrefs::ExtensionIds ids; |
273 ids.push_back(ext1_->id()); | 273 ids.push_back(ext1_->id()); |
274 | 274 |
275 prefs()->extension_sorting()->Initialize(ids); | 275 prefs()->extension_sorting()->Initialize(ids); |
276 } | 276 } |
277 virtual void Verify() OVERRIDE { | 277 virtual void Verify() OVERRIDE { |
278 // Make sure that the invalid page_index wasn't converted over. | 278 // Make sure that the invalid page_index wasn't converted over. |
279 EXPECT_FALSE(prefs()->extension_sorting()->GetAppLaunchOrdinal( | 279 EXPECT_FALSE(prefs()->extension_sorting()->GetAppLaunchOrdinal( |
280 ext1_->id()).IsValid()); | 280 ext1_->id()).IsValid()); |
281 } | 281 } |
282 }; | 282 }; |
(...skipping 469 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
752 extension_sorting->SetPageOrdinal(app1_->id(), page_three); | 752 extension_sorting->SetPageOrdinal(app1_->id(), page_three); |
753 EXPECT_EQ(2, extension_sorting->PageStringOrdinalAsInteger(page_three)); | 753 EXPECT_EQ(2, extension_sorting->PageStringOrdinalAsInteger(page_three)); |
754 | 754 |
755 StringOrdinal page_six = extension_sorting->PageIntegerAsStringOrdinal(5); | 755 StringOrdinal page_six = extension_sorting->PageIntegerAsStringOrdinal(5); |
756 extension_sorting->SetPageOrdinal(app1_->id(), page_six); | 756 extension_sorting->SetPageOrdinal(app1_->id(), page_six); |
757 EXPECT_EQ(5, extension_sorting->PageStringOrdinalAsInteger(page_six)); | 757 EXPECT_EQ(5, extension_sorting->PageStringOrdinalAsInteger(page_six)); |
758 } | 758 } |
759 }; | 759 }; |
760 TEST_F(ExtensionSortingMakesFillerOrdinals, | 760 TEST_F(ExtensionSortingMakesFillerOrdinals, |
761 ExtensionSortingMakesFillerOrdinals) {} | 761 ExtensionSortingMakesFillerOrdinals) {} |
OLD | NEW |