Convert ARRAYSIZE_UNSAFE -> arraysize in net/.

net/proxy/proxy_server_unittest.cc

 // Copyright (c) 2010 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/basictypes.h"
 #include "net/proxy/proxy_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // Test the creation of ProxyServer using ProxyServer::FromURI, which parses
 // inputs of the form [<scheme>"://"]<host>[":"<port>]. Verify that each part
@@ skipping 141 matching lines @@
     {
        "https://1.2.3.4:10",  // IP Address
        "https://1.2.3.4:10",
        net::ProxyServer::SCHEME_HTTPS,
        "1.2.3.4",
        10,
        "HTTPS 1.2.3.4:10"
     },
   };
 
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
+  for (size_t i = 0; i < arraysize(tests); ++i) {
     net::ProxyServer uri =
         net::ProxyServer::FromURI(tests[i].input_uri,
                                   net::ProxyServer::SCHEME_HTTP);
     EXPECT_TRUE(uri.is_valid());
     EXPECT_FALSE(uri.is_direct());
     EXPECT_EQ(tests[i].expected_uri, uri.ToURI());
     EXPECT_EQ(tests[i].expected_scheme, uri.scheme());
     EXPECT_EQ(tests[i].expected_host, uri.host_port_pair().host());
     EXPECT_EQ(tests[i].expected_port, uri.host_port_pair().port());
     EXPECT_EQ(tests[i].expected_pac_string, uri.ToPacString());
@@ skipping 22 matching lines @@
     "",
     "   ",
     "dddf:",   // not a valid port
     "dddd:d",  // not a valid port
     "http://",  // not a valid host/port.
     "direct://xyz",  // direct is not allowed a host/port.
     "http:/",  // ambiguous, but will fail because of bad port.
     "http:",  // ambiguous, but will fail because of bad port.
   };
 
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
+  for (size_t i = 0; i < arraysize(tests); ++i) {
     net::ProxyServer uri =
         net::ProxyServer::FromURI(tests[i], net::ProxyServer::SCHEME_HTTP);
     EXPECT_FALSE(uri.is_valid());
     EXPECT_FALSE(uri.is_direct());
     EXPECT_FALSE(uri.is_http());
     EXPECT_FALSE(uri.is_socks());
   }
 }
 
 // Test that LWS (SP | HT) is disregarded from the ends.
 TEST(ProxyServerTest, Whitespace) {
   const char* tests[] = {
     "  foopy:80",
     "foopy:80   \t",
     "  \tfoopy:80  ",
   };
 
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
+  for (size_t i = 0; i < arraysize(tests); ++i) {
     net::ProxyServer uri =
         net::ProxyServer::FromURI(tests[i], net::ProxyServer::SCHEME_HTTP);
     EXPECT_EQ("foopy:80", uri.ToURI());
   }
 }
 
 // Test parsing a ProxyServer from a PAC representation.
 TEST(ProxyServerTest, FromPACString) {
   const struct {
     const char* input_pac;
@@ skipping 38 matching lines @@
     {
        "https foopy",
        "https://foopy:443",
     },
     {
        "https foopy:10",
        "https://foopy:10",
     },
   };
 
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
+  for (size_t i = 0; i < arraysize(tests); ++i) {
     net::ProxyServer uri = net::ProxyServer::FromPacString(tests[i].input_pac);
     EXPECT_TRUE(uri.is_valid());
     EXPECT_EQ(tests[i].expected_uri, uri.ToURI());
   }
 }
 
 // Test parsing a ProxyServer from an invalid PAC representation.
 TEST(ProxyServerTest, FromPACStringInvalid) {
   const char* tests[] = {
     "PROXY",  // missing host/port.
     "HTTPS",  // missing host/port.
     "SOCKS",  // missing host/port.
     "DIRECT foopy:10",  // direct cannot have host/port.
   };
 
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
+  for (size_t i = 0; i < arraysize(tests); ++i) {
     net::ProxyServer uri = net::ProxyServer::FromPacString(tests[i]);
     EXPECT_FALSE(uri.is_valid());
   }
 }
 
 TEST(ProxyServerTest, ComparatorAndEquality) {
   struct {
     // Inputs.
     const char* server1;
     const char* server2;
@@ skipping 19 matching lines @@
       "bar:33",
       1
     },
     { // Scheme is different.
       "socks4://foo:33",
       "http://foo:33",
       1
     },
   };
 
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
+  for (size_t i = 0; i < arraysize(tests); ++i) {
     // Parse the expected inputs to ProxyServer instances.
     const net::ProxyServer server1 =
         net::ProxyServer::FromURI(
             tests[i].server1, net::ProxyServer::SCHEME_HTTP);
 
     const net::ProxyServer server2 =
         net::ProxyServer::FromURI(
             tests[i].server2, net::ProxyServer::SCHEME_HTTP);
 
     switch (tests[i].expected_comparison) {
@@ skipping 10 matching lines @@
       case 1:
         EXPECT_FALSE(server1 < server2);
         EXPECT_TRUE(server2 < server1);
         EXPECT_FALSE(server2 == server1);
         break;
       default:
         FAIL() << "Invalid expectation. Can be only -1, 0, 1";
     }
   }
 }