Replace mini_installer's use of arraysize macro with _countof.

* Remove the duplication in the decompress.h

https://msdn.microsoft.com/en-us/library/ms175773.aspx

This issue arised when doing https://codereview.chromium.org/1115993004/.

The original attempt was
https://chromium.googlesource.com/chromium/src/+/016d71e2e048f0578e2c53c3f741755173ef8cb2,
but it was reverted in
https://chromium.googlesource.com/chromium/src/+/4febac2867bb9dd87b033bdd1b059888c6faa9eb
because mini_installer can't use C++11 yet.

BUG=None
TEST=trybots
R=grt@chromium.org

Review URL: https://codereview.chromium.org/1129953003

Cr-Commit-Position: refs/heads/master@{#328766}

6 files changed, 18 insertions, 17 deletions

diff --git a/chrome/installer/mini_installer/configuration_test.cc b/chrome/installer/mini_installer/configuration_test.cc
index 22333a1..14e21c0 100644
--- a/chrome/installer/mini_installer/configuration_test.cc
+++ b/chrome/installer/mini_installer/configuration_test.cc
@@ -2,9 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "chrome/installer/mini_installer/configuration.h"
+
+#include <stdlib.h>
+
 #include "base/basictypes.h"
 #include "chrome/installer/mini_installer/appid.h"
-#include "chrome/installer/mini_installer/configuration.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using mini_installer::Configuration;
@@ -57,7 +60,7 @@ TEST(MiniInstallerConfigurationTest, CommandLine) {
     L"spam.exe",
     L"spam.exe --foo",
   };
-  for (size_t i = 0; i < arraysize(kCommandLines); ++i) {
+  for (size_t i = 0; i < _countof(kCommandLines); ++i) {
     EXPECT_TRUE(std::wstring(kCommandLines[i]) ==
                 TestConfiguration(kCommandLines[i]).command_line());
   }
diff --git a/chrome/installer/mini_installer/decompress.cc b/chrome/installer/mini_installer/decompress.cc
index ed9098a..6440b21 100644
--- a/chrome/installer/mini_installer/decompress.cc
+++ b/chrome/installer/mini_installer/decompress.cc
@@ -5,6 +5,7 @@
 #include <windows.h>  // NOLINT
 #include <fcntl.h>  // for _O_* constants
 #include <fdi.h>
+#include <stdlib.h>
 
 #include "chrome/installer/mini_installer/decompress.h"
 
@@ -191,12 +192,12 @@ bool InitializeFdi() {
     };
 
     wchar_t path[MAX_PATH] = {0};
-    for (int i = 0; i < arraysize(candidate_paths); ++i) {
+    for (int i = 0; i < _countof(candidate_paths); ++i) {
       path[0] = L'\0';
       DWORD result = ::ExpandEnvironmentStringsW(candidate_paths[i],
-                                                 path, arraysize(path));
+                                                 path, _countof(path));
 
-      if (result > 0 && result <= arraysize(path))
+      if (result > 0 && result <= _countof(path))
         g_fdi = ::LoadLibraryExW(path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
 
       if (g_fdi)
diff --git a/chrome/installer/mini_installer/decompress.h b/chrome/installer/mini_installer/decompress.h
index c92d369..5e11af8 100644
--- a/chrome/installer/mini_installer/decompress.h
+++ b/chrome/installer/mini_installer/decompress.h
@@ -5,11 +5,6 @@
 #ifndef CHROME_INSTALLER_MINI_INSTALLER_DECOMPRESS_H_
 #define CHROME_INSTALLER_MINI_INSTALLER_DECOMPRESS_H_
 
-// arraysize borrowed from basictypes.h
-template <typename T, size_t N>
-char (&ArraySizeHelper(T (&array)[N]))[N];
-#define arraysize(array) (sizeof(::ArraySizeHelper(array)))
-
 namespace mini_installer {
 
 // Same as the tool, expand.exe.  Decompresses a file that was compressed
diff --git a/chrome/installer/mini_installer/mini_installer.cc b/chrome/installer/mini_installer/mini_installer.cc
index 600ea46..d578f80 100644
--- a/chrome/installer/mini_installer/mini_installer.cc
+++ b/chrome/installer/mini_installer/mini_installer.cc
@@ -23,6 +23,7 @@
 
 #include <windows.h>
 #include <shellapi.h>
+#include <stdlib.h>
 
 #include "chrome/installer/mini_installer/appid.h"
 #include "chrome/installer/mini_installer/configuration.h"
@@ -583,7 +584,7 @@ bool CreateWorkDir(const wchar_t* base_path, PathString* work_dir) {
   // The name of the directory will use up 11 chars and then we need to append
   // the trailing backslash and a terminator.  We've already added the prefix
   // to the buffer, so let's just make sure we've got enough space for the rest.
-  if ((work_dir->capacity() - end) < (arraysize("fffff.tmp") + 1))
+  if ((work_dir->capacity() - end) < (_countof("fffff.tmp") + 1))
     return false;
 
   // Generate a unique id.  We only use the lowest 20 bits, so take the top
@@ -738,7 +739,7 @@ void DeleteOldChromeTempDirectories() {
   if (!len || len >= temp.capacity())
     return;
 
-  for (int i = 0; i < arraysize(kDirectoryPrefixes); ++i) {
+  for (int i = 0; i < _countof(kDirectoryPrefixes); ++i) {
     DeleteDirectoriesWithPrefix(temp.get(), kDirectoryPrefixes[i]);
   }
 }
@@ -775,7 +776,7 @@ bool ProcessNonInstallOperations(const Configuration& configuration,
 bool ShouldDeleteExtractedFiles() {
   wchar_t value[2] = {0};
   if (ReadValueFromRegistry(HKEY_CURRENT_USER, kCleanupRegistryKey,
-                            kCleanupRegistryValue, value, arraysize(value)) &&
+                            kCleanupRegistryValue, value, _countof(value)) &&
       value[0] == L'0') {
     return false;
   }
diff --git a/chrome/installer/mini_installer/mini_string.cc b/chrome/installer/mini_installer/mini_string.cc
index c5e401a1..1f4b3f1 100644
--- a/chrome/installer/mini_installer/mini_string.cc
+++ b/chrome/installer/mini_installer/mini_string.cc
@@ -68,8 +68,8 @@ bool SafeStrCopy(wchar_t* dest, size_t dest_size, const wchar_t* src) {
   // failed concatenation.  For example:
   //
   // wchar_t buf[5] = {0};
-  // if (!SafeStrCat(buf, arraysize(buf), kLongName))
-  //   SafeStrCat(buf, arraysize(buf), kShortName);
+  // if (!SafeStrCat(buf, _countof(buf), kLongName))
+  //   SafeStrCat(buf, _countof(buf), kShortName);
   //
   // If we were to return false in the first call to SafeStrCat but still
   // mutate the buffer, the buffer will be in an unexpected state.
diff --git a/chrome/installer/mini_installer/mini_string_test.cc b/chrome/installer/mini_installer/mini_string_test.cc
index e83f165..a2ef7bf 100644
--- a/chrome/installer/mini_installer/mini_string_test.cc
+++ b/chrome/installer/mini_installer/mini_string_test.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include <windows.h>
+#include <stdlib.h>
 
 #include <string>
 
@@ -34,7 +35,7 @@ TEST_F(MiniInstallerStringTest, StackStringOverflow) {
 
   size_t max_chars = str.capacity() - 1;
 
-  while ((str.length() + (arraysize(kTestString) - 1)) <= max_chars) {
+  while ((str.length() + (_countof(kTestString) - 1)) <= max_chars) {
     EXPECT_TRUE(str.append(kTestString));
     compare_str.append(kTestString);
     EXPECT_EQ(str.length(), compare_str.length());
@@ -70,6 +71,6 @@ TEST_F(MiniInstallerStringTest, StackStringFind) {
   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, arraysize(kTestStringFind) - 1);
+  std::wstring check(found, _countof(kTestStringFind) - 1);
   EXPECT_EQ(0, lstrcmpi(check.c_str(), kTestStringFind));
 }