Revert of mini_installer: Change to use _countof rather than base's arraysize macro.

chrome/installer/mini_installer/mini_string_test.cc

 // Copyright (c) 2011 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 <windows.h>
-#include <stdlib.h>
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "chrome/installer/mini_installer/mini_string.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using mini_installer::StackString;
 
 namespace {
@@ skipping 11 matching lines @@
   StackString<MAX_PATH> str;
   EXPECT_EQ(MAX_PATH, str.capacity());
 
   std::wstring compare_str;
 
   EXPECT_EQ(str.length(), compare_str.length());
   EXPECT_EQ(0, compare_str.compare(str.get()));
 
   size_t max_chars = str.capacity() - 1;
 
-  while ((str.length() + (_countof(kTestString) - 1)) <= max_chars) {
+  while ((str.length() + (arraysize(kTestString) - 1)) <= max_chars) {
     EXPECT_TRUE(str.append(kTestString));
     compare_str.append(kTestString);
     EXPECT_EQ(str.length(), compare_str.length());
     EXPECT_EQ(0, compare_str.compare(str.get()));
   }
 
   EXPECT_GT(static_cast<size_t>(MAX_PATH), str.length());
 
   // Now we've exhausted the space we allocated for the string,
   // so append should fail.
@@ skipping 15 matching lines @@
   static const wchar_t kTestStringSource[] = L"1234ABcD567890";
   static const wchar_t kTestStringFind[] = L"abcd";
   static const wchar_t kTestStringNotFound[] = L"80";
 
   StackString<MAX_PATH> str;
   EXPECT_TRUE(str.assign(kTestStringSource));
   EXPECT_EQ(str.get(), str.findi(kTestStringSource));
   EXPECT_EQ(static_cast<const wchar_t*>(NULL), str.findi(kTestStringNotFound));
   const wchar_t* found = str.findi(kTestStringFind);
   EXPECT_NE(static_cast<const wchar_t*>(NULL), found);
-  std::wstring check(found, _countof(kTestStringFind) - 1);
+  std::wstring check(found, arraysize(kTestStringFind) - 1);
   EXPECT_EQ(0, lstrcmpi(check.c_str(), kTestStringFind));
 }