Revert 113047 - Make ExtensionService use ExtensionSet.

chrome/browser/automation/automation_provider_observers.cc

Index: chrome/browser/automation/automation_provider_observers.cc
===================================================================
--- chrome/browser/automation/automation_provider_observers.cc	(revision 113069)
+++ chrome/browser/automation/automation_provider_observers.cc	(working copy)
@@ -2017,11 +2017,11 @@
 // as identified from a given list of extensions.  The caller takes ownership
 // of the created vector.
 std::vector<DictionaryValue*>* GetAppInfoFromExtensions(
-    const ExtensionSet* extensions,
+    const ExtensionList* extensions,
     ExtensionService* ext_service) {
   std::vector<DictionaryValue*>* apps_list =
       new std::vector<DictionaryValue*>();
-  for (ExtensionSet::const_iterator ext = extensions->begin();
+  for (ExtensionList::const_iterator ext = extensions->begin();
        ext != extensions->end(); ++ext) {
     // Only return information about extensions that are actually apps.
     if ((*ext)->is_app()) {
@@ -2089,7 +2089,7 @@
   }
   // Process enabled extensions.
   ListValue* apps_list = new ListValue();
-  const ExtensionSet* extensions = ext_service->extensions();
+  const ExtensionList* extensions = ext_service->extensions();
   std::vector<DictionaryValue*>* enabled_apps = GetAppInfoFromExtensions(
       extensions, ext_service);
   for (std::vector<DictionaryValue*>::const_iterator app =
@@ -2099,7 +2099,7 @@
   }
   delete enabled_apps;
   // Process disabled extensions.
-  const ExtensionSet* disabled_extensions = ext_service->disabled_extensions();
+  const ExtensionList* disabled_extensions = ext_service->disabled_extensions();
   std::vector<DictionaryValue*>* disabled_apps = GetAppInfoFromExtensions(
       disabled_extensions, ext_service);
   for (std::vector<DictionaryValue*>::const_iterator app =
@@ -2109,7 +2109,7 @@
   }
   delete disabled_apps;
   // Process terminated extensions.
-  const ExtensionSet* terminated_extensions =
+  const ExtensionList* terminated_extensions =
       ext_service->terminated_extensions();
   std::vector<DictionaryValue*>* terminated_apps = GetAppInfoFromExtensions(
       terminated_extensions, ext_service);
Property changes on: chrome/browser/automation/automation_provider_observers.cc
___________________________________________________________________
Added: svn:mergeinfo