Ignore paths when matching patterns for extensions.

chrome/browser/chrome_content_browser_client.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/chrome_content_browser_client.h"
 
 #include "base/command_line.h"
 #include "chrome/app/breakpad_mac.h"
 #include "chrome/browser/browser_about_handler.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 746 matching lines @@
   Profile* profile = Profile::FromBrowserContext(process->browser_context());
   DesktopNotificationService* service =
       DesktopNotificationServiceFactory::GetForProfile(profile);
   service->RequestPermission(
       source_origin, render_process_id, render_view_id, callback_context,
       tab_util::GetTabContentsByID(render_process_id, render_view_id));
 }
 
 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;
 }
 
 void ChromeContentBrowserClient::ShowDesktopNotification(
     const DesktopNotificationHostMsg_Show_Params& params,
     int render_process_id,
     int render_view_id,
     bool worker) {
   RenderViewHost* rvh = RenderViewHost::FromID(
       render_process_id, render_view_id);
@@ skipping 25 matching lines @@
 
   RenderProcessHost* process = rvh->process();
   Profile* profile = Profile::FromBrowserContext(process->browser_context());
   DesktopNotificationService* service =
       DesktopNotificationServiceFactory::GetForProfile(profile);
   service->CancelDesktopNotification(
       render_process_id, render_view_id, notification_id);
 }
 
 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;
 }
 
 std::string ChromeContentBrowserClient::GetWorkerProcessTitle(
     const GURL& url, const content::ResourceContext& context) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   // Check if it's an extension-created worker, in which case we want to use
   // the name of the extension.
   ProfileIOData* io_data =
@@ skipping 136 matching lines @@
 #if defined(USE_NSS)
 crypto::CryptoModuleBlockingPasswordDelegate*
     ChromeContentBrowserClient::GetCryptoPasswordDelegate(
         const GURL& url) {
   return browser::NewCryptoModuleBlockingDialogDelegate(
       browser::kCryptoModulePasswordKeygen, url.host());
 }
 #endif
 
 }  // namespace chrome