Convert ARRAYSIZE_UNSAFE -> arraysize in chrome/, outside of chrome/browser/.

chrome/common/variations/experiment_labels_unittest.cc

 // Copyright 2014 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/common/variations/experiment_labels.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 36 matching lines @@
   // Register a few VariationIDs.
   AssociateGoogleVariationID(variations::GOOGLE_UPDATE_SERVICE, "FieldTrialA",
                              "Default", TEST_VALUE_A);
   AssociateGoogleVariationID(variations::GOOGLE_UPDATE_SERVICE, "FieldTrialB",
                              "Group1", TEST_VALUE_B);
   AssociateGoogleVariationID(variations::GOOGLE_UPDATE_SERVICE, "FieldTrialC",
                              "Default", TEST_VALUE_C);
   AssociateGoogleVariationID(variations::GOOGLE_UPDATE_SERVICE, "FieldTrialD",
                              "Default", TEST_VALUE_D);  // Not actually used.
 
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_cases); ++i) {
+  for (size_t i = 0; i < arraysize(test_cases); ++i) {
     // Parse the input groups.
     base::FieldTrial::ActiveGroups groups;
     std::vector<std::string> group_data;
     base::SplitString(test_cases[i].active_group_pairs, '#', &group_data);
     ASSERT_EQ(0U, group_data.size() % 2);
     for (size_t j = 0; j < group_data.size(); j += 2) {
       base::FieldTrial::ActiveGroup group;
       group.trial_name = group_data[j];
       group.group_name = group_data[j + 1];
       groups.push_back(group);
@@ skipping 51 matching lines @@
      "A=B|Tue, 21 Jan 2014 15:30:21 GMT"},
     {"A=B|Tue, 21 Jan 2014 15:30:21 GMT;C=D|Tue, 21 Jan 2014 15:30:21 GMT",
      "P=Q|Tue, 21 Jan 2014 15:30:21 GMT;X=Y|Tue, 21 Jan 2014 15:30:21 GMT",
      "P=Q|Tue, 21 Jan 2014 15:30:21 GMT;X=Y|Tue, 21 Jan 2014 15:30:21 GMT;"
      "A=B|Tue, 21 Jan 2014 15:30:21 GMT;C=D|Tue, 21 Jan 2014 15:30:21 GMT"},
     {"",
      "",
      ""},
   };
 
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_cases); ++i) {
+  for (size_t i = 0; i < arraysize(test_cases); ++i) {
     std::string result = base::UTF16ToUTF8(CombineExperimentLabels(
         base::ASCIIToUTF16(test_cases[i].variations_labels),
         base::ASCIIToUTF16(test_cases[i].other_labels)));
     EXPECT_EQ(test_cases[i].expected_label, result);
   }
 }
 
 TEST(ExperimentLabelsTest, ExtractNonVariationLabels) {
   struct {
     const char* input_label;
@@ skipping 35 matching lines @@
      "CrVar1=3310002|Tue, 21 Jan 2014 15:30:21 GMT",
      "gcapi_brand=123|Tue, 21 Jan 2014 15:30:21 GMT"},
     // Trailing semicolon
     {"gcapi_brand=123|Tue, 21 Jan 2014 15:30:21 GMT;"
      "CrVar1=3310002|Tue, 21 Jan 2014 15:30:21 GMT;",  // Note the semi here.
      "gcapi_brand=123|Tue, 21 Jan 2014 15:30:21 GMT"},
     // Semis
     {";;;;", ""},
   };
 
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_cases); ++i) {
+  for (size_t i = 0; i < arraysize(test_cases); ++i) {
     std::string non_variation_labels = base::UTF16ToUTF8(
         ExtractNonVariationLabels(
             base::ASCIIToUTF16(test_cases[i].input_label)));
     EXPECT_EQ(test_cases[i].expected_output, non_variation_labels);
   }
 }
 
 }  // namespace chrome_variations