Convert ARRAYSIZE_UNSAFE -> arraysize in chrome/browser/.

chrome/browser/autocomplete/autocomplete_provider_unittest.cc

 // Copyright (c) 2012 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 "components/omnibox/autocomplete_provider.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 553 matching lines @@
   {
     KeywordTestData duplicate_url[] = {
       { base::ASCIIToUTF16("fo"), base::string16(), base::string16() },
       { base::ASCIIToUTF16("foo.com"), base::string16(),
         base::ASCIIToUTF16("foo.com") },
       { base::ASCIIToUTF16("foo.com"), base::string16(), base::string16() }
     };
 
     SCOPED_TRACE("Duplicate url");
     RunKeywordTest(base::ASCIIToUTF16("fo"), duplicate_url,
-                   ARRAYSIZE_UNSAFE(duplicate_url));
+                   arraysize(duplicate_url));
   }
 
   {
     KeywordTestData keyword_match[] = {
       { base::ASCIIToUTF16("foo.com"), base::ASCIIToUTF16("foo.com"),
         base::string16() },
       { base::ASCIIToUTF16("foo.com"), base::string16(), base::string16() }
     };
 
     SCOPED_TRACE("Duplicate url with keyword match");
     RunKeywordTest(base::ASCIIToUTF16("fo"), keyword_match,
-                   ARRAYSIZE_UNSAFE(keyword_match));
+                   arraysize(keyword_match));
   }
 
   {
     KeywordTestData multiple_keyword[] = {
       { base::ASCIIToUTF16("fo"), base::string16(), base::string16() },
       { base::ASCIIToUTF16("foo.com"), base::string16(),
         base::ASCIIToUTF16("foo.com") },
       { base::ASCIIToUTF16("foo.com"), base::string16(), base::string16() },
       { base::ASCIIToUTF16("bar.com"), base::string16(),
         base::ASCIIToUTF16("bar.com") },
     };
 
     SCOPED_TRACE("Duplicate url with multiple keywords");
     RunKeywordTest(base::ASCIIToUTF16("fo"), multiple_keyword,
-                   ARRAYSIZE_UNSAFE(multiple_keyword));
+                   arraysize(multiple_keyword));
   }
 }
 
 // Test that exact match keywords trump keywords associated with
 // the match.
 TEST_F(AutocompleteProviderTest, ExactMatchKeywords) {
   ResetControllerWithKeywordProvider();
 
   {
     KeywordTestData keyword_match[] = {
       { base::ASCIIToUTF16("foo.com"), base::string16(),
         base::ASCIIToUTF16("foo.com") }
     };
 
     SCOPED_TRACE("keyword match as usual");
     RunKeywordTest(base::ASCIIToUTF16("fo"), keyword_match,
-                   ARRAYSIZE_UNSAFE(keyword_match));
+                   arraysize(keyword_match));
   }
 
   // The same result set with an input of "f" (versus "fo") should get
   // a different associated keyword because "f" is an exact match for
   // a keyword and that should trump the keyword normally associated with
   // this match.
   {
     KeywordTestData keyword_match[] = {
       { base::ASCIIToUTF16("foo.com"), base::string16(),
         base::ASCIIToUTF16("f") }
     };
 
     SCOPED_TRACE("keyword exact match");
     RunKeywordTest(base::ASCIIToUTF16("f"), keyword_match,
-                   ARRAYSIZE_UNSAFE(keyword_match));
+                   arraysize(keyword_match));
   }
 }
 
 TEST_F(AutocompleteProviderTest, UpdateAssistedQueryStats) {
   ResetControllerWithTestProviders(false, NULL, NULL);
 
   {
     AssistedQueryStatsTestData test_data[] = {
       //  MSVC doesn't support zero-length arrays, so supply some dummy data.
       { AutocompleteMatchType::SEARCH_WHAT_YOU_TYPED, "" }
     };
     SCOPED_TRACE("No matches");
     // Note: We pass 0 here to ignore the dummy data above.
     RunAssistedQueryStatsTest(test_data, 0);
   }
 
   {
     AssistedQueryStatsTestData test_data[] = {
       { AutocompleteMatchType::SEARCH_WHAT_YOU_TYPED, "chrome..69i57" }
     };
     SCOPED_TRACE("One match");
-    RunAssistedQueryStatsTest(test_data, ARRAYSIZE_UNSAFE(test_data));
+    RunAssistedQueryStatsTest(test_data, arraysize(test_data));
   }
 
   {
     AssistedQueryStatsTestData test_data[] = {
       { AutocompleteMatchType::SEARCH_WHAT_YOU_TYPED,
         "chrome..69i57j69i58j5l2j0l3j69i59" },
       { AutocompleteMatchType::URL_WHAT_YOU_TYPED,
         "chrome..69i57j69i58j5l2j0l3j69i59" },
       { AutocompleteMatchType::NAVSUGGEST,
         "chrome.2.69i57j69i58j5l2j0l3j69i59" },
       { AutocompleteMatchType::NAVSUGGEST,
         "chrome.3.69i57j69i58j5l2j0l3j69i59" },
       { AutocompleteMatchType::SEARCH_SUGGEST,
         "chrome.4.69i57j69i58j5l2j0l3j69i59" },
       { AutocompleteMatchType::SEARCH_SUGGEST,
         "chrome.5.69i57j69i58j5l2j0l3j69i59" },
       { AutocompleteMatchType::SEARCH_SUGGEST,
         "chrome.6.69i57j69i58j5l2j0l3j69i59" },
       { AutocompleteMatchType::SEARCH_HISTORY,
         "chrome.7.69i57j69i58j5l2j0l3j69i59" },
     };
     SCOPED_TRACE("Multiple matches");
-    RunAssistedQueryStatsTest(test_data, ARRAYSIZE_UNSAFE(test_data));
+    RunAssistedQueryStatsTest(test_data, arraysize(test_data));
   }
 }
 
 TEST_F(AutocompleteProviderTest, GetDestinationURL) {
   ResetControllerWithKeywordAndSearchProviders();
 
   // For the destination URL to have aqs parameters for query formulation time
   // and the field trial triggered bit, many conditions need to be satisfied.
   AutocompleteMatch match(NULL, 1100, false,
                           AutocompleteMatchType::SEARCH_SUGGEST);
@@ skipping 39 matching lines @@
   url = GetDestinationURL(match, base::TimeDelta::FromMilliseconds(2456));
   EXPECT_EQ("//aqs=chrome.0.69i57j69i58j5l2j0l3j69i59.2456j0j4&", url.path());
 
   // Test page classification and field trial triggered set.
   controller_->search_provider_->field_trial_triggered_in_session_ = true;
   EXPECT_TRUE(
       controller_->search_provider_->field_trial_triggered_in_session());
   url = GetDestinationURL(match, base::TimeDelta::FromMilliseconds(2456));
   EXPECT_EQ("//aqs=chrome.0.69i57j69i58j5l2j0l3j69i59.2456j1j4&", url.path());
 }