Simplify permission-related code for Web Notifications.

extensions/browser/info_map.cc

 // Copyright 2013 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 "extensions/browser/info_map.h"
 
 #include "base/strings/string_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "extensions/browser/content_verifier.h"
 #include "extensions/common/constants.h"
@@ skipping 111 matching lines @@
   if (!process_map_.Remove(extension_id, process_id, site_instance_id)) {
     NOTREACHED() << "Unknown extension process registration for: "
                  << extension_id << "," << process_id << ".";
   }
 }
 
 void InfoMap::UnregisterAllExtensionsInProcess(int process_id) {
   process_map_.RemoveAllFromProcess(process_id);
 }
 
-void InfoMap::GetExtensionsWithAPIPermissionForSecurityOrigin(
+bool InfoMap::SecurityOriginHasAPIPermission(
     const GURL& origin,
     int process_id,
-    APIPermission::ID permission,
-    ExtensionSet* extensions) const {
-  DCHECK(extensions);
+    APIPermission::ID permission) const {
+  CheckOnValidThread();
 
   if (origin.SchemeIs(kExtensionScheme)) {
     const std::string& id = origin.host();
     const Extension* extension = extensions_.GetByID(id);
-    if (extension &&
-        extension->permissions_data()->HasAPIPermission(permission) &&
-        process_map_.Contains(id, process_id)) {
-      extensions->Insert(extension);
-    }
-    return;
+

[not at google - send to devlin, 2015/06/26 14:50:01]

Not necessary to change this code to add a blank line.

[Peter Beverloo, 2015/06/29 12:54:21]

I removed the blank lines..

+    return extension &&
+           extension->permissions_data()->HasAPIPermission(permission) &&
+           process_map_.Contains(id, process_id);
   }
 
-  ExtensionSet::const_iterator i = extensions_.begin();
-  for (; i != extensions_.end(); ++i) {
-    if ((*i)->web_extent().MatchesSecurityOrigin(origin) &&
-        process_map_.Contains((*i)->id(), process_id) &&
-        (*i)->permissions_data()->HasAPIPermission(permission)) {
-      extensions->Insert(*i);
+  for (const auto& extension : extensions_) {
+    if (extension->web_extent().MatchesSecurityOrigin(origin) &&
+        extension->permissions_data()->HasAPIPermission(permission) &&
+        process_map_.Contains(extension->id(), process_id)) {
+      return true;
     }
   }
-}
 
-bool InfoMap::SecurityOriginHasAPIPermission(const GURL& origin,
-                                             int process_id,
-                                             APIPermission::ID permission)
-    const {
-  ExtensionSet extensions;
-  GetExtensionsWithAPIPermissionForSecurityOrigin(
-      origin, process_id, permission, &extensions);
-  return !extensions.is_empty();
+  return false;
 }
 
 // This function is security sensitive. Bugs could cause problems that break
 // restrictions on local file access or NaCl's validation caching. If you modify
 // this function, please get a security review from a NaCl person.
 bool InfoMap::MapUrlToLocalFilePath(const GURL& file_url,
                                     bool use_blocking_api,
                                     base::FilePath* file_path) {
   // Check that the URL is recognized by the extension system.
   const Extension* extension = extensions_.GetExtensionOrAppByURL(file_url);
@@ skipping 75 matching lines @@
 }
 
 InfoMap::~InfoMap() {
   if (quota_service_) {
     BrowserThread::DeleteSoon(
         BrowserThread::IO, FROM_HERE, quota_service_.release());
   }
 }
 
 }  // namespace extensions