Hook up extension apps notification permission, take two

chrome/browser/net/chrome_url_request_context.cc

 // Copyright (c) 2010 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/net/chrome_url_request_context.h"
 
 #include "base/command_line.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_thread.h"
@@ skipping 730 matching lines @@
   ExtensionInfoMap::iterator iter = extension_info_.find(id);
   std::string result;
   if (iter != extension_info_.end())
     result = iter->second->default_locale;
 
   return result;
 }
 
 bool ChromeURLRequestContext::CheckURLAccessToExtensionPermission(
     const GURL& url,
-    const std::string& application_id,
     const char* permission_name) {
-  DCHECK(!application_id.empty());
+  ExtensionInfoMap::iterator info;
+  if (url.SchemeIs(chrome::kExtensionScheme)) {
+    // If the url is an extension scheme, we just look it up by extension id.
+    std::string id = url.host();
+    info = extension_info_.find(id);
+  } else {
+    // Otherwise, we scan for a matching extent. Overlapping extents are
+    // disallowed, so only one will match.
+    info = extension_info_.begin();
+    while (info != extension_info_.end() &&
+           !info->second->extent.ContainsURL(url))
+      ++info;
+  }
 
-  // Get the information about the specified extension. If the extension isn't
-  // installed, then permission is not granted.
-  ExtensionInfoMap::iterator info = extension_info_.find(application_id);
   if (info == extension_info_.end())
     return false;
 
-  // Check that the extension declares the required permission.
-  std::vector<std::string>& permissions = info->second->api_permissions;
-  if (permissions.end() == std::find(permissions.begin(), permissions.end(),
-                                     permission_name)) {
-    return false;
-  }
-
-  // Check that the extension declares the source URL in its extent.
-  Extension::URLPatternList& extent = info->second->extent;
-  for (Extension::URLPatternList::iterator pattern = extent.begin();
-       pattern != extent.end(); ++pattern) {
-    if (pattern->MatchesUrl(url))
-      return true;
-  }
-
-  return false;
+  std::vector<std::string>& api_permissions = info->second->api_permissions;
+  return std::find(api_permissions.begin(),
+                   api_permissions.end(),
+                   permission_name) != api_permissions.end();
 }
 
 const std::string& ChromeURLRequestContext::GetUserAgent(
     const GURL& url) const {
   return webkit_glue::GetUserAgent(url);
 }
 
 bool ChromeURLRequestContext::InterceptRequestCookies(
     const URLRequest* request, const std::string& cookies) const {
   return InterceptCookie(request, cookies);
@@ skipping 151 matching lines @@
   if (profile->GetExtensionsService()) {
     const ExtensionList* extensions =
         profile->GetExtensionsService()->extensions();
     for (ExtensionList::const_iterator iter = extensions->begin();
         iter != extensions->end(); ++iter) {
       extension_info_[(*iter)->id()] =
           linked_ptr<ChromeURLRequestContext::ExtensionInfo>(
               new ChromeURLRequestContext::ExtensionInfo(
                   (*iter)->path(),
                   (*iter)->default_locale(),
-                  std::vector<URLPattern>(),
+                  (*iter)->web_extent(),
                   (*iter)->api_permissions()));
     }
   }
 
   if (profile->GetUserScriptMaster())
     user_script_dir_path_ = profile->GetUserScriptMaster()->user_script_dir();
 
   ssl_config_service_ = profile->GetSSLConfigService();
 
   profile_dir_path_ = profile->GetPath();
@@ skipping 76 matching lines @@
   }
 
   if (command_line.HasSwitch(switches::kProxyBypassList)) {
     proxy_config->proxy_rules().bypass_rules.ParseFromString(
         WideToASCII(command_line.GetSwitchValue(
             switches::kProxyBypassList)));
   }
 
   return proxy_config;
 }