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_sorting.h" | 5 #include "chrome/browser/extensions/extension_sorting.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 | 8 |
9 #include "chrome/browser/extensions/extension_prefs_unittest.h" | 9 #include "chrome/browser/extensions/extension_prefs_unittest.h" |
10 #include "chrome/common/extensions/extension_manifest_constants.h" | 10 #include "chrome/common/extensions/extension_manifest_constants.h" |
(...skipping 516 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
527 private: | 527 private: |
528 syncer::StringOrdinal first_ordinal_; | 528 syncer::StringOrdinal first_ordinal_; |
529 }; | 529 }; |
530 TEST_F(ExtensionSortingFixNTPCollisionsTwoCollisions, | 530 TEST_F(ExtensionSortingFixNTPCollisionsTwoCollisions, |
531 ExtensionSortingFixNTPCollisionsTwoCollisions) {} | 531 ExtensionSortingFixNTPCollisionsTwoCollisions) {} |
532 | 532 |
533 class ExtensionSortingEnsureValidOrdinals | 533 class ExtensionSortingEnsureValidOrdinals |
534 : public extensions::ExtensionPrefsPrepopulatedTest { | 534 : public extensions::ExtensionPrefsPrepopulatedTest { |
535 public : | 535 public : |
536 ExtensionSortingEnsureValidOrdinals() {} | 536 ExtensionSortingEnsureValidOrdinals() {} |
537 ~ExtensionSortingEnsureValidOrdinals() {} | 537 virtual ~ExtensionSortingEnsureValidOrdinals() {} |
538 | 538 |
539 virtual void Initialize() {} | 539 virtual void Initialize() OVERRIDE {} |
540 virtual void Verify() { | 540 virtual void Verify() OVERRIDE { |
541 ExtensionSorting* extension_sorting = prefs()->extension_sorting(); | 541 ExtensionSorting* extension_sorting = prefs()->extension_sorting(); |
542 | 542 |
543 // Give ext1 invalid ordinals and then check that EnsureValidOrdinals fixes | 543 // Give ext1 invalid ordinals and then check that EnsureValidOrdinals fixes |
544 // them. | 544 // them. |
545 extension_sorting->SetAppLaunchOrdinal(ext1_->id(), | 545 extension_sorting->SetAppLaunchOrdinal(ext1_->id(), |
546 syncer::StringOrdinal()); | 546 syncer::StringOrdinal()); |
547 extension_sorting->SetPageOrdinal(ext1_->id(), syncer::StringOrdinal()); | 547 extension_sorting->SetPageOrdinal(ext1_->id(), syncer::StringOrdinal()); |
548 | 548 |
549 extension_sorting->EnsureValidOrdinals(ext1_->id(), | 549 extension_sorting->EnsureValidOrdinals(ext1_->id(), |
550 syncer::StringOrdinal()); | 550 syncer::StringOrdinal()); |
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
888 virtual void Verify() OVERRIDE { | 888 virtual void Verify() OVERRIDE { |
889 ExtensionSorting* extension_sorting = prefs()->extension_sorting(); | 889 ExtensionSorting* extension_sorting = prefs()->extension_sorting(); |
890 | 890 |
891 EXPECT_TRUE(extension_sorting->GetPageOrdinal(app_->id()).Equals( | 891 EXPECT_TRUE(extension_sorting->GetPageOrdinal(app_->id()).Equals( |
892 user_page_ordinal_)); | 892 user_page_ordinal_)); |
893 EXPECT_TRUE(extension_sorting->GetAppLaunchOrdinal(app_->id()).Equals( | 893 EXPECT_TRUE(extension_sorting->GetAppLaunchOrdinal(app_->id()).Equals( |
894 user_app_launch_ordinal_)); | 894 user_app_launch_ordinal_)); |
895 } | 895 } |
896 | 896 |
897 protected: | 897 protected: |
898 virtual void SetupUserOrdinals() { | 898 virtual void SetupUserOrdinals() OVERRIDE { |
899 user_page_ordinal_ = default_page_ordinal_.CreateAfter(); | 899 user_page_ordinal_ = default_page_ordinal_.CreateAfter(); |
900 user_app_launch_ordinal_ = default_app_launch_ordinal_.CreateBefore(); | 900 user_app_launch_ordinal_ = default_app_launch_ordinal_.CreateBefore(); |
901 | 901 |
902 ExtensionSorting* extension_sorting = prefs()->extension_sorting(); | 902 ExtensionSorting* extension_sorting = prefs()->extension_sorting(); |
903 extension_sorting->SetPageOrdinal(app_->id(), user_page_ordinal_); | 903 extension_sorting->SetPageOrdinal(app_->id(), user_page_ordinal_); |
904 extension_sorting->SetAppLaunchOrdinal(app_->id(), | 904 extension_sorting->SetAppLaunchOrdinal(app_->id(), |
905 user_app_launch_ordinal_); | 905 user_app_launch_ordinal_); |
906 } | 906 } |
907 | 907 |
908 private: | 908 private: |
(...skipping 15 matching lines...) Expand all Loading... |
924 | 924 |
925 // Use the default page. | 925 // Use the default page. |
926 EXPECT_TRUE(extension_sorting->GetPageOrdinal(app_->id()).Equals( | 926 EXPECT_TRUE(extension_sorting->GetPageOrdinal(app_->id()).Equals( |
927 default_page_ordinal_)); | 927 default_page_ordinal_)); |
928 // Not using the default app launch ordinal because of the collision. | 928 // Not using the default app launch ordinal because of the collision. |
929 EXPECT_FALSE(extension_sorting->GetAppLaunchOrdinal(app_->id()).Equals( | 929 EXPECT_FALSE(extension_sorting->GetAppLaunchOrdinal(app_->id()).Equals( |
930 default_app_launch_ordinal_)); | 930 default_app_launch_ordinal_)); |
931 } | 931 } |
932 | 932 |
933 protected: | 933 protected: |
934 virtual void SetupUserOrdinals() { | 934 virtual void SetupUserOrdinals() OVERRIDE { |
935 other_app_ = prefs_.AddApp("other_app"); | 935 other_app_ = prefs_.AddApp("other_app"); |
936 // Creates a collision. | 936 // Creates a collision. |
937 ExtensionSorting* extension_sorting = prefs()->extension_sorting(); | 937 ExtensionSorting* extension_sorting = prefs()->extension_sorting(); |
938 extension_sorting->SetPageOrdinal(other_app_->id(), default_page_ordinal_); | 938 extension_sorting->SetPageOrdinal(other_app_->id(), default_page_ordinal_); |
939 extension_sorting->SetAppLaunchOrdinal(other_app_->id(), | 939 extension_sorting->SetAppLaunchOrdinal(other_app_->id(), |
940 default_app_launch_ordinal_); | 940 default_app_launch_ordinal_); |
941 | 941 |
942 yet_another_app_ = prefs_.AddApp("yet_aother_app"); | 942 yet_another_app_ = prefs_.AddApp("yet_aother_app"); |
943 extension_sorting->SetPageOrdinal(yet_another_app_->id(), | 943 extension_sorting->SetPageOrdinal(yet_another_app_->id(), |
944 default_page_ordinal_); | 944 default_page_ordinal_); |
945 extension_sorting->SetAppLaunchOrdinal(yet_another_app_->id(), | 945 extension_sorting->SetAppLaunchOrdinal(yet_another_app_->id(), |
946 default_app_launch_ordinal_); | 946 default_app_launch_ordinal_); |
947 } | 947 } |
948 | 948 |
949 private: | 949 private: |
950 scoped_refptr<Extension> other_app_; | 950 scoped_refptr<Extension> other_app_; |
951 scoped_refptr<Extension> yet_another_app_; | 951 scoped_refptr<Extension> yet_another_app_; |
952 }; | 952 }; |
953 TEST_F(ExtensionSortingDefaultOrdinalNoCollision, | 953 TEST_F(ExtensionSortingDefaultOrdinalNoCollision, |
954 ExtensionSortingDefaultOrdinalNoCollision) {} | 954 ExtensionSortingDefaultOrdinalNoCollision) {} |
OLD | NEW |