diff options
| author | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-06 18:22:46 +0000 |
|---|---|---|
| committer | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-06 18:22:46 +0000 |
| commit | 84df8330d252faf3ac552ba40364d973ee19af81 (patch) | |
| tree | 98a7f3fee4d8226e41a8e80628bd8c906b69414b /chrome/browser/extensions/extension_service_unittest.cc | |
| parent | 8a0941d2abb68b9626ac17cb5d1e4d9ecaa6303a (diff) | |
| download | chromium_src-84df8330d252faf3ac552ba40364d973ee19af81.zip chromium_src-84df8330d252faf3ac552ba40364d973ee19af81.tar.gz chromium_src-84df8330d252faf3ac552ba40364d973ee19af81.tar.bz2 | |
Revert 113071 - Revert 113047 - Make ExtensionService use ExtensionSet.
ExtensionManagementApiBrowserTest.LaunchApp fixed by r113141.
Make ExtensionSet iterate like a set instead of a map.
BUG=104091
TEST=existing tests
Review URL: http://codereview.chromium.org/8733004
TBR=yoz@chromium.org
Review URL: http://codereview.chromium.org/8789018
TBR=yoz@chromium.org
Review URL: http://codereview.chromium.org/8822021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113233 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_service_unittest.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_service_unittest.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc index 78ef149..eaee17a 100644 --- a/chrome/browser/extensions/extension_service_unittest.cc +++ b/chrome/browser/extensions/extension_service_unittest.cc @@ -1875,7 +1875,7 @@ TEST_F(ExtensionServiceTest, UpdateApps) { TEST_F(ExtensionServiceTest, InstallAppsWithUnlimitedStorage) { InitializeEmptyExtensionService(); InitializeRequestContext(); - EXPECT_TRUE(service_->extensions()->empty()); + EXPECT_TRUE(service_->extensions()->is_empty()); int pref_count = 0; @@ -1926,7 +1926,7 @@ TEST_F(ExtensionServiceTest, InstallAppsWithUnlimitedStorage) { TEST_F(ExtensionServiceTest, InstallAppsAndCheckStorageProtection) { InitializeEmptyExtensionService(); InitializeRequestContext(); - EXPECT_TRUE(service_->extensions()->empty()); + EXPECT_TRUE(service_->extensions()->is_empty()); int pref_count = 0; @@ -1955,7 +1955,7 @@ TEST_F(ExtensionServiceTest, InstallAppsAndCheckStorageProtection) { UninstallExtension(id2, false); - EXPECT_TRUE(service_->extensions()->empty()); + EXPECT_TRUE(service_->extensions()->is_empty()); EXPECT_FALSE(profile_->GetExtensionSpecialStoragePolicy()-> IsStorageProtected(origin1)); EXPECT_FALSE(profile_->GetExtensionSpecialStoragePolicy()-> @@ -2676,18 +2676,18 @@ TEST_F(ExtensionServiceTest, DisableExtension) { InitializeEmptyExtensionService(); InstallCRX(data_dir_.AppendASCII("good.crx"), INSTALL_NEW); - EXPECT_FALSE(service_->extensions()->empty()); + EXPECT_FALSE(service_->extensions()->is_empty()); EXPECT_TRUE(service_->GetExtensionById(good_crx, true)); EXPECT_TRUE(service_->GetExtensionById(good_crx, false)); - EXPECT_TRUE(service_->disabled_extensions()->empty()); + EXPECT_TRUE(service_->disabled_extensions()->is_empty()); // Disable it. service_->DisableExtension(good_crx); - EXPECT_TRUE(service_->extensions()->empty()); + EXPECT_TRUE(service_->extensions()->is_empty()); EXPECT_TRUE(service_->GetExtensionById(good_crx, true)); EXPECT_FALSE(service_->GetExtensionById(good_crx, false)); - EXPECT_FALSE(service_->disabled_extensions()->empty()); + EXPECT_FALSE(service_->disabled_extensions()->is_empty()); } TEST_F(ExtensionServiceTest, DisableTerminatedExtension) { @@ -2702,7 +2702,7 @@ TEST_F(ExtensionServiceTest, DisableTerminatedExtension) { EXPECT_FALSE(service_->GetTerminatedExtension(good_crx)); EXPECT_TRUE(service_->GetExtensionById(good_crx, true)); - EXPECT_FALSE(service_->disabled_extensions()->empty()); + EXPECT_FALSE(service_->disabled_extensions()->is_empty()); } // Tests disabling all extensions (simulating --disable-extensions flag). |