Revert 113071 - Revert 113047 - Make ExtensionService use ExtensionSet.

chrome/browser/extensions/extension_info_map.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_info_map.h"
 
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 120 matching lines @@
 
 bool ExtensionInfoMap::SecurityOriginHasAPIPermission(
     const GURL& origin, int process_id,
     ExtensionAPIPermission::ID permission) const {
   if (origin.SchemeIs(chrome::kExtensionScheme)) {
     const std::string& id = origin.host();
     return extensions_.GetByID(id)->HasAPIPermission(permission) &&
         process_map_.Contains(id, process_id);
   }
 
-  ExtensionSet::ExtensionMap::const_iterator i = extensions_.begin();
+  ExtensionSet::const_iterator i = extensions_.begin();
   for (; i != extensions_.end(); ++i) {
-    if (i->second->web_extent().MatchesSecurityOrigin(origin) &&
-        process_map_.Contains(i->first, process_id) &&
-        i->second->HasAPIPermission(permission)) {
+    if ((*i)->web_extent().MatchesSecurityOrigin(origin) &&
+        process_map_.Contains((*i)->id(), process_id) &&
+        (*i)->HasAPIPermission(permission)) {
       return true;
     }
   }
   return false;
 }