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, 5 insertions, 5 deletions

diff --git a/chrome/browser/automation/automation_provider_observers.cc b/chrome/browser/automation/automation_provider_observers.cc
index a2decb9..670d01e 100644
--- a/chrome/browser/automation/automation_provider_observers.cc
+++ b/chrome/browser/automation/automation_provider_observers.cc
@@ -2018,11 +2018,11 @@ namespace {
 // as identified from a given list of extensions.  The caller takes ownership
 // of the created vector.
 std::vector<DictionaryValue*>* GetAppInfoFromExtensions(
-    const ExtensionList* extensions,
+    const ExtensionSet* extensions,
     ExtensionService* ext_service) {
   std::vector<DictionaryValue*>* apps_list =
       new std::vector<DictionaryValue*>();
-  for (ExtensionList::const_iterator ext = extensions->begin();
+  for (ExtensionSet::const_iterator ext = extensions->begin();
        ext != extensions->end(); ++ext) {
     // Only return information about extensions that are actually apps.
     if ((*ext)->is_app()) {
@@ -2090,7 +2090,7 @@ NTPInfoObserver::NTPInfoObserver(
   }
   // Process enabled extensions.
   ListValue* apps_list = new ListValue();
-  const ExtensionList* extensions = ext_service->extensions();
+  const ExtensionSet* extensions = ext_service->extensions();
   std::vector<DictionaryValue*>* enabled_apps = GetAppInfoFromExtensions(
       extensions, ext_service);
   for (std::vector<DictionaryValue*>::const_iterator app =
@@ -2100,7 +2100,7 @@ NTPInfoObserver::NTPInfoObserver(
   }
   delete enabled_apps;
   // Process disabled extensions.
-  const ExtensionList* disabled_extensions = ext_service->disabled_extensions();
+  const ExtensionSet* disabled_extensions = ext_service->disabled_extensions();
   std::vector<DictionaryValue*>* disabled_apps = GetAppInfoFromExtensions(
       disabled_extensions, ext_service);
   for (std::vector<DictionaryValue*>::const_iterator app =
@@ -2110,7 +2110,7 @@ NTPInfoObserver::NTPInfoObserver(
   }
   delete disabled_apps;
   // Process terminated extensions.
-  const ExtensionList* terminated_extensions =
+  const ExtensionSet* terminated_extensions =
       ext_service->terminated_extensions();
   std::vector<DictionaryValue*>* terminated_apps = GetAppInfoFromExtensions(
       terminated_extensions, ext_service);