Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / extensions / common / permissions / permission_message_util.cc

diff --git a/src/extensions/common/permissions/permission_message_util.cc b/src/extensions/common/permissions/permission_message_util.cc
index 070eabd..f26dd5b 100644 (file)
--- a/src/extensions/common/permissions/permission_message_util.cc
+++ b/src/extensions/common/permissions/permission_message_util.cc
@@ -5,6 +5,7 @@
 #include "extensions/common/permissions/permission_message_util.h"
 
 #include "base/strings/string_number_conversions.h"
+#include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
 #include "extensions/common/permissions/permission_message.h"
 #include "extensions/common/permissions/permission_set.h"
@@ -13,6 +14,7 @@
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "url/url_constants.h"
+#include "base/strings/string_split.h"
 
 using extensions::PermissionMessage;
 using extensions::PermissionSet;
@@ -92,7 +94,7 @@ std::set<std::string> GetDistinctHosts(const URLPatternSet& host_patterns,
   // Use a vector to preserve order (also faster than a map on small sets).
   // Each item is a host split into two parts: host without RCDs and
   // current best RCD.
-  typedef std::vector<std::pair<std::string, std::string> > HostVector;
+  typedef base::StringPairs HostVector;
   HostVector hosts_best_rcd;
   for (URLPatternSet::const_iterator i = host_patterns.begin();
        i != host_patterns.end();