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

chrome/installer/mini_installer/configuration_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 "chrome/installer/mini_installer/configuration.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;
 
 class TestConfiguration : public Configuration {
  public:
   explicit TestConfiguration(const wchar_t* command_line) : Configuration() {
     Initialize(command_line);
   }
  private:
@@ skipping 32 matching lines @@
   EXPECT_EQ(2, TestConfiguration(L"spam.exe --foo").argument_count());
   EXPECT_EQ(3, TestConfiguration(L"spam.exe --foo --bar").argument_count());
 }
 
 TEST(MiniInstallerConfigurationTest, CommandLine) {
   static const wchar_t* const kCommandLines[] = {
     L"",
     L"spam.exe",
     L"spam.exe --foo",
   };
-  for (const wchar_t* command_line : kCommandLines) {
-    EXPECT_TRUE(std::wstring(command_line) ==
-                TestConfiguration(command_line).command_line());
+  for (size_t i = 0; i < arraysize(kCommandLines); ++i) {
+    EXPECT_TRUE(std::wstring(kCommandLines[i]) ==
+                TestConfiguration(kCommandLines[i]).command_line());
   }
 }
 
 TEST(MiniInstallerConfigurationTest, ChromeAppGuid) {
   EXPECT_TRUE(std::wstring(google_update::kAppGuid) ==
               TestConfiguration(L"spam.exe").chrome_app_guid());
   EXPECT_TRUE(std::wstring(google_update::kAppGuid) ==
               TestConfiguration(L"spam.exe --chrome").chrome_app_guid());
   EXPECT_TRUE(std::wstring(google_update::kAppGuid) ==
               TestConfiguration(L"spam.exe --multi-install --chrome")
@@ skipping 36 matching lines @@
                   .is_multi_install());
   EXPECT_TRUE(TestConfiguration(L"spam.exe --multi-install")
                   .is_multi_install());
 }
 
 TEST(MiniInstallerConfigurationTest, IsSystemLevel) {
   EXPECT_FALSE(TestConfiguration(L"spam.exe").is_system_level());
   EXPECT_FALSE(TestConfiguration(L"spam.exe --chrome").is_system_level());
   EXPECT_TRUE(TestConfiguration(L"spam.exe --system-level").is_system_level());
 }