Revert 113047 - Make ExtensionService use ExtensionSet.

chrome/browser/ui/webui/options/extension_settings_handler.cc

Index: chrome/browser/ui/webui/options/extension_settings_handler.cc
===================================================================
--- chrome/browser/ui/webui/options/extension_settings_handler.cc	(revision 113069)
+++ chrome/browser/ui/webui/options/extension_settings_handler.cc	(working copy)
@@ -150,8 +150,8 @@
 
   ExtensionWarningSet* warnings = extension_service_->extension_warnings();
 
-  const ExtensionSet* extensions = extension_service_->extensions();
-  for (ExtensionSet::const_iterator extension = extensions->begin();
+  const ExtensionList* extensions = extension_service_->extensions();
+  for (ExtensionList::const_iterator extension = extensions->begin();
        extension != extensions->end(); ++extension) {
     if (ShouldShowExtension(*extension)) {
       extensions_list->Append(CreateExtensionDetailValue(
@@ -163,7 +163,7 @@
     }
   }
   extensions = extension_service_->disabled_extensions();
-  for (ExtensionSet::const_iterator extension = extensions->begin();
+  for (ExtensionList::const_iterator extension = extensions->begin();
        extension != extensions->end(); ++extension) {
     if (ShouldShowExtension(*extension)) {
       extensions_list->Append(CreateExtensionDetailValue(
@@ -176,7 +176,7 @@
   }
   extensions = extension_service_->terminated_extensions();
   std::vector<ExtensionPage> empty_pages;
-  for (ExtensionSet::const_iterator extension = extensions->begin();
+  for (ExtensionList::const_iterator extension = extensions->begin();
        extension != extensions->end(); ++extension) {
     if (ShouldShowExtension(*extension)) {
       extensions_list->Append(CreateExtensionDetailValue(
Property changes on: chrome/browser/ui/webui/options/extension_settings_handler.cc
___________________________________________________________________
Added: svn:mergeinfo