Index: chrome/browser/metrics/metrics_service_unittest.cc |
diff --git a/chrome/browser/metrics/metrics_service_unittest.cc b/chrome/browser/metrics/metrics_service_unittest.cc |
index 3c063d5cfccc1295f40111777e85d87ee7bfbc14..e7069b011b3d72a529edbf75e361a1868935e2f4 100644 |
--- a/chrome/browser/metrics/metrics_service_unittest.cc |
+++ b/chrome/browser/metrics/metrics_service_unittest.cc |
@@ -2,29 +2,24 @@ |
// 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 <ctype.h> |
#include <string> |
-#include "base/base64.h" |
- |
+#include "chrome/browser/metrics/metrics_service.h" |
#include "testing/gtest/include/gtest/gtest.h" |
-class MetricsServiceTest : public ::testing::Test { |
-}; |
- |
// 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) { |
+ |
+ for (size_t i = 0; i < clientid.length(); ++i) { |
+ char current = clientid[i]; |
+ if (i == 8 || i == 13 || i == 18 || i == 23) |
EXPECT_EQ('-', current); |
- } else { |
- EXPECT_TRUE(std::string::npos != hexchars.find(current)); |
- } |
+ else |
+ EXPECT_TRUE(isxdigit(current)); |
} |
} |