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

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

Issue 10977048: Fix bug in disabling sync for default apps (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Fix browser and integration tests, which got broken Created 8 years, 2 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 | Annotate | Revision Log
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 "extension_prefs_unittest.h" 5 #include "extension_prefs_unittest.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/scoped_temp_dir.h" 9 #include "base/scoped_temp_dir.h"
10 #include "base/stl_util.h" 10 #include "base/stl_util.h"
(...skipping 722 matching lines...) Expand 10 before | Expand all | Expand 10 after
733 std::string id4_; 733 std::string id4_;
734 }; 734 };
735 TEST_F(ExtensionPrefsIdleInstallInfo, IdleInstallInfo) {} 735 TEST_F(ExtensionPrefsIdleInstallInfo, IdleInstallInfo) {}
736 736
737 class ExtensionPrefsOnExtensionInstalled : public ExtensionPrefsTest { 737 class ExtensionPrefsOnExtensionInstalled : public ExtensionPrefsTest {
738 public: 738 public:
739 virtual void Initialize() { 739 virtual void Initialize() {
740 extension_ = prefs_.AddExtension("on_extension_installed"); 740 extension_ = prefs_.AddExtension("on_extension_installed");
741 EXPECT_FALSE(prefs()->IsExtensionDisabled(extension_->id())); 741 EXPECT_FALSE(prefs()->IsExtensionDisabled(extension_->id()));
742 prefs()->OnExtensionInstalled( 742 prefs()->OnExtensionInstalled(
743 extension_.get(), Extension::DISABLED, false, 743 extension_.get(), Extension::DISABLED,
744 syncer::StringOrdinal()); 744 syncer::StringOrdinal());
745 } 745 }
746 746
747 virtual void Verify() { 747 virtual void Verify() {
748 EXPECT_TRUE(prefs()->IsExtensionDisabled(extension_->id())); 748 EXPECT_TRUE(prefs()->IsExtensionDisabled(extension_->id()));
749 } 749 }
750 750
751 private: 751 private:
752 scoped_refptr<Extension> extension_; 752 scoped_refptr<Extension> extension_;
753 }; 753 };
754 TEST_F(ExtensionPrefsOnExtensionInstalled, 754 TEST_F(ExtensionPrefsOnExtensionInstalled,
755 ExtensionPrefsOnExtensionInstalled) {} 755 ExtensionPrefsOnExtensionInstalled) {}
756 756
757 class ExtensionPrefsAppDraggedByUser : public ExtensionPrefsTest { 757 class ExtensionPrefsAppDraggedByUser : public ExtensionPrefsTest {
758 public: 758 public:
759 virtual void Initialize() { 759 virtual void Initialize() {
760 extension_ = prefs_.AddExtension("on_extension_installed"); 760 extension_ = prefs_.AddExtension("on_extension_installed");
761 EXPECT_FALSE(prefs()->WasAppDraggedByUser(extension_->id())); 761 EXPECT_FALSE(prefs()->WasAppDraggedByUser(extension_->id()));
762 prefs()->OnExtensionInstalled(extension_.get(), Extension::ENABLED, 762 prefs()->OnExtensionInstalled(extension_.get(), Extension::ENABLED,
763 false, syncer::StringOrdinal()); 763 syncer::StringOrdinal());
764 } 764 }
765 765
766 virtual void Verify() { 766 virtual void Verify() {
767 // Set the flag and see if it persisted. 767 // Set the flag and see if it persisted.
768 prefs()->SetAppDraggedByUser(extension_->id()); 768 prefs()->SetAppDraggedByUser(extension_->id());
769 EXPECT_TRUE(prefs()->WasAppDraggedByUser(extension_->id())); 769 EXPECT_TRUE(prefs()->WasAppDraggedByUser(extension_->id()));
770 770
771 // Make sure it doesn't change on consecutive calls. 771 // Make sure it doesn't change on consecutive calls.
772 prefs()->SetAppDraggedByUser(extension_->id()); 772 prefs()->SetAppDraggedByUser(extension_->id());
773 EXPECT_TRUE(prefs()->WasAppDraggedByUser(extension_->id())); 773 EXPECT_TRUE(prefs()->WasAppDraggedByUser(extension_->id()));
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
915 const std::string& extension_id) { 915 const std::string& extension_id) {
916 EnsureExtensionUninstalled(extension_id); 916 EnsureExtensionUninstalled(extension_id);
917 } 917 }
918 918
919 void ExtensionPrefsPrepopulatedTest::EnsureExtensionInstalled(Extension *ext) { 919 void ExtensionPrefsPrepopulatedTest::EnsureExtensionInstalled(Extension *ext) {
920 // Install extension the first time a preference is set for it. 920 // Install extension the first time a preference is set for it.
921 Extension* extensions[] = {ext1_, ext2_, ext3_, ext4_}; 921 Extension* extensions[] = {ext1_, ext2_, ext3_, ext4_};
922 for (size_t i = 0; i < arraysize(extensions); ++i) { 922 for (size_t i = 0; i < arraysize(extensions); ++i) {
923 if (ext == extensions[i] && !installed[i]) { 923 if (ext == extensions[i] && !installed[i]) {
924 prefs()->OnExtensionInstalled(ext, Extension::ENABLED, 924 prefs()->OnExtensionInstalled(ext, Extension::ENABLED,
925 false, syncer::StringOrdinal()); 925 syncer::StringOrdinal());
926 installed[i] = true; 926 installed[i] = true;
927 break; 927 break;
928 } 928 }
929 } 929 }
930 } 930 }
931 931
932 void ExtensionPrefsPrepopulatedTest::EnsureExtensionUninstalled( 932 void ExtensionPrefsPrepopulatedTest::EnsureExtensionUninstalled(
933 const std::string& extension_id) { 933 const std::string& extension_id) {
934 Extension* extensions[] = {ext1_, ext2_, ext3_, ext4_}; 934 Extension* extensions[] = {ext1_, ext2_, ext3_, ext4_};
935 for (size_t i = 0; i < arraysize(extensions); ++i) { 935 for (size_t i = 0; i < arraysize(extensions); ++i) {
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
1282 EXPECT_EQ(string16(), error16); 1282 EXPECT_EQ(string16(), error16);
1283 EXPECT_TRUE(prefs()->UserMayModifySettings(extension_.get(), &error16)); 1283 EXPECT_TRUE(prefs()->UserMayModifySettings(extension_.get(), &error16));
1284 EXPECT_EQ(string16(), error16); 1284 EXPECT_EQ(string16(), error16);
1285 EXPECT_FALSE(prefs()->MustRemainEnabled(extension_.get(), &error16)); 1285 EXPECT_FALSE(prefs()->MustRemainEnabled(extension_.get(), &error16));
1286 EXPECT_EQ(string16(), error16); 1286 EXPECT_EQ(string16(), error16);
1287 } 1287 }
1288 }; 1288 };
1289 TEST_F(ExtensionPrefsNotRequiredExtension, NotRequiredExtension) {} 1289 TEST_F(ExtensionPrefsNotRequiredExtension, NotRequiredExtension) {}
1290 1290
1291 } // namespace extensions 1291 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_prefs.cc ('k') | chrome/browser/extensions/extension_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698