Convert ARRAYSIZE_UNSAFE -> arraysize in url/.

url/url_parse_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 "url/url_parse.h"
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/url_parse.h"
 
-// Some implementations of base/basictypes.h may define ARRAYSIZE.
-// If it's not defined, we define it to the ARRAYSIZE_UNSAFE macro
-// which is in our version of basictypes.h.
-#ifndef ARRAYSIZE
-#define ARRAYSIZE ARRAYSIZE_UNSAFE
-#endif
-
 // Interesting IE file:isms...
 //
 //  file:/foo/bar              file:///foo/bar
 //      The result here seems totally invalid!?!? This isn't UNC.
 //
 //  file:/
 //  file:// or any other number of slashes
 //      IE6 doesn't do anything at all if you click on this link. No error:
 //      nothing. IE6's history system seems to always color this link, so I'm
 //      guessing that it maps internally to the empty URL.
@@ skipping 166 matching lines @@
     {"http:", Parsed::USERNAME, true, 5},
     {"", Parsed::SCHEME, true, 0},
       // Make sure a random component still works when there's nothing there.
     {"", Parsed::REF, true, 0},
       // File URLs are special with no host, so we test those.
     {"file:///c:/foo", Parsed::USERNAME, true, 7},
     {"file:///c:/foo", Parsed::PASSWORD, true, 7},
     {"file:///c:/foo", Parsed::HOST, true, 7},
     {"file:///c:/foo", Parsed::PATH, true, 7},
   };
-  for (size_t i = 0; i < ARRAYSIZE(count_cases); i++) {
+  for (size_t i = 0; i < arraysize(count_cases); i++) {
     int length = static_cast<int>(strlen(count_cases[i].url));
 
     // Simple test to distinguish file and standard URLs.
     Parsed parsed;
     if (length > 0 && count_cases[i].url[0] == 'f')
       ParseFileURL(count_cases[i].url, length, &parsed);
     else
       ParseStandardURL(count_cases[i].url, length, &parsed);
 
     int chars_before = parsed.CountCharactersBefore(
@@ skipping 287 matching lines @@
     {"http://www.google.com/search", "search"},
     {"http://www.google.com/search/", ""},
     {"http://www.google.com/foo/bar.html?baz=22", "bar.html"},
     {"http://www.google.com/foo/bar.html#ref", "bar.html"},
     {"http://www.google.com/search/;param", ""},
     {"http://www.google.com/foo/bar.html;param#ref", "bar.html"},
     {"http://www.google.com/foo/bar.html;foo;param#ref", "bar.html;foo"},
     {"http://www.google.com/foo/bar.html?query#ref", "bar.html"},
   };
 
-  for (size_t i = 0; i < ARRAYSIZE(file_cases); i++) {
+  for (size_t i = 0; i < arraysize(file_cases); i++) {
     const char* url = file_cases[i].input;
     int len = static_cast<int>(strlen(url));
 
     Parsed parsed;
     ParseStandardURL(url, len, &parsed);
 
     Component file_name;
     ExtractFileName(url, parsed.path, &file_name);
 
     EXPECT_TRUE(ComponentMatches(url, file_cases[i].expected, file_name));
@@ skipping 158 matching lines @@
     // The remaining components are never used for filesystem urls.
     ExpectInvalidComponent(parsed.username);
     ExpectInvalidComponent(parsed.password);
     ExpectInvalidComponent(parsed.host);
     ExpectInvalidComponent(parsed.port);
   }
 }
 
 }  // namespace
 }  // namespace url