Revert 113071 - Revert 113047 - Make ExtensionService use ExtensionSet.

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

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/options/extension_settings_handler.h"
 
 #include "base/auto_reset.h"
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 132 matching lines @@
 
 void ExtensionSettingsHandler::HandleRequestExtensionsData(
     const ListValue* args) {
   DictionaryValue results;
 
   // Add the extensions to the results structure.
   ListValue *extensions_list = new ListValue();
 
   ExtensionWarningSet* warnings = extension_service_->extension_warnings();
 
-  const ExtensionList* extensions = extension_service_->extensions();
-  for (ExtensionList::const_iterator extension = extensions->begin();
+  const ExtensionSet* extensions = extension_service_->extensions();
+  for (ExtensionSet::const_iterator extension = extensions->begin();
        extension != extensions->end(); ++extension) {
     if (ShouldShowExtension(*extension)) {
       extensions_list->Append(CreateExtensionDetailValue(
           extension_service_,
           *extension,
           GetActivePagesForExtension(*extension),
           warnings,
           true, false));  // enabled, terminated
     }
   }
   extensions = extension_service_->disabled_extensions();
-  for (ExtensionList::const_iterator extension = extensions->begin();
+  for (ExtensionSet::const_iterator extension = extensions->begin();
        extension != extensions->end(); ++extension) {
     if (ShouldShowExtension(*extension)) {
       extensions_list->Append(CreateExtensionDetailValue(
           extension_service_,
           *extension,
           GetActivePagesForExtension(*extension),
           warnings,
           false, false));  // enabled, terminated
     }
   }
   extensions = extension_service_->terminated_extensions();
   std::vector<ExtensionPage> empty_pages;
-  for (ExtensionList::const_iterator extension = extensions->begin();
+  for (ExtensionSet::const_iterator extension = extensions->begin();
        extension != extensions->end(); ++extension) {
     if (ShouldShowExtension(*extension)) {
       extensions_list->Append(CreateExtensionDetailValue(
           extension_service_,
           *extension,
           empty_pages,  // Terminated process has no active pages.
           warnings,
           false, true));  // enabled, terminated
     }
   }
@@ skipping 586 matching lines @@
         chrome::VIEW_TYPE_EXTENSION_DIALOG == host_type)
       continue;
 
     GURL url = host->delegate()->GetURL();
     content::RenderProcessHost* process = host->process();
     result->push_back(
         ExtensionPage(url, process->GetID(), host->routing_id(),
                       process->GetBrowserContext()->IsOffTheRecord()));
   }
 }