Reverting 7083,7079....

chrome/browser/metrics_log_unittest.cc

 // Copyright (c) 2006-2008 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 <string>
 
 #include "base/string_util.h"
 #include "base/time.h"
 #include "chrome/browser/metrics_log.h"
 #include "googleurl/src/gurl.h"
@@ skipping 95 matching lines @@
 TEST(MetricsLogTest, CreateHash) {
   static const struct {
     std::string input;
     std::string output;
   } cases[] = {
     {"Back", "0x0557fa923dcee4d0"},
     {"Forward", "0x67d2f6740a8eaebf"},
     {"NewTab", "0x290eb683f96572f1"},
   };
 
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); i++) {
+  for (int i = 0; i < arraysize(cases); i++) {
     std::string hash_string = MetricsLog::CreateHash(cases[i].input);
 
     // Convert to hex string
     // We're only checking the first 8 bytes, because that's what
     // the metrics server uses.
     std::string hash_hex = "0x";
     for (size_t j = 0; j < 8; j++) {
       StringAppendF(&hash_hex, "%02x",
                     static_cast<uint8>(hash_string.data()[j]));
     }
     EXPECT_EQ(cases[i].output, hash_hex);
   }
 };