Unify UUID/GUID generation code across base and blink

base/guid_unittest.cc

Index: base/guid_unittest.cc
diff --git a/base/guid_unittest.cc b/base/guid_unittest.cc
index b6d976d8e0d3f7d85f921080d0b23fb0846f5794..94798abf3de18bf2b1fdc5164ecdb852e1797df8 100644
--- a/base/guid_unittest.cc
+++ b/base/guid_unittest.cc
@@ -14,8 +14,6 @@
 
 namespace base {
 
-#if defined(OS_POSIX)
-
 namespace {
 
 bool IsGUIDv4(const std::string& guid) {
@@ -23,7 +21,7 @@ bool IsGUIDv4(const std::string& guid) {
   // where y is one of [8, 9, A, B].
   return IsValidGUID(guid) && guid[14] == '4' &&
          (guid[19] == '8' || guid[19] == '9' || guid[19] == 'A' ||
-          guid[19] == 'a' || guid[19] == 'B' || guid[19] == 'b');
+          guid[19] == 'B');
 }
 
 }  // namespace
@@ -37,9 +35,8 @@ TEST(GUIDTest, GUIDGeneratesAllZeroes) {
 TEST(GUIDTest, GUIDGeneratesCorrectly) {
   uint64_t bytes[] = {0x0123456789ABCDEFULL, 0xFEDCBA9876543210ULL};
   std::string clientid = RandomDataToGUIDString(bytes);
-  EXPECT_EQ("01234567-89AB-CDEF-FEDC-BA9876543210", clientid);
+  EXPECT_EQ("01234567-89ab-cdef-Fedc-ba9876543210", clientid);
 }
-#endif
 
 TEST(GUIDTest, GUIDCorrectlyFormatted) {
   const int kIterations = 10;
@@ -59,10 +56,8 @@ TEST(GUIDTest, GUIDBasicUniqueness) {
     EXPECT_EQ(36U, guid1.length());
     EXPECT_EQ(36U, guid2.length());
     EXPECT_NE(guid1, guid2);
-#if defined(OS_POSIX)
     EXPECT_TRUE(IsGUIDv4(guid1));
     EXPECT_TRUE(IsGUIDv4(guid2));
-#endif
   }
 }