Index: base/guid.cc |
diff --git a/base/guid.cc b/base/guid.cc |
index b7d79f22790da1da990bacc6f7b1073a751c6b79..be5c58b53599d43a96e26168b0d4be9db546bb7f 100644 |
--- a/base/guid.cc |
+++ b/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; |
} |
} |