Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1719)

Unified Diff: chrome/browser/extensions/extension_prefs_unittest.cc

Issue 10692160: Support socket endpoint permissions for AppsV2 Socket API. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix compile issues.wq Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/extension_prefs_unittest.cc
diff --git a/chrome/browser/extensions/extension_prefs_unittest.cc b/chrome/browser/extensions/extension_prefs_unittest.cc
index f240488501f487fe907ddf68ac9a32003aa368b0..31d0b7836eda1a91a33489dcc6574865fa09421a 100644
--- a/chrome/browser/extensions/extension_prefs_unittest.cc
+++ b/chrome/browser/extensions/extension_prefs_unittest.cc
@@ -350,9 +350,7 @@ class ExtensionPrefsGrantedPermissions : public ExtensionPrefsTest {
permissions = new PermissionSet(
api_perm_set2_, ehost_perm_set2_, shost_perm_set2_);
- std::set_union(expected_apis.begin(), expected_apis.end(),
- api_perm_set2_.begin(), api_perm_set2_.end(),
- std::inserter(api_permissions_, api_permissions_.begin()));
+ APIPermissionSet::Union(expected_apis, api_perm_set2_, &api_permissions_);
prefs()->AddGrantedPermissions(extension_id_, permissions.get());
granted_permissions = prefs()->GetGrantedPermissions(extension_id_);

Powered by Google App Engine
This is Rietveld 408576698