Switch to standard integer types in base/strings/.

third_party/WebKit/Source/platform/weborigin/KURLTest.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 55 matching lines @@
         const char* ref;
         bool hasRef;
     } cases[] = {
         {"http://www.google.com/foo/blah?bar=baz#ref", "http", "www.google.com", 0, "", 0, "blah", "bar=baz", "ref", true},
         {"http://foo.com:1234/foo/bar/", "http", "foo.com", 1234, "", 0, "bar", 0, 0, false},
         {"http://www.google.com?#", "http", "www.google.com", 0, "", 0, 0, "", "", true},
         {"https://me:pass@google.com:23#foo", "https", "google.com", 23, "me", "pass", 0, 0, "foo", true},
         {"javascript:hello!//world", "javascript", "", 0, "", 0, "world", 0, 0, false},
     };
 
-    for (size_t i = 0; i < arraysize(cases); i++) {
+    for (size_t i = 0; i < WTF_ARRAY_LENGTH(cases); i++) {
         // UTF-8
         KURL kurl(ParsedURLString, cases[i].url);
 
         EXPECT_EQ(cases[i].protocol, kurl.protocol());
         EXPECT_EQ(cases[i].host, kurl.host());
         EXPECT_EQ(cases[i].port, kurl.port());
         EXPECT_EQ(cases[i].user, kurl.user());
         EXPECT_EQ(cases[i].pass, kurl.pass());
         EXPECT_EQ(cases[i].lastPathComponent, kurl.lastPathComponent());
         EXPECT_EQ(cases[i].query, kurl.query());
@@ skipping 31 matching lines @@
         // disagree with us about where the path is for this URL.
         {"http://a.com/hello;world",              "http",       "a.com",    0,    "",   0,               "hello",  0,         0},
 
         // WebKit doesn't like UTF-8 or UTF-16 input.
         {"http://\xe4\xbd\xa0\xe5\xa5\xbd\xe4\xbd\xa0\xe5\xa5\xbd/", "http", "xn--6qqa088eba", 0, "", 0, 0,        0,         0},
 
         // WebKit %-escapes non-ASCII characters in reference, but we don't.
         {"http://www.google.com/foo/blah?bar=baz#\xce\xb1\xce\xb2", "http", "www.google.com", 0, "", 0,  "blah", "bar=baz", "\xce\xb1\xce\xb2"},
     };
 
-    for (size_t i = 0; i < arraysize(cases); i++) {
+    for (size_t i = 0; i < WTF_ARRAY_LENGTH(cases); i++) {
         KURL kurl(ParsedURLString, cases[i].url);
 
         EXPECT_EQ(cases[i].protocol, kurl.protocol());
         EXPECT_EQ(cases[i].host, kurl.host());
         EXPECT_EQ(cases[i].port, kurl.port());
         EXPECT_EQ(cases[i].user, kurl.user());
         EXPECT_EQ(cases[i].pass, kurl.pass());
         EXPECT_EQ(cases[i].lastPath, kurl.lastPathComponent());
         EXPECT_EQ(cases[i].query, kurl.query());
         // Want to compare UCS-16 refs (or to null).
@@ skipping 90 matching lines @@
             "", "http://:pass@goo.com:92/a?f#b",
             // pass
             "", "http://goo.com:92/a?f#b",
             // path
             "/", "http://goo.com:92/?f#b",
             // query
             0, "http://goo.com:92/#b"
         },
     };
 
-    for (size_t i = 0; i < arraysize(cases); i++) {
+    for (size_t i = 0; i < WTF_ARRAY_LENGTH(cases); i++) {
         KURL kurl(ParsedURLString, cases[i].url);
 
         kurl.setProtocol(cases[i].protocol);
         EXPECT_STREQ(cases[i].expectedProtocol, kurl.string().utf8().data());
 
         kurl.setHost(cases[i].host);
         EXPECT_STREQ(cases[i].expectedHost, kurl.string().utf8().data());
 
         kurl.setPort(cases[i].port);
         EXPECT_STREQ(cases[i].expectedPort, kurl.string().utf8().data());
@@ skipping 28 matching lines @@
         {"%20%21%22%23%24%25%26%27%28%29%2a%2B%2C%2D%2e%2f/", " !\"#$%&'()*+,-.//"},
         {"%30%31%32%33%34%35%36%37%38%39%3a%3B%3C%3D%3e%3f/", "0123456789:;<=>?/"},
         {"%40%41%42%43%44%45%46%47%48%49%4a%4B%4C%4D%4e%4f/", "@ABCDEFGHIJKLMNO/"},
         {"%50%51%52%53%54%55%56%57%58%59%5a%5B%5C%5D%5e%5f/", "PQRSTUVWXYZ[\\]^_/"},
         {"%60%61%62%63%64%65%66%67%68%69%6a%6B%6C%6D%6e%6f/", "`abcdefghijklmno/"},
         {"%70%71%72%73%74%75%76%77%78%79%7a%7B%7C%7D%7e%7f/", "pqrstuvwxyz{|}~\x7f/"},
           // Test un-UTF-8-ization.
         {"%e4%bd%a0%e5%a5%bd", "\xe4\xbd\xa0\xe5\xa5\xbd"},
     };
 
-    for (size_t i = 0; i < arraysize(decodeCases); i++) {
+    for (size_t i = 0; i < WTF_ARRAY_LENGTH(decodeCases); i++) {
         String input(decodeCases[i].input);
         String str = decodeURLEscapeSequences(input);
         EXPECT_STREQ(decodeCases[i].output, str.utf8().data());
     }
 
     // Our decode should decode %00
     String zero = decodeURLEscapeSequences("%00");
     EXPECT_STRNE("%00", zero.utf8().data());
 
     // Test the error behavior for invalid UTF-8 (we differ from WebKit here).
@@ skipping 22 matching lines @@
         {"@ABCDEFGHIJKLMNO",
           "%40ABCDEFGHIJKLMNO"},
         {"PQRSTUVWXYZ[\\]^_",
           "PQRSTUVWXYZ%5B%5C%5D%5E_"},
         {"`abcdefghijklmno",
           "%60abcdefghijklmno"},
         {"pqrstuvwxyz{|}~\x7f",
           "pqrstuvwxyz%7B%7C%7D~%7F"},
     };
 
-    for (size_t i = 0; i < arraysize(encode_cases); i++) {
+    for (size_t i = 0; i < WTF_ARRAY_LENGTH(encode_cases); i++) {
         String input(encode_cases[i].input);
         String expectedOutput(encode_cases[i].output);
         String output = encodeWithURLEscapeSequences(input);
         EXPECT_EQ(expectedOutput, output);
     }
 
     // Our encode escapes NULLs for safety, so we need to check that too.
     String input("\x00\x01", 2);
     String reference("%00%01");
 
@@ skipping 406 matching lines @@
         {"about:config", ""},
         {"https://www.google.com/", "https://www.google.com/"},
         {"http://me@news.google.com:8888/", "http://news.google.com:8888/"},
         {"http://:pass@news.google.com:8888/foo", "http://news.google.com:8888/foo"},
         {"http://me:pass@news.google.com:8888/", "http://news.google.com:8888/"},
         {"https://www.google.com/a?f#b", "https://www.google.com/a?f"},
         {"file:///tmp/test.html", ""},
         {"https://www.google.com/#", "https://www.google.com/"},
     };
 
-    for (size_t i = 0; i < arraysize(referrerCases); i++) {
+    for (size_t i = 0; i < WTF_ARRAY_LENGTH(referrerCases); i++) {
         KURL kurl(ParsedURLString, referrerCases[i].input);
         String referrer = kurl.strippedForUseAsReferrer();
         EXPECT_STREQ(referrerCases[i].output, referrer.utf8().data());
     }
 }
 
 } // namespace blink