Use base::STLSet* in place of std::set_* for simplicity.

BUG=254066

Review URL: https://codereview.chromium.org/301963002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273689 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 10 deletions

diff --git a/remoting/base/capabilities.cc b/remoting/base/capabilities.cc
index 33cf0ee..4e52ef8 100644
--- a/remoting/base/capabilities.cc
+++ b/remoting/base/capabilities.cc
@@ -7,6 +7,7 @@
 #include <algorithm>
 #include <vector>
 
+#include "base/stl_util.h"
 #include "base/strings/string_util.h"
 
 namespace remoting {
@@ -27,16 +28,9 @@ std::string IntersectCapabilities(const std::string& client_capabilities,
   Tokenize(host_capabilities, " ", &host_caps);
   std::sort(host_caps.begin(), host_caps.end());
 
-  std::vector<std::string> result(std::min(client_caps.size(),
-                                           host_caps.size()));
-  std::vector<std::string>::iterator end =
-      std::set_intersection(client_caps.begin(),
-                            client_caps.end(),
-                            host_caps.begin(),
-                            host_caps.end(),
-                            result.begin());
-  if (end != result.end())
-    result.erase(end, result.end());
+  std::vector<std::string> result =
+      base::STLSetIntersection<std::vector<std::string> >(
+          client_caps, host_caps);
 
   return JoinString(result, " ");
 }