Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / base / guid.cc

diff --git a/src/base/guid.cc b/src/base/guid.cc
index b7d79f2..be5c58b 100644 (file)
--- a/src/base/guid.cc
+++ b/src/base/guid.cc
@@ -4,6 +4,8 @@
 
 #include "base/guid.h"
 
+#include "base/strings/string_util.h"
+
 namespace base {
 
 bool IsValidGUID(const std::string& guid) {
@@ -11,14 +13,13 @@ bool IsValidGUID(const std::string& guid) {
   if (guid.length() != kGUIDLength)
     return false;
 
-  const std::string hexchars = "0123456789ABCDEF";
-  for (uint32 i = 0; i < guid.length(); ++i) {
+  for (size_t i = 0; i < guid.length(); ++i) {
     char current = guid[i];
     if (i == 8 || i == 13 || i == 18 || i == 23) {
       if (current != '-')
         return false;
     } else {
-      if (hexchars.find(current) == std::string::npos)
+      if (!IsHexDigit(current))
         return false;
     }
   }