Convert ARRAYSIZE_UNSAFE -> arraysize in chrome/browser/.

chrome/browser/history/top_sites_cache_unittest.cc

 // Copyright 2013 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/history/top_sites_cache.h"
 
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
@@ skipping 83 matching lines @@
     {"http://www.youtube.com/a/b?test", "http://www.youtube.com/a/b?test"},
     // Never-seen-before URL: as-is.
     {"http://maps.google.com/", "http://maps.google.com/"},
     // Changing port number, does not match: as-is.
     {"http://www.example.com:1234/", "http://www.example.com:1234"},
     // Smart enough to know that port 80 is HTTP: redirects.
     {"http://www.google.com/", "http://www.gooogle.com:80"},
     // Prefix should not work: as-is.
     {"http://www.youtube.com/a", "http://www.youtube.com/a"},
   };
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_cases); ++i) {
+  for (size_t i = 0; i < arraysize(test_cases); ++i) {
     std::string expected(test_cases[i].expected);
     std::string query(test_cases[i].query);
     EXPECT_EQ(expected, cache_.GetCanonicalURL(GURL(query)).spec())
       << " for test_case[" << i << "]";
   }
 }
 
 TEST_F(TopSitesCacheTest, IsKnownUrl) {
   InitTopSiteCache(kTopSitesSpecBasic, arraysize(kTopSitesSpecBasic));
   // Matches.
@@ skipping 78 matching lines @@
     {"", "http://www.chromium.org/a/beeswax"},
     // String prefix match and URL-prefix match: redirects.
     {"http://www.google.com/", "http://www.google.com/shhhhhh"},
     // Different protocol: fails.
     {"", "https://www.google.com/test"},
     // Smart enough to know that port 80 is HTTP: redirects.
     {"http://www.google.com/", "http://www.google.com:80/test"},
     // Specialized match only: fails.
     {"", "http://www.chromium.org/a"},
   };
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_cases); ++i) {
+  for (size_t i = 0; i < arraysize(test_cases); ++i) {
     std::string expected(test_cases[i].expected);
     std::string query(test_cases[i].query);
     GURL result(cache_.GetGeneralizedCanonicalURL(GURL(query)));
     EXPECT_EQ(expected, result.spec()) << " for test_case[" << i << "]";
   }
 }
 
 // This tests a special case where there are 2 generalized matches, and both
 // should be checked to find the correct match.
 TEST_F(TopSitesCacheTest, GetPrefixCanonicalURLDiffByQuery) {
@@ skipping 12 matching lines @@
     // Slightly before "http://www.source.com/a?m=5".
     {"http://www.dest.com/1", "http://www.source.com/a?l=5"},
     // Slightly after "http://www.source.com/a?m=5".
     {"http://www.dest.com/1", "http://www.source.com/a?n=5"},
     // Slightly before "http://www.source.com/a/t?q=3".
     {"http://www.dest.com/2", "http://www.source.com/a/t?q=2"},
     // Slightly after "http://www.source.com/a/t?q=3".
     {"http://www.dest.com/2", "http://www.source.com/a/t?q=4"},
   };
 
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_cases); ++i) {
+  for (size_t i = 0; i < arraysize(test_cases); ++i) {
     std::string expected(test_cases[i].expected);
     std::string query(test_cases[i].query);
     GURL result(cache_.GetGeneralizedCanonicalURL(GURL(query)));
     EXPECT_EQ(expected, result.spec()) << " for test_case[" << i << "]";
   }
 }
 
 // This test ensures forced URLs behave in the expected way.
 TEST_F(TopSitesCacheTest, CacheForcedURLs) {
   // Forced URLs must always appear at the beginning of the list.
   BuildTopSites(kTopSitesSpecBasic, arraysize(kTopSitesSpecBasic));
   top_sites_[0].last_forced_time = base::Time::FromJsTime(1000);
   top_sites_[1].last_forced_time =  base::Time::FromJsTime(2000);
   cache_.SetTopSites(top_sites_);
 
   EXPECT_EQ(2u, cache_.GetNumForcedURLs());
   EXPECT_EQ(2u, cache_.GetNumNonForcedURLs());
 }
 
 }  // namespace
 
 }  // namespace history