Revert 113071 - Revert 113047 - Make ExtensionService use ExtensionSet.

chrome/browser/intents/web_intents_registry.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/intents/web_intents_registry.h"
 
 #include "base/callback.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "net/base/mime_util.h"
@@ skipping 63 matching lines @@
 
   IntentsQuery* query(it->second);
   DCHECK(query);
   queries_.erase(it);
 
   IntentServiceList matching_services = static_cast<
       const WDResult<IntentServiceList>*>(result)->GetValue();
 
   // Loop over all intents in all extensions, collect ones matching the query.
   if (extension_service_) {
-    const ExtensionList* extensions = extension_service_->extensions();
+    const ExtensionSet* extensions = extension_service_->extensions();
     if (extensions) {
-      for (ExtensionList::const_iterator i(extensions->begin());
+      for (ExtensionSet::const_iterator i(extensions->begin());
            i != extensions->end(); ++i) {
         const IntentServiceList& intents((*i)->intents_services());
         for (IntentServiceList::const_iterator j(intents.begin());
              j != intents.end(); ++j) {
           if (query->action_.empty() || query->action_ == j->action)
             matching_services.push_back(*j);
         }
       }
     }
   }
@@ skipping 93 matching lines @@
     const WebIntentServiceData& service) {
   DCHECK(wds_.get());
   wds_->AddWebIntentService(service);
 }
 
 void WebIntentsRegistry::UnregisterIntentProvider(
     const WebIntentServiceData& service) {
   DCHECK(wds_.get());
   wds_->RemoveWebIntentService(service);
 }