Merge 55103 - Refactored extension privilege enumeration and implemented URLP...

chrome/browser/net/chrome_url_request_context.cc

Index: chrome/browser/net/chrome_url_request_context.cc
===================================================================
--- chrome/browser/net/chrome_url_request_context.cc	(revision 56058)
+++ chrome/browser/net/chrome_url_request_context.cc	(working copy)
@@ -798,6 +798,17 @@
   return result;
 }
 
+ExtensionExtent
+    ChromeURLRequestContext::GetEffectiveHostPermissionsForExtension(
+        const std::string& id) {
+  ExtensionInfoMap::iterator iter = extension_info_.find(id);
+  ExtensionExtent result;
+  if (iter != extension_info_.end())
+    result = iter->second->effective_host_permissions;
+
+  return result;
+}
+
 bool ChromeURLRequestContext::CheckURLAccessToExtensionPermission(
     const GURL& url,
     const char* permission_name) {
@@ -962,6 +973,7 @@
                   (*iter)->path(),
                   (*iter)->default_locale(),
                   (*iter)->web_extent(),
+                  (*iter)->GetEffectiveHostPermissions(),
                   (*iter)->api_permissions()));
     }
   }