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

chrome/installer/mini_installer/mini_string_test.cc

Index: chrome/installer/mini_installer/mini_string_test.cc
diff --git a/chrome/installer/mini_installer/mini_string_test.cc b/chrome/installer/mini_installer/mini_string_test.cc
index a2ef7bfdecdf5a8023d874957f400fa33dd85faf..e83f16518211b9de51f957d8416101108d2d65a6 100644
--- a/chrome/installer/mini_installer/mini_string_test.cc
+++ b/chrome/installer/mini_installer/mini_string_test.cc
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 #include <windows.h>
-#include <stdlib.h>
 
 #include <string>
 
@@ -35,7 +34,7 @@
 
   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());
@@ -71,6 +70,6 @@
   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));
 }