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

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

Issue 10704023: Moved ExtensionPrefs and related into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Latest-er master merged in Created 8 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 (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;
11 11
12 namespace keys = extension_manifest_keys; 12 namespace keys = extension_manifest_keys;
13 13
14 class ExtensionSortingTest : public ExtensionPrefsTest { 14 class ExtensionSortingTest : public extensions::ExtensionPrefsTest {
15 protected: 15 protected:
16 ExtensionSorting* extension_sorting() { 16 ExtensionSorting* extension_sorting() {
17 return prefs()->extension_sorting(); 17 return prefs()->extension_sorting();
18 } 18 }
19 }; 19 };
20 20
21 class ExtensionSortingAppLocation : public ExtensionSortingTest { 21 class ExtensionSortingAppLocation : public ExtensionSortingTest {
22 public: 22 public:
23 virtual void Initialize() OVERRIDE { 23 virtual void Initialize() OVERRIDE {
24 extension_ = prefs_.AddExtension("not_an_app"); 24 extension_ = prefs_.AddExtension("not_an_app");
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 127
128 private: 128 private:
129 StringOrdinal first_page_; 129 StringOrdinal first_page_;
130 scoped_refptr<Extension> extension_; 130 scoped_refptr<Extension> extension_;
131 }; 131 };
132 TEST_F(ExtensionSortingPageOrdinal, ExtensionSortingPageOrdinal) {} 132 TEST_F(ExtensionSortingPageOrdinal, ExtensionSortingPageOrdinal) {}
133 133
134 // Ensure that ExtensionSorting is able to properly initialize off a set 134 // Ensure that ExtensionSorting is able to properly initialize off a set
135 // of old page and app launch indices and properly convert them. 135 // of old page and app launch indices and properly convert them.
136 class ExtensionSortingInitialize 136 class ExtensionSortingInitialize
137 : public ExtensionPrefsPrepopulatedTest { 137 : public extensions::ExtensionPrefsPrepopulatedTest {
138 public: 138 public:
139 ExtensionSortingInitialize() {} 139 ExtensionSortingInitialize() {}
140 virtual ~ExtensionSortingInitialize() {} 140 virtual ~ExtensionSortingInitialize() {}
141 141
142 virtual void Initialize() OVERRIDE { 142 virtual void Initialize() OVERRIDE {
143 // A preference determining the order of which the apps appear on the NTP. 143 // A preference determining the order of which the apps appear on the NTP.
144 const char kPrefAppLaunchIndexDeprecated[] = "app_launcher_index"; 144 const char kPrefAppLaunchIndexDeprecated[] = "app_launcher_index";
145 // A preference determining the page on which an app appears in the NTP. 145 // A preference determining the page on which an app appears in the NTP.
146 const char kPrefPageIndexDeprecated[] = "page_index"; 146 const char kPrefPageIndexDeprecated[] = "page_index";
147 147
(...skipping 16 matching lines...) Expand all
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 ExtensionPrefs::ExtensionIdSet ids; 174 extensions::ExtensionPrefs::ExtensionIdSet 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 10 matching lines...) Expand all
195 extension_sorting->GetPageOrdinal(ext2_->id()))); 195 extension_sorting->GetPageOrdinal(ext2_->id())));
196 EXPECT_TRUE(first_ordinal.LessThan( 196 EXPECT_TRUE(first_ordinal.LessThan(
197 extension_sorting->GetPageOrdinal(ext3_->id()))); 197 extension_sorting->GetPageOrdinal(ext3_->id())));
198 } 198 }
199 }; 199 };
200 TEST_F(ExtensionSortingInitialize, ExtensionSortingInitialize) {} 200 TEST_F(ExtensionSortingInitialize, ExtensionSortingInitialize) {}
201 201
202 // Make sure that initialization still works when no extensions are present 202 // Make sure that initialization still works when no extensions are present
203 // (i.e. make sure that the web store icon is still loaded into the map). 203 // (i.e. make sure that the web store icon is still loaded into the map).
204 class ExtensionSortingInitializeWithNoApps 204 class ExtensionSortingInitializeWithNoApps
205 : public ExtensionPrefsPrepopulatedTest { 205 : public extensions::ExtensionPrefsPrepopulatedTest {
206 public: 206 public:
207 ExtensionSortingInitializeWithNoApps() {} 207 ExtensionSortingInitializeWithNoApps() {}
208 virtual ~ExtensionSortingInitializeWithNoApps() {} 208 virtual ~ExtensionSortingInitializeWithNoApps() {}
209 209
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 ExtensionPrefs::ExtensionIdSet ids; 220 extensions::ExtensionPrefs::ExtensionIdSet 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 10 matching lines...) Expand all
241 } 241 }
242 }; 242 };
243 TEST_F(ExtensionSortingInitializeWithNoApps, 243 TEST_F(ExtensionSortingInitializeWithNoApps,
244 ExtensionSortingInitializeWithNoApps) {} 244 ExtensionSortingInitializeWithNoApps) {}
245 245
246 // Tests the application index to ordinal migration code for values that 246 // Tests the application index to ordinal migration code for values that
247 // shouldn't be converted. This should be removed when the migrate code 247 // shouldn't be converted. This should be removed when the migrate code
248 // is taken out. 248 // is taken out.
249 // http://crbug.com/107376 249 // http://crbug.com/107376
250 class ExtensionSortingMigrateAppIndexInvalid 250 class ExtensionSortingMigrateAppIndexInvalid
251 : public ExtensionPrefsPrepopulatedTest { 251 : public extensions::ExtensionPrefsPrepopulatedTest {
252 public: 252 public:
253 ExtensionSortingMigrateAppIndexInvalid() {} 253 ExtensionSortingMigrateAppIndexInvalid() {}
254 virtual ~ExtensionSortingMigrateAppIndexInvalid() {} 254 virtual ~ExtensionSortingMigrateAppIndexInvalid() {}
255 255
256 virtual void Initialize() OVERRIDE { 256 virtual void Initialize() OVERRIDE {
257 // A preference determining the order of which the apps appear on the NTP. 257 // A preference determining the order of which the apps appear on the NTP.
258 const char kPrefAppLaunchIndexDeprecated[] = "app_launcher_index"; 258 const char kPrefAppLaunchIndexDeprecated[] = "app_launcher_index";
259 // A preference determining the page on which an app appears in the NTP. 259 // A preference determining the page on which an app appears in the NTP.
260 const char kPrefPageIndexDeprecated[] = "page_index"; 260 const char kPrefPageIndexDeprecated[] = "page_index";
261 261
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 ExtensionPrefs::ExtensionIdSet ids; 272 extensions::ExtensionPrefs::ExtensionIdSet 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 };
283 TEST_F(ExtensionSortingMigrateAppIndexInvalid, 283 TEST_F(ExtensionSortingMigrateAppIndexInvalid,
284 ExtensionSortingMigrateAppIndexInvalid) {} 284 ExtensionSortingMigrateAppIndexInvalid) {}
285 285
286 class ExtensionSortingFixNTPCollisionsAllCollide 286 class ExtensionSortingFixNTPCollisionsAllCollide
287 : public ExtensionPrefsPrepopulatedTest { 287 : public extensions::ExtensionPrefsPrepopulatedTest {
288 public: 288 public:
289 ExtensionSortingFixNTPCollisionsAllCollide() {} 289 ExtensionSortingFixNTPCollisionsAllCollide() {}
290 virtual ~ExtensionSortingFixNTPCollisionsAllCollide() {} 290 virtual ~ExtensionSortingFixNTPCollisionsAllCollide() {}
291 291
292 virtual void Initialize() OVERRIDE { 292 virtual void Initialize() OVERRIDE {
293 repeated_ordinal_ = StringOrdinal::CreateInitialOrdinal(); 293 repeated_ordinal_ = StringOrdinal::CreateInitialOrdinal();
294 294
295 ExtensionSorting* extension_sorting = prefs()->extension_sorting(); 295 ExtensionSorting* extension_sorting = prefs()->extension_sorting();
296 296
297 extension_sorting->SetAppLaunchOrdinal(ext1_->id(), repeated_ordinal_); 297 extension_sorting->SetAppLaunchOrdinal(ext1_->id(), repeated_ordinal_);
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 repeated_ordinal_)); 332 repeated_ordinal_));
333 } 333 }
334 334
335 private: 335 private:
336 StringOrdinal repeated_ordinal_; 336 StringOrdinal repeated_ordinal_;
337 }; 337 };
338 TEST_F(ExtensionSortingFixNTPCollisionsAllCollide, 338 TEST_F(ExtensionSortingFixNTPCollisionsAllCollide,
339 ExtensionSortingFixNTPCollisionsAllCollide) {} 339 ExtensionSortingFixNTPCollisionsAllCollide) {}
340 340
341 class ExtensionSortingFixNTPCollisionsSomeCollideAtStart 341 class ExtensionSortingFixNTPCollisionsSomeCollideAtStart
342 : public ExtensionPrefsPrepopulatedTest { 342 : public extensions::ExtensionPrefsPrepopulatedTest {
343 public: 343 public:
344 ExtensionSortingFixNTPCollisionsSomeCollideAtStart() {} 344 ExtensionSortingFixNTPCollisionsSomeCollideAtStart() {}
345 virtual ~ExtensionSortingFixNTPCollisionsSomeCollideAtStart() {} 345 virtual ~ExtensionSortingFixNTPCollisionsSomeCollideAtStart() {}
346 346
347 virtual void Initialize() OVERRIDE { 347 virtual void Initialize() OVERRIDE {
348 first_ordinal_ = StringOrdinal::CreateInitialOrdinal(); 348 first_ordinal_ = StringOrdinal::CreateInitialOrdinal();
349 StringOrdinal second_ordinal = first_ordinal_.CreateAfter(); 349 StringOrdinal second_ordinal = first_ordinal_.CreateAfter();
350 350
351 ExtensionSorting* extension_sorting = prefs()->extension_sorting(); 351 ExtensionSorting* extension_sorting = prefs()->extension_sorting();
352 352
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 first_ordinal_)); 390 first_ordinal_));
391 } 391 }
392 392
393 private: 393 private:
394 StringOrdinal first_ordinal_; 394 StringOrdinal first_ordinal_;
395 }; 395 };
396 TEST_F(ExtensionSortingFixNTPCollisionsSomeCollideAtStart, 396 TEST_F(ExtensionSortingFixNTPCollisionsSomeCollideAtStart,
397 ExtensionSortingFixNTPCollisionsSomeCollideAtStart) {} 397 ExtensionSortingFixNTPCollisionsSomeCollideAtStart) {}
398 398
399 class ExtensionSortingFixNTPCollisionsSomeCollideAtEnd 399 class ExtensionSortingFixNTPCollisionsSomeCollideAtEnd
400 : public ExtensionPrefsPrepopulatedTest { 400 : public extensions::ExtensionPrefsPrepopulatedTest {
401 public: 401 public:
402 ExtensionSortingFixNTPCollisionsSomeCollideAtEnd() {} 402 ExtensionSortingFixNTPCollisionsSomeCollideAtEnd() {}
403 virtual ~ExtensionSortingFixNTPCollisionsSomeCollideAtEnd() {} 403 virtual ~ExtensionSortingFixNTPCollisionsSomeCollideAtEnd() {}
404 404
405 virtual void Initialize() OVERRIDE { 405 virtual void Initialize() OVERRIDE {
406 first_ordinal_ = StringOrdinal::CreateInitialOrdinal(); 406 first_ordinal_ = StringOrdinal::CreateInitialOrdinal();
407 StringOrdinal second_ordinal = first_ordinal_.CreateAfter(); 407 StringOrdinal second_ordinal = first_ordinal_.CreateAfter();
408 408
409 ExtensionSorting* extension_sorting = prefs()->extension_sorting(); 409 ExtensionSorting* extension_sorting = prefs()->extension_sorting();
410 410
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
448 first_ordinal_)); 448 first_ordinal_));
449 } 449 }
450 450
451 private: 451 private:
452 StringOrdinal first_ordinal_; 452 StringOrdinal first_ordinal_;
453 }; 453 };
454 TEST_F(ExtensionSortingFixNTPCollisionsSomeCollideAtEnd, 454 TEST_F(ExtensionSortingFixNTPCollisionsSomeCollideAtEnd,
455 ExtensionSortingFixNTPCollisionsSomeCollideAtEnd) {} 455 ExtensionSortingFixNTPCollisionsSomeCollideAtEnd) {}
456 456
457 class ExtensionSortingFixNTPCollisionsTwoCollisions 457 class ExtensionSortingFixNTPCollisionsTwoCollisions
458 : public ExtensionPrefsPrepopulatedTest { 458 : public extensions::ExtensionPrefsPrepopulatedTest {
459 public: 459 public:
460 ExtensionSortingFixNTPCollisionsTwoCollisions() {} 460 ExtensionSortingFixNTPCollisionsTwoCollisions() {}
461 virtual ~ExtensionSortingFixNTPCollisionsTwoCollisions() {} 461 virtual ~ExtensionSortingFixNTPCollisionsTwoCollisions() {}
462 462
463 virtual void Initialize() OVERRIDE { 463 virtual void Initialize() OVERRIDE {
464 first_ordinal_ = StringOrdinal::CreateInitialOrdinal(); 464 first_ordinal_ = StringOrdinal::CreateInitialOrdinal();
465 StringOrdinal second_ordinal = first_ordinal_.CreateAfter(); 465 StringOrdinal second_ordinal = first_ordinal_.CreateAfter();
466 466
467 ExtensionSorting* extension_sorting = prefs()->extension_sorting(); 467 ExtensionSorting* extension_sorting = prefs()->extension_sorting();
468 468
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
516 first_ordinal_)); 516 first_ordinal_));
517 } 517 }
518 518
519 private: 519 private:
520 StringOrdinal first_ordinal_; 520 StringOrdinal first_ordinal_;
521 }; 521 };
522 TEST_F(ExtensionSortingFixNTPCollisionsTwoCollisions, 522 TEST_F(ExtensionSortingFixNTPCollisionsTwoCollisions,
523 ExtensionSortingFixNTPCollisionsTwoCollisions) {} 523 ExtensionSortingFixNTPCollisionsTwoCollisions) {}
524 524
525 class ExtensionSortingEnsureValidOrdinals : 525 class ExtensionSortingEnsureValidOrdinals :
526 public ExtensionPrefsPrepopulatedTest { 526 public extensions::ExtensionPrefsPrepopulatedTest {
527 public : 527 public :
528 ExtensionSortingEnsureValidOrdinals() {} 528 ExtensionSortingEnsureValidOrdinals() {}
529 ~ExtensionSortingEnsureValidOrdinals() {} 529 ~ExtensionSortingEnsureValidOrdinals() {}
530 530
531 virtual void Initialize() {} 531 virtual void Initialize() {}
532 virtual void Verify() { 532 virtual void Verify() {
533 ExtensionSorting* extension_sorting = prefs()->extension_sorting(); 533 ExtensionSorting* extension_sorting = prefs()->extension_sorting();
534 534
535 // Give ext1 invalid ordinals and then check that EnsureValidOridnals fixes 535 // Give ext1 invalid ordinals and then check that EnsureValidOridnals fixes
536 // them. 536 // them.
537 extension_sorting->SetAppLaunchOrdinal(ext1_->id(), StringOrdinal()); 537 extension_sorting->SetAppLaunchOrdinal(ext1_->id(), StringOrdinal());
538 extension_sorting->SetPageOrdinal(ext1_->id(), StringOrdinal()); 538 extension_sorting->SetPageOrdinal(ext1_->id(), StringOrdinal());
539 539
540 extension_sorting->EnsureValidOrdinals(ext1_->id()); 540 extension_sorting->EnsureValidOrdinals(ext1_->id());
541 541
542 EXPECT_TRUE(extension_sorting->GetAppLaunchOrdinal(ext1_->id()).IsValid()); 542 EXPECT_TRUE(extension_sorting->GetAppLaunchOrdinal(ext1_->id()).IsValid());
543 EXPECT_TRUE(extension_sorting->GetPageOrdinal(ext1_->id()).IsValid()); 543 EXPECT_TRUE(extension_sorting->GetPageOrdinal(ext1_->id()).IsValid());
544 } 544 }
545 }; 545 };
546 TEST_F(ExtensionSortingEnsureValidOrdinals, 546 TEST_F(ExtensionSortingEnsureValidOrdinals,
547 ExtensionSortingEnsureValidOrdinals) {} 547 ExtensionSortingEnsureValidOrdinals) {}
548 548
549 class ExtensionSortingPageOrdinalMapping : 549 class ExtensionSortingPageOrdinalMapping :
550 public ExtensionPrefsPrepopulatedTest { 550 public extensions::ExtensionPrefsPrepopulatedTest {
551 public: 551 public:
552 ExtensionSortingPageOrdinalMapping() {} 552 ExtensionSortingPageOrdinalMapping() {}
553 virtual ~ExtensionSortingPageOrdinalMapping() {} 553 virtual ~ExtensionSortingPageOrdinalMapping() {}
554 554
555 virtual void Initialize() {} 555 virtual void Initialize() {}
556 virtual void Verify() { 556 virtual void Verify() {
557 std::string ext_1 = "ext_1"; 557 std::string ext_1 = "ext_1";
558 std::string ext_2 = "ext_2"; 558 std::string ext_2 = "ext_2";
559 559
560 ExtensionSorting* extension_sorting = prefs()->extension_sorting(); 560 ExtensionSorting* extension_sorting = prefs()->extension_sorting();
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
599 599
600 it = extension_sorting->ntp_ordinal_map_[first_ordinal].find( 600 it = extension_sorting->ntp_ordinal_map_[first_ordinal].find(
601 first_ordinal); 601 first_ordinal);
602 EXPECT_EQ(ext_2, it->second); 602 EXPECT_EQ(ext_2, it->second);
603 } 603 }
604 }; 604 };
605 TEST_F(ExtensionSortingPageOrdinalMapping, 605 TEST_F(ExtensionSortingPageOrdinalMapping,
606 ExtensionSortingPageOrdinalMapping) {} 606 ExtensionSortingPageOrdinalMapping) {}
607 607
608 class ExtensionSortingPreinstalledAppsBase : 608 class ExtensionSortingPreinstalledAppsBase :
609 public ExtensionPrefsPrepopulatedTest { 609 public extensions::ExtensionPrefsPrepopulatedTest {
610 public: 610 public:
611 ExtensionSortingPreinstalledAppsBase() { 611 ExtensionSortingPreinstalledAppsBase() {
612 DictionaryValue simple_dict; 612 DictionaryValue simple_dict;
613 simple_dict.SetString(keys::kVersion, "1.0.0.0"); 613 simple_dict.SetString(keys::kVersion, "1.0.0.0");
614 simple_dict.SetString(keys::kName, "unused"); 614 simple_dict.SetString(keys::kName, "unused");
615 simple_dict.SetString(keys::kApp, "true"); 615 simple_dict.SetString(keys::kApp, "true");
616 simple_dict.SetString(keys::kLaunchLocalPath, "fake.html"); 616 simple_dict.SetString(keys::kLaunchLocalPath, "fake.html");
617 617
618 std::string error; 618 std::string error;
619 app1_scoped_ = Extension::Create( 619 app1_scoped_ = Extension::Create(
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
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) {}
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_sorting.cc ('k') | chrome/browser/extensions/extension_system.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698