Small refactor: have ExtensionInfoMap use ExtensionSet.

BUG=no
TEST=no


Review URL: http://codereview.chromium.org/7066053

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87693 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 13 insertions, 8 deletions

diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc
index dd3f0cd..e82efdc 100644
--- a/content/browser/renderer_host/render_message_filter.cc
+++ b/content/browser/renderer_host/render_message_filter.cc
@@ -391,8 +391,10 @@ void RenderMessageFilter::OnMsgCreateWindow(
   // If the opener is trying to create a background window but doesn't have
   // the appropriate permission, fail the attempt.
   if (params.window_container_type == WINDOW_CONTAINER_TYPE_BACKGROUND) {
-    if (!extension_info_map_->CheckURLAccessToExtensionPermission(
-            params.opener_url, Extension::kBackgroundPermission)) {
+    const Extension* extension =
+        extension_info_map_->extensions().GetByURL(params.opener_url);
+    if (!extension ||
+        !extension->HasApiPermission(Extension::kBackgroundPermission)) {
       *route_id = MSG_ROUTING_NONE;
       return;
     }
@@ -615,8 +617,10 @@ void RenderMessageFilter::OnCheckNotificationPermission(
     const GURL& source_url, int* result) {
   *result = WebKit::WebNotificationPresenter::PermissionNotAllowed;
 
-  if (extension_info_map_->CheckURLAccessToExtensionPermission(
-          source_url, Extension::kNotificationPermission)) {
+  const Extension* extension =
+      extension_info_map_->extensions().GetByURL(source_url);
+  if (extension &&
+      extension->HasApiPermission(Extension::kNotificationPermission)) {
     *result = WebKit::WebNotificationPresenter::PermissionAllowed;
     return;
   }
diff --git a/content/browser/worker_host/worker_process_host.cc b/content/browser/worker_host/worker_process_host.cc
index c6b2609..83ec00b 100644
--- a/content/browser/worker_host/worker_process_host.cc
+++ b/content/browser/worker_host/worker_process_host.cc
@@ -465,10 +465,11 @@ void WorkerProcessHost::UpdateTitle() {
 
     // Check if it's an extension-created worker, in which case we want to use
     // the name of the extension.
-    std::string extension_name = resource_context_->
-        extension_info_map()->GetNameForExtension(title);
-    if (!extension_name.empty()) {
-      titles.insert(extension_name);
+    // TODO(mpcomplete): move out of content. http:://crbug.com/76789
+    const Extension* extension =
+        resource_context_->extension_info_map()->extensions().GetByID(title);
+    if (extension) {
+      titles.insert(extension->name());
       continue;
     }