Support socket endpoint permissions for AppsV2 Socket API.

chrome/browser/extensions/extension_prefs_unittest.cc

 // Copyright (c) 2012 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 "extension_prefs_unittest.h"
 
 #include "base/basictypes.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/stl_util.h"
@@ skipping 328 matching lines @@
               granted_permissions->scriptable_hosts());
 
     URLPatternSet::CreateUnion(ehost_perm_set1_, shost_perm_set1_,
                                &effective_permissions_);
     EXPECT_EQ(effective_permissions_, granted_permissions->effective_hosts());
 
     // Add the rest of the permissions.
     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_);
     EXPECT_TRUE(granted_permissions.get());
     EXPECT_FALSE(granted_permissions->IsEmpty());
     EXPECT_EQ(api_permissions_, granted_permissions->apis());
     EXPECT_EQ(ehost_permissions_,
               granted_permissions->explicit_hosts());
     EXPECT_EQ(shost_permissions_,
               granted_permissions->scriptable_hosts());
@@ skipping 891 matching lines @@
     EXPECT_EQ(string16(), error16);
     EXPECT_TRUE(prefs()->UserMayModifySettings(extension_.get(), &error16));
     EXPECT_EQ(string16(), error16);
     EXPECT_FALSE(prefs()->MustRemainEnabled(extension_.get(), &error16));
     EXPECT_EQ(string16(), error16);
   }
 };
 TEST_F(ExtensionPrefsNotRequiredExtension, NotRequiredExtension) {}
 
 }  // namespace extensions