Factoring GUID generation from metrics to base

chrome/browser/metrics/metrics_service_unittest.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/metrics/metrics_service.h"
 
 #include <string>
 #include <vector>
 
 #include "base/base64.h"
 #include "base/md5.h"
 #include "base/values.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
-#if defined(OS_POSIX) && defined(LINUX2)
-TEST(MetricsServiceTest, ClientIdGeneratesAllZeroes) {
-  uint64 bytes[] = { 0, 0 };
-  std::string clientid = MetricsService::RandomBytesToGUIDString(bytes);
-  EXPECT_EQ("00000000-0000-0000-0000-000000000000", clientid);
-}
-TEST(MetricsServiceTest, ClientIdGeneratesCorrectly) {
-  uint64 bytes[] = { 0x0123456789ABCDEFULL, 0xFEDCBA9876543210ULL };
-  std::string clientid = MetricsService::RandomBytesToGUIDString(bytes);
-  EXPECT_EQ("01234567-89AB-CDEF-FEDC-BA9876543210", clientid);
-}
+class MetricsServiceTest : public ::testing::Test {
+};
 
+static const size_t kMaxLocalListSize = 3;
+
+// Ensure the ClientId is formatted as expected.
 TEST(MetricsServiceTest, ClientIdCorrectlyFormatted) {
   std::string clientid = MetricsService::GenerateClientID();
   EXPECT_EQ(36U, clientid.length());
   std::string hexchars = "0123456789ABCDEF";
   for (uint32 i = 0; i < clientid.length(); i++) {
     char current = clientid.at(i);
     if (i == 8 || i == 13 || i == 18 || i == 23) {
       EXPECT_EQ('-', current);
     } else {
       EXPECT_TRUE(std::string::npos != hexchars.find(current));
     }
   }
 }
-#endif
-
-class MetricsServiceTest : public ::testing::Test {
-};
-
-static const size_t kMaxLocalListSize = 3;
 
 // Store and retrieve empty list.
 TEST(MetricsServiceTest, EmptyLogList) {
   ListValue list;
   std::vector<std::string> local_list;
 
   MetricsService::StoreUnsentLogsHelper(local_list, kMaxLocalListSize, &list);
   EXPECT_EQ(0U, list.GetSize());
 
   local_list.clear();  // RecallUnsentLogsHelper() expects empty |local_list|.
@@ skipping 149 matching lines @@
   std::string checksum;
   EXPECT_TRUE((*(list.end() - 1))->GetAsString(&checksum));
   checksum[0] = (checksum[0] == 'a') ? 'b' : 'a';
   EXPECT_TRUE(list.Set(2, Value::CreateStringValue(checksum)));
   EXPECT_EQ(3U, list.GetSize());
 
   local_list.clear();
   EXPECT_EQ(MetricsService::CHECKSUM_CORRUPTION,
             MetricsService::RecallUnsentLogsHelper(list, &local_list));
 }