Ignore paths when matching patterns for extensions.

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 727c95309ce95d8751018763648bfab30bea4e3c..1fd4b3f76f3a14fef4da63c7ba9297eb30523b87 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -764,23 +764,24 @@ void ChromeContentBrowserClient::RequestDesktopNotificationPermission(
 
 WebKit::WebNotificationPresenter::Permission
     ChromeContentBrowserClient::CheckDesktopNotificationPermission(
-        const GURL& source_url,
-        const content::ResourceContext& context) {
+        const GURL& source_origin,
+        const content::ResourceContext& context,
+        int render_process_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   ProfileIOData* io_data =
       reinterpret_cast<ProfileIOData*>(context.GetUserData(NULL));
 
-  const Extension* extension =
-      io_data->GetExtensionInfoMap()->extensions().GetByURL(source_url);
-  if (extension &&
-      extension->HasAPIPermission(ExtensionAPIPermission::kNotification)) {
+  if (io_data->GetExtensionInfoMap()->SecurityOriginHasAPIPermission(
+        source_origin, render_process_id,
+        ExtensionAPIPermission::kNotification))
     return WebKit::WebNotificationPresenter::PermissionAllowed;
-  }
 
   // Fall back to the regular notification preferences, which works on an
   // origin basis.
+  // TODO(dcheng): Change to just source_origin once WebKit side is cleaned up.
   return io_data->GetNotificationService() ?
-      io_data->GetNotificationService()->HasPermission(source_url.GetOrigin()) :
+      io_data->GetNotificationService()->HasPermission(
+          source_origin.GetOrigin()) :
       WebKit::WebNotificationPresenter::PermissionNotAllowed;
 }
 
@@ -826,19 +827,18 @@ void ChromeContentBrowserClient::CancelDesktopNotification(
 }
 
 bool ChromeContentBrowserClient::CanCreateWindow(
-    const GURL& source_url,
+    const GURL& source_origin,
     WindowContainerType container_type,
-    const content::ResourceContext& context) {
+    const content::ResourceContext& context,
+    int render_process_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   // If the opener is trying to create a background window but doesn't have
   // the appropriate permission, fail the attempt.
   if (container_type == WINDOW_CONTAINER_TYPE_BACKGROUND) {
     ProfileIOData* io_data =
         reinterpret_cast<ProfileIOData*>(context.GetUserData(NULL));
-    const Extension* extension =
-        io_data->GetExtensionInfoMap()->extensions().GetByURL(source_url);
-    return (extension &&
-            extension->HasAPIPermission(ExtensionAPIPermission::kBackground));
+    return io_data->GetExtensionInfoMap()->SecurityOriginHasAPIPermission(
+        source_origin, render_process_id, ExtensionAPIPermission::kBackground);
   }
   return true;
 }