Convert ARRAYSIZE_UNSAFE -> arraysize in components/.

components/autofill/content/renderer/password_form_conversion_utils_browsertest.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 "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/content/renderer/password_form_conversion_utils.h"
 #include "components/autofill/core/common/password_form.h"
@@ skipping 201 matching lines @@
        "William+Smith"},
       // When there is an empty autocomplete attribute (i.e. autocomplete=""),
       // it should have the same effect as having no attribute whatsoever.
       {{"", "", ""}, "username2", "William", "John+Smith"},
       {{"", "", "username"}, "username3", "Smith", ""},
       {{"username", "", "username"}, "username1", "John", "Smith"},
       // It should not matter if attribute values are upper or mixed case.
       {{"USERNAME", NULL, "uSeRNaMe"}, "username1", "John", "Smith"},
       {{"uSeRNaMe", NULL, "USERNAME"}, "username1", "John", "Smith"}};
 
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) {
+  for (size_t i = 0; i < arraysize(cases); ++i) {
     for (size_t nonempty_username_fields = 0; nonempty_username_fields < 2;
          ++nonempty_username_fields) {
       SCOPED_TRACE(testing::Message()
                    << "Iteration " << i << " "
                    << (nonempty_username_fields ? "nonempty" : "empty"));
 
       // Repeat each test once with empty, and once with non-empty usernames.
       // In the former case, no empty other_possible_usernames should be saved.
       const char* names[3];
       if (nonempty_username_fields) {
@@ skipping 53 matching lines @@
       // The same goes if the fields are yet empty: we speculate that we will
       // identify them as new password fields once they are filled out, and we
       // want to keep our abstract interpretation of the form less flaky.
       {{"", ""}, "", "", "password1", ""},
       // Two different values should be treated as a password change form, one
       // that also asks for the current password, but only once for the new.
       {{"alpha", ""}, "password1", "alpha", "password2", ""},
       {{"", "beta"}, "password1", "", "password2", "beta"},
       {{"alpha", "beta"}, "password1", "alpha", "password2", "beta"}};
 
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) {
+  for (size_t i = 0; i < arraysize(cases); ++i) {
     SCOPED_TRACE(testing::Message() << "Iteration " << i);
 
     PasswordFormBuilder builder(kTestFormActionURL);
     builder.AddPasswordField("password1", cases[i].password_values[0], NULL);
     builder.AddUsernameField("username1", "William", NULL);
     builder.AddPasswordField("password2", cases[i].password_values[1], NULL);
     builder.AddUsernameField("username2", "Smith", NULL);
     builder.AddSubmitButton("submit", true);
     std::string html = builder.ProduceHTML();
 
@@ skipping 36 matching lines @@
       {{"", "beta", "beta"}, "password1", "", "password2", "beta"},
       {{"alpha", "beta", "beta"}, "password1", "alpha", "password2", "beta"},
       {{"beta", "beta", "alpha"}, "password3", "alpha", "password1", "beta"},
       // If the fields are yet empty, we speculate that we will identify them as
       // (current + new + new) once they are filled out, so we should classify
       // them the same for now to keep our abstract interpretation less flaky.
       {{"", "", ""}, "password1", "", "password2", ""}};
       // Note: In all other cases, we give up and consider the form invalid.
       // This is tested in InvalidFormDueToConfusingPasswordFields.
 
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) {
+  for (size_t i = 0; i < arraysize(cases); ++i) {
     SCOPED_TRACE(testing::Message() << "Iteration " << i);
 
     PasswordFormBuilder builder(kTestFormActionURL);
     builder.AddPasswordField("password1", cases[i].password_values[0], NULL);
     builder.AddUsernameField("username1", "William", NULL);
     builder.AddPasswordField("password2", cases[i].password_values[1], NULL);
     builder.AddUsernameField("username2", "Smith", NULL);
     builder.AddPasswordField("password3", cases[i].password_values[2], NULL);
     builder.AddSubmitButton("submit", true);
     std::string html = builder.ProduceHTML();
@@ skipping 111 matching lines @@
       // It should not matter if attribute values are upper or mixed case.
       {{NULL, "current-password", NULL},
        "password2", "beta", "", ""},
       {{NULL, "CURRENT-PASSWORD", NULL},
        "password2", "beta", "", ""},
       {{NULL, "new-password", NULL},
        "", "", "password2", "beta"},
       {{NULL, "nEw-PaSsWoRd", NULL},
        "", "", "password2", "beta"}};
 
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) {
+  for (size_t i = 0; i < arraysize(cases); ++i) {
     SCOPED_TRACE(testing::Message() << "Iteration " << i);
 
     PasswordFormBuilder builder(kTestFormActionURL);
     builder.AddPasswordField("pin1", "123456", NULL);
     builder.AddPasswordField("pin2", "789101", NULL);
     builder.AddPasswordField("password1", "alpha", cases[i].autocomplete[0]);
     builder.AddUsernameField("username1", "William", NULL);
     builder.AddPasswordField("password2", "beta", cases[i].autocomplete[1]);
     builder.AddUsernameField("username2", "Smith", NULL);
     builder.AddPasswordField("password3", "gamma", cases[i].autocomplete[2]);
@@ skipping 53 matching lines @@
   const char* cases[][3] = {
       // No autocomplete attributes to guide us, and we see:
       //  * three password values that are all different,
       //  * three password values that are all the same;
       //  * three password values with the first and last matching.
       // In any case, we should just give up on this form.
       {"alpha", "beta", "gamma"},
       {"alpha", "alpha", "alpha"},
       {"alpha", "beta", "alpha"}};
 
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) {
+  for (size_t i = 0; i < arraysize(cases); ++i) {
     SCOPED_TRACE(testing::Message() << "Iteration " << i);
 
     PasswordFormBuilder builder(kTestFormActionURL);
     builder.AddUsernameField("username1", "John", NULL);
     builder.AddPasswordField("password1", cases[i][0], NULL);
     builder.AddPasswordField("password2", cases[i][1], NULL);
     builder.AddPasswordField("password3", cases[i][2], NULL);
     builder.AddSubmitButton("submit", true);
     std::string html = builder.ProduceHTML();
 
@@ skipping 13 matching lines @@
   builder.AddPasswordField("password4", "alpha", NULL);
   builder.AddSubmitButton("submit", true);
   std::string html = builder.ProduceHTML();
 
   scoped_ptr<PasswordForm> password_form;
   ASSERT_NO_FATAL_FAILURE(LoadHTMLAndConvertForm(html, &password_form));
   EXPECT_FALSE(password_form);
 }
 
 }  // namespace autofill