Some platform cleanup to net/

src/net/http/http_util_unittest.cc

 // Copyright (c) 2006-2008 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 <algorithm>
 
 #include "base/basictypes.h"
 #include "net/http/http_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 10 matching lines @@
     bool expected_result;
   } tests[] = {
     { "", "foo", false },
     { "foo\r\nbar", "foo", false },
     { "ffoo: 1", "foo", false },
     { "foo: 1", "foo", true },
     { "foo: 1\r\nbar: 2", "foo", true },
     { "fOO: 1\r\nbar: 2", "foo", true },
     { "g: 0\r\nfoo: 1\r\nbar: 2", "foo", true },
   };
-  for (size_t i = 0; i < arraysize(tests); ++i) {
+  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
     bool result = HttpUtil::HasHeader(tests[i].headers, tests[i].name);
     EXPECT_EQ(tests[i].expected_result, result);
   }
 }
 
 TEST(HttpUtilTest, HeadersIterator) {
   std::string headers = "foo: 1\t\r\nbar: hello world\r\nbaz: 3 \r\n";
 
   HttpUtil::HeadersIterator it(headers.begin(), headers.end(), "\r\n");
 
@@ skipping 58 matching lines @@
     const char* input;
     int expected_result;
   } tests[] = {
     { "foo\r\nbar\r\n\r\n", 12 },
     { "foo\nbar\n\n", 9 },
     { "foo\r\nbar\r\n\r\njunk", 12 },
     { "foo\nbar\n\njunk", 9 },
     { "foo\nbar\n\r\njunk", 10 },
     { "foo\nbar\r\n\njunk", 10 },
   };
-  for (size_t i = 0; i < arraysize(tests); ++i) {
+  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
     int input_len = static_cast<int>(strlen(tests[i].input));
     int eoh = HttpUtil::LocateEndOfHeaders(tests[i].input, input_len);
     EXPECT_EQ(tests[i].expected_result, eoh);
   }
 }
 
 TEST(HttpUtilTest, AssembleRawHeaders) {
   struct {
     const char* input;
     const char* expected_result;  // with '\0' changed to '|'
@@ skipping 276 matching lines @@
       "  garbage\n"
       "Bar: 2\n\n",
 
       "HTTP/1.0 200 OK|"
       "   : 1|"
       "  garbage|"
       "Bar: 2||",
     },
 
   };
-  for (size_t i = 0; i < arraysize(tests); ++i) {
+  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
     int input_len = static_cast<int>(strlen(tests[i].input));
     std::string raw = HttpUtil::AssembleRawHeaders(tests[i].input, input_len);
     std::replace(raw.begin(), raw.end(), '\0', '|');
     EXPECT_TRUE(raw == tests[i].expected_result);
   }
 }
 
 // Test SpecForRequest() and PathForRequest().
 TEST(HttpUtilTest, RequestUrlSanitize) {
   struct {
@@ skipping 10 matching lines @@
       "http://192.168.0.1?query=1#hash#10#11#13#14",
       "http://192.168.0.1/?query=1",
       "/?query=1"
     },
     { // Strip username/password.
       "http://user:pass@google.com",
       "http://google.com/",
       "/"
     }
   };
-  for (size_t i = 0; i < arraysize(tests); ++i) {
+  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
     GURL url(GURL(tests[i].url));
     std::string expected_spec(tests[i].expected_spec);
     std::string expected_path(tests[i].expected_path);
 
     EXPECT_EQ(expected_spec, HttpUtil::SpecForRequest(url));
     EXPECT_EQ(expected_path, HttpUtil::PathForRequest(url));
   }
 }