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

1 files changed, 3 insertions, 3 deletions

diff --git a/chrome/browser/extensions/installed_loader.cc b/chrome/browser/extensions/installed_loader.cc
index 2fb5e2d..d74bff4 100644
--- a/chrome/browser/extensions/installed_loader.cc
+++ b/chrome/browser/extensions/installed_loader.cc
@@ -181,8 +181,8 @@ void InstalledLoader::LoadAllExtensions() {
   int theme_count = 0;
   int page_action_count = 0;
   int browser_action_count = 0;
-  const ExtensionList* extensions = extension_service_->extensions();
-  ExtensionList::const_iterator ex;
+  const ExtensionSet* extensions = extension_service_->extensions();
+  ExtensionSet::const_iterator ex;
   for (ex = extensions->begin(); ex != extensions->end(); ++ex) {
     Extension::Location location = (*ex)->location();
     Extension::Type type = (*ex)->GetType();
@@ -246,7 +246,7 @@ void InstalledLoader::LoadAllExtensions() {
       ++browser_action_count;
 
     extension_service_->RecordPermissionMessagesHistogram(
-        ex->get(), "Extensions.Permissions_Load");
+        *ex, "Extensions.Permissions_Load");
   }
   UMA_HISTOGRAM_COUNTS_100("Extensions.LoadApp",
                            app_user_count + app_external_count);