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

chrome/installer/mini_installer/decompress.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>  // NOLINT
 #include <fcntl.h>  // for _O_* constants
 #include <fdi.h>
+#include <stdlib.h>

[grt (UTC plus 2), 2015/05/06 18:10:15]

is this still needed?

[tfarina, 2015/05/06 18:16:07]

Done.

 
 #include "chrome/installer/mini_installer/decompress.h"
 
 namespace {
 
 FNALLOC(Alloc) {
   return ::HeapAlloc(::GetProcessHeap(), 0, cb);
 }
 
 FNFREE(Free) {
@@ skipping 165 matching lines @@
     // environment variables set, so we try a couple that *should* always be
     // present and fallback to the default Windows install path if all else
     // fails.
     // The cabinet.dll should be available on all supported versions of Windows.
     static const wchar_t* const candidate_paths[] = {
       L"%WINDIR%\\system32\\cabinet.dll",
       L"%SYSTEMROOT%\\system32\\cabinet.dll",
       L"C:\\Windows\\system32\\cabinet.dll",
     };
 
-    wchar_t path[MAX_PATH] = {0};
-    for (int i = 0; i < arraysize(candidate_paths); ++i) {
+    static const DWORD kBufferSize = MAX_PATH;
+    wchar_t path[kBufferSize];
+    for (const wchar_t* candidate_path : candidate_paths) {
       path[0] = L'\0';
-      DWORD result = ::ExpandEnvironmentStringsW(candidate_paths[i],
-                                                 path, arraysize(path));
+      DWORD result = ::ExpandEnvironmentStringsW(candidate_path,
+                                                 path, kBufferSize);
 
-      if (result > 0 && result <= arraysize(path))
+      if (result > 0 && result <= kBufferSize)
         g_fdi = ::LoadLibraryExW(path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
 
       if (g_fdi)
         break;
     }
   }
 
   if (g_fdi) {
     g_FDICreate =
         reinterpret_cast<FDICreateFn>(::GetProcAddress(g_fdi, "FDICreate"));
@@ skipping 42 matching lines @@
                   &Notify, NULL, const_cast<wchar_t*>(destination))) {
       success = true;
     }
     g_FDIDestroy(fdi);
   }
 
   return success;
 }
 
 }  // namespace mini_installer