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/sync | |
| 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/sync')
| -rw-r--r-- | chrome/browser/sync/test/integration/sync_extension_helper.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/chrome/browser/sync/test/integration/sync_extension_helper.cc b/chrome/browser/sync/test/integration/sync_extension_helper.cc index be0d08b..08d1e8b 100644 --- a/chrome/browser/sync/test/integration/sync_extension_helper.cc +++ b/chrome/browser/sync/test/integration/sync_extension_helper.cc @@ -78,22 +78,22 @@ std::vector<std::string> SyncExtensionHelper::GetInstalledExtensionNames( std::vector<std::string> names; ExtensionService* extension_service = profile->GetExtensionService(); - const ExtensionList* extensions = extension_service->extensions(); - for (ExtensionList::const_iterator it = extensions->begin(); + const ExtensionSet* extensions = extension_service->extensions(); + for (ExtensionSet::const_iterator it = extensions->begin(); it != extensions->end(); ++it) { names.push_back((*it)->name()); } - const ExtensionList* disabled_extensions = + const ExtensionSet* disabled_extensions = extension_service->disabled_extensions(); - for (ExtensionList::const_iterator it = disabled_extensions->begin(); + for (ExtensionSet::const_iterator it = disabled_extensions->begin(); it != disabled_extensions->end(); ++it) { names.push_back((*it)->name()); } - const ExtensionList* terminated_extensions = + const ExtensionSet* terminated_extensions = extension_service->terminated_extensions(); - for (ExtensionList::const_iterator it = terminated_extensions->begin(); + for (ExtensionSet::const_iterator it = terminated_extensions->begin(); it != terminated_extensions->end(); ++it) { names.push_back((*it)->name()); } @@ -180,8 +180,8 @@ SyncExtensionHelper::ExtensionStateMap ExtensionService* extension_service = profile->GetExtensionService(); - const ExtensionList* extensions = extension_service->extensions(); - for (ExtensionList::const_iterator it = extensions->begin(); + const ExtensionSet* extensions = extension_service->extensions(); + for (ExtensionSet::const_iterator it = extensions->begin(); it != extensions->end(); ++it) { const std::string& id = (*it)->id(); extension_state_map[id].enabled_state = ExtensionState::ENABLED; @@ -191,9 +191,9 @@ SyncExtensionHelper::ExtensionStateMap << profile_debug_name << " is enabled"; } - const ExtensionList* disabled_extensions = + const ExtensionSet* disabled_extensions = extension_service->disabled_extensions(); - for (ExtensionList::const_iterator it = disabled_extensions->begin(); + for (ExtensionSet::const_iterator it = disabled_extensions->begin(); it != disabled_extensions->end(); ++it) { const std::string& id = (*it)->id(); extension_state_map[id].enabled_state = ExtensionState::DISABLED; |