Revert 113071 - Revert 113047 - Make ExtensionService use ExtensionSet.

chrome/browser/extensions/extension_tts_engine_api.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/extensions/extension_tts_engine_api.h"
 
 #include <string>
 
 #include "base/json/json_writer.h"
 #include "base/values.h"
@@ skipping 10 matching lines @@
 const char kOnSpeak[] = "ttsEngine.onSpeak";
 const char kOnStop[] = "ttsEngine.onStop";
 };  // namespace events
 
 void GetExtensionVoices(Profile* profile, ListValue* result_voices) {
   ExtensionService* service = profile->GetExtensionService();
   DCHECK(service);
   ExtensionEventRouter* event_router = profile->GetExtensionEventRouter();
   DCHECK(event_router);
 
-  const ExtensionList* extensions = service->extensions();
-  ExtensionList::const_iterator iter;
+  const ExtensionSet* extensions = service->extensions();
+  ExtensionSet::const_iterator iter;
   for (iter = extensions->begin(); iter != extensions->end(); ++iter) {
     const Extension* extension = *iter;
 
     if (!event_router->ExtensionHasEventListener(
             extension->id(), events::kOnSpeak) ||
         !event_router->ExtensionHasEventListener(
             extension->id(), events::kOnStop)) {
       continue;
     }
 
@@ skipping 43 matching lines @@
     return false;
 
   ExtensionService* service = utterance->profile()->GetExtensionService();
   DCHECK(service);
   ExtensionEventRouter* event_router =
       utterance->profile()->GetExtensionEventRouter();
   DCHECK(event_router);
 
   *matching_extension = NULL;
   *voice_index = -1;
-  const ExtensionList* extensions = service->extensions();
-  ExtensionList::const_iterator iter;
+  const ExtensionSet* extensions = service->extensions();
+  ExtensionSet::const_iterator iter;
   for (iter = extensions->begin(); iter != extensions->end(); ++iter) {
     const Extension* extension = *iter;
 
     if (!event_router->ExtensionHasEventListener(
             extension->id(), events::kOnSpeak) ||
         !event_router->ExtensionHasEventListener(
             extension->id(), events::kOnStop)) {
       continue;
     }
 
@@ skipping 149 matching lines @@
     std::string error_message;
     event->GetString(constants::kErrorMessageKey, &error_message);
     controller->OnTtsEvent(
         utterance_id, TTS_EVENT_ERROR, char_index, error_message);
   } else {
     EXTENSION_FUNCTION_VALIDATE(false);
   }
 
   return true;
 }