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

chrome/installer/mini_installer/mini_installer.cc

 // Copyright (c) 2012 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.
 
 // mini_installer.exe is the first exe that is run when chrome is being
 // installed or upgraded. It is designed to be extremely small (~5KB with no
 // extra resources linked) and it has two main jobs:
 //   1) unpack the resources (possibly decompressing some)
 //   2) run the real installer (setup.exe) with appropriate flags.
 //
 // In order to be really small the app doesn't link against the CRT and
 // defines the following compiler/linker flags:
 //   EnableIntrinsicFunctions="true" compiler: /Oi
 //   BasicRuntimeChecks="0"
 //   BufferSecurityCheck="false" compiler: /GS-
 //   EntryPointSymbol="MainEntryPoint" linker: /ENTRY
 //   IgnoreAllDefaultLibraries="true" linker: /NODEFAULTLIB
 //   OptimizeForWindows98="1"  liker: /OPT:NOWIN98
 //   linker: /SAFESEH:NO
 
 // have the linker merge the sections, saving us ~500 bytes.
 #pragma comment(linker, "/MERGE:.rdata=.text")
 
 #include <windows.h>
 #include <shellapi.h>
-#include <stdlib.h>
 
 #include "chrome/installer/mini_installer/appid.h"
 #include "chrome/installer/mini_installer/configuration.h"
 #include "chrome/installer/mini_installer/decompress.h"
 #include "chrome/installer/mini_installer/exit_code.h"
 #include "chrome/installer/mini_installer/mini_installer_constants.h"
 #include "chrome/installer/mini_installer/mini_string.h"
 #include "chrome/installer/mini_installer/pe_resource.h"
 
 namespace mini_installer {
@@ skipping 540 matching lines @@
   if (!work_dir->assign(base_path) || !work_dir->append(kTempPrefix))
     return false;
 
   // Store the location where we'll append the id.
   size_t end = work_dir->length();
 
   // Check if we'll have enough buffer space to continue.
   // 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) < (_countof("fffff.tmp") + 1))
+  if ((work_dir->capacity() - end) < (arraysize("fffff.tmp") + 1))
     return false;
 
   // Generate a unique id.  We only use the lowest 20 bits, so take the top
   // 12 bits and xor them with the lower bits.
   DWORD id = ::GetTickCount();
   id ^= (id >> 12);
 
   int max_attempts = 10;
   while (max_attempts--) {
     // This converts 'id' to a string in the format "78563412" on windows
@@ skipping 134 matching lines @@
   };
 
   PathString temp;
   // GetTempPath always returns a path with a trailing backslash.
   DWORD len = ::GetTempPath(temp.capacity(), temp.get());
   // GetTempPath returns 0 or number of chars copied, not including the
   // terminating '\0'.
   if (!len || len >= temp.capacity())
     return;
 
-  for (const wchar_t* directory_prefix : kDirectoryPrefixes) {
-    DeleteDirectoriesWithPrefix(temp.get(), directory_prefix);
+  for (int i = 0; i < arraysize(kDirectoryPrefixes); ++i) {
+    DeleteDirectoriesWithPrefix(temp.get(), kDirectoryPrefixes[i]);
   }
 }
 
 // Checks the command line for specific mini installer flags.
 // If the function returns true, the command line has been processed and all
 // required actions taken.  The installer must exit and return the returned
 // |exit_code|.
 bool ProcessNonInstallOperations(const Configuration& configuration,
                                  ProcessExitCode* exit_code) {
   bool ret = false;
@@ skipping 15 matching lines @@
 // Returns true if we should delete the temp files we create (default).
 // Returns false iff the user has manually created a ChromeInstallerCleanup
 // string value in the registry under HKCU\\Software\\[Google|Chromium]
 // and set its value to "0".  That explicitly forbids the mini installer from
 // deleting these files.
 // Support for this has been publicly mentioned in troubleshooting tips so
 // we continue to support it.
 bool ShouldDeleteExtractedFiles() {
   wchar_t value[2] = {0};
   if (ReadValueFromRegistry(HKEY_CURRENT_USER, kCleanupRegistryKey,
-                            kCleanupRegistryValue, value, _countof(value)) &&
+                            kCleanupRegistryValue, value, arraysize(value)) &&
       value[0] == L'0') {
     return false;
   }
 
   return true;
 }
 
 // Main function. First gets a working dir, unpacks the resources and finally
 // executes setup.exe to do the install/upgrade.
 ProcessExitCode WMain(HMODULE module) {
@@ skipping 73 matching lines @@
 #pragma function(memset)
 void* memset(void* dest, int c, size_t count) {
   void* start = dest;
   while (count--) {
     *reinterpret_cast<char*>(dest) = static_cast<char>(c);
     dest = reinterpret_cast<char*>(dest) + 1;
   }
   return start;
 }
 }  // extern "C"