Convert ARRAYSIZE_UNSAFE -> arraysize in components/.

components/bookmarks/browser/bookmark_index_unittest.cc

Index: components/bookmarks/browser/bookmark_index_unittest.cc
diff --git a/components/bookmarks/browser/bookmark_index_unittest.cc b/components/bookmarks/browser/bookmark_index_unittest.cc
index 2ce206ae48d17202885af628c6a612597ac2030d..fa7e46add681e65f667855d5664c78ccb84273f4 100644
--- a/components/bookmarks/browser/bookmark_index_unittest.cc
+++ b/components/bookmarks/browser/bookmark_index_unittest.cc
@@ -173,7 +173,7 @@ TEST_F(BookmarkIndexTest, GetBookmarksMatching) {
     // Prefix matches against multiple candidates.
     { "abc1 abc2 abc3 abc4", "abc", "abc1 abc2 abc3 abc4"},
   };
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(data); ++i) {
+  for (size_t i = 0; i < arraysize(data); ++i) {
     std::vector<std::string> titles;
     base::SplitString(data[i].titles, ';', &titles);
     std::vector<TitleAndURL> bookmarks;
@@ -237,7 +237,7 @@ TEST_F(BookmarkIndexTest, GetBookmarksMatchingWithURLs) {
     { "foo bar", "Baz Bur",      "http://foo.com/blah/flub",    false }
   };
 
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(data); ++i) {
+  for (size_t i = 0; i < arraysize(data); ++i) {
     model_ = client_.CreateModel();
     std::vector<TitleAndURL> bookmarks;
     bookmarks.push_back(TitleAndURL(data[i].title, data[i].url));
@@ -270,7 +270,7 @@ TEST_F(BookmarkIndexTest, Normalization) {
   };
 
   GURL url(kAboutBlankURL);
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(data); ++i) {
+  for (size_t i = 0; i < arraysize(data); ++i) {
     model_->AddURL(model_->other_node(), 0, UTF8ToUTF16(data[i].title), url);
     std::vector<BookmarkMatch> matches;
     model_->GetBookmarksMatching(UTF8ToUTF16(data[i].query), 10, &matches);
@@ -296,7 +296,7 @@ TEST_F(BookmarkIndexTest, MatchPositionsTitles) {
     { "foobar foobar",            "foobar foo",   "0,6:7,13" },
     { "foobar foobar",            "foo foobar",   "0,6:7,13" },
   };
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(data); ++i) {
+  for (size_t i = 0; i < arraysize(data); ++i) {
     std::vector<TitleAndURL> bookmarks;
     TitleAndURL bookmark(data[i].title, kAboutBlankURL);
     bookmarks.push_back(bookmark);
@@ -347,7 +347,7 @@ TEST_F(BookmarkIndexTest, MatchPositionsURLs) {
                                                          "130,134:139,143"  }
   };
 
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(data); ++i) {
+  for (size_t i = 0; i < arraysize(data); ++i) {
     model_ = client_.CreateModel();
     std::vector<TitleAndURL> bookmarks;
     TitleAndURL bookmark("123456", data[i].url);
@@ -369,7 +369,7 @@ TEST_F(BookmarkIndexTest, MatchPositionsURLs) {
 TEST_F(BookmarkIndexTest, Remove) {
   const char* titles[] = { "a", "b" };
   const char* urls[] = {kAboutBlankURL, kAboutBlankURL};
-  AddBookmarks(titles, urls, ARRAYSIZE_UNSAFE(titles));
+  AddBookmarks(titles, urls, arraysize(titles));
 
   // Remove the node and make sure we don't get back any results.
   model_->Remove(model_->other_node(), 0);
@@ -380,19 +380,19 @@ TEST_F(BookmarkIndexTest, Remove) {
 TEST_F(BookmarkIndexTest, ChangeTitle) {
   const char* titles[] = { "a", "b" };
   const char* urls[] = {kAboutBlankURL, kAboutBlankURL};
-  AddBookmarks(titles, urls, ARRAYSIZE_UNSAFE(titles));
+  AddBookmarks(titles, urls, arraysize(titles));
 
   // Remove the node and make sure we don't get back any results.
   const char* expected[] = { "blah" };
   model_->SetTitle(model_->other_node()->GetChild(0), ASCIIToUTF16("blah"));
-  ExpectMatches("BlAh", expected, ARRAYSIZE_UNSAFE(expected));
+  ExpectMatches("BlAh", expected, arraysize(expected));
 }
 
 // Makes sure no more than max queries is returned.
 TEST_F(BookmarkIndexTest, HonorMax) {
   const char* titles[] = { "abcd", "abcde" };
   const char* urls[] = {kAboutBlankURL, kAboutBlankURL};
-  AddBookmarks(titles, urls, ARRAYSIZE_UNSAFE(titles));
+  AddBookmarks(titles, urls, arraysize(titles));
 
   std::vector<BookmarkMatch> matches;
   model_->GetBookmarksMatching(ASCIIToUTF16("ABc"), 1, &matches);
@@ -426,13 +426,13 @@ TEST_F(BookmarkIndexTest, GetResultsSortedByTypedCount) {
   };
 
   std::map<GURL, int> typed_count_map;
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(data); ++i)
+  for (size_t i = 0; i < arraysize(data); ++i)
     typed_count_map.insert(std::make_pair(data[i].url, data[i].typed_count));
 
   BookmarkClientMock client(typed_count_map);
   scoped_ptr<BookmarkModel> model = client.CreateModel();
 
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(data); ++i)
+  for (size_t i = 0; i < arraysize(data); ++i)
     // Populate the BookmarkIndex.
     model->AddURL(
         model->other_node(), i, UTF8ToUTF16(data[i].title), data[i].url);