Index: chrome/browser/permissions/permission_blacklist_client.cc |
diff --git a/chrome/browser/permissions/permission_blacklist_client.cc b/chrome/browser/permissions/permission_blacklist_client.cc |
index 18f57460283852ab4b0b7b384a71d91ed39d8d1d..54a00ab0f730918e705fa3b617a04be785a4800a 100644 |
--- a/chrome/browser/permissions/permission_blacklist_client.cc |
+++ b/chrome/browser/permissions/permission_blacklist_client.cc |
@@ -74,12 +74,14 @@ void PermissionBlacklistClient::OnCheckApiBlacklistUrlResult( |
else |
db_manager_->CancelApiCheck(this); |
timer_.reset(nullptr); |
+ std::set<content::PermissionType> permission_types; |
+ for (const auto& i : metadata.api_permissions) { |
raymes
2017/01/24 05:15:16
nit: auto can be helpful sometimes, but in other c
meredithl
2017/01/24 23:20:21
Done.
|
+ permission_types.insert( |
+ PermissionUtil::ConvertSafeBrowsingNameToPermissionType(i)); |
+ } |
- // TODO(meredithl): Convert the strings returned from Safe Browsing to the |
- // ones used by PermissionUtil for comparison. |
bool permission_blocked = |
- metadata.api_permissions.find(PermissionUtil::GetPermissionString( |
- permission_type_)) != metadata.api_permissions.end(); |
+ permission_types.find(permission_type_) != permission_types.end(); |
raymes
2017/01/24 05:15:16
Would this be simpler if we just converted in the
meredithl
2017/01/24 23:20:21
Done.
|
content::BrowserThread::PostTask( |
content::BrowserThread::UI, FROM_HERE, |