Use base::size rather than arraysize in rlz/.

This is purely a mechanical change; there is no intended behavior change.

BUG=837308
TBR=rogerta@chromium.org

Change-Id: I9a1fe160e17c708c7fe14bdd1bf2a9fec2d51341
Reviewed-on: https://chromium-review.googlesource.com/c/1390114Reviewed-by: Avi Drissman <avi@chromium.org>
Commit-Queue: Avi Drissman <avi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#618840}

rlz/chromeos/lib/rlz_value_store_chromeos.cc

@@ -15,6 +15,7 @@
 #include "base/metrics/histogram_macros.h"
 #include "base/path_service.h"
 #include "base/sequenced_task_runner.h"
+#include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/values.h"
@@ -173,7 +174,7 @@ bool RlzValueStoreChromeOS::WriteAccessPointRlz(AccessPoint access_point,
   // contain both install and first search cohorts.  Ignoring the second
   // means the first search cohort will never be stored.
   char dummy[kMaxRlzLength + 1];
-  if (ReadAccessPointRlz(access_point, dummy, arraysize(dummy)) &&
+  if (ReadAccessPointRlz(access_point, dummy, base::size(dummy)) &&
       dummy[0] != 0) {
     return true;
   }

rlz/lib/financial_ping.cc

@@ -12,8 +12,8 @@
 
 #include "base/atomicops.h"
 #include "base/location.h"
-#include "base/macros.h"
 #include "base/memory/ref_counted.h"
+#include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
@@ -124,7 +124,7 @@ bool FinancialPing::FormRequest(Product product,
   // Add the product events.
   char cgi[kMaxCgiLength + 1];
   cgi[0] = 0;
-  bool has_events = GetProductEventsAsCgi(product, cgi, arraysize(cgi));
+  bool has_events = GetProductEventsAsCgi(product, cgi, base::size(cgi));
   if (has_events)
     base::StringAppendF(request, "&%s", cgi);
 
@@ -138,8 +138,7 @@ bool FinancialPing::FormRequest(Product product,
     for (int ap = NO_ACCESS_POINT + 1; ap < LAST_ACCESS_POINT; ap++) {
       rlz[0] = 0;
       AccessPoint point = static_cast<AccessPoint>(ap);
-      if (GetAccessPointRlz(point, rlz, arraysize(rlz)) &&
-          rlz[0] != '\0')
+      if (GetAccessPointRlz(point, rlz, base::size(rlz)) && rlz[0] != '\0')
         all_points[idx++] = point;
     }
     all_points[idx] = NO_ACCESS_POINT;
@@ -148,8 +147,8 @@ bool FinancialPing::FormRequest(Product product,
   // Add the RLZ's and the DCC if needed. This is the same as get PingParams.
   // This will also include the RLZ Exchange Protocol CGI Argument.
   cgi[0] = 0;
-  if (GetPingParams(product, has_events ? access_points : all_points,
-                    cgi, arraysize(cgi)))
+  if (GetPingParams(product, has_events ? access_points : all_points, cgi,
+                    base::size(cgi)))
     base::StringAppendF(request, "&%s", cgi);
 
   if (has_events && !exclude_machine_id) {
@@ -446,7 +445,7 @@ bool FinancialPing::IsPingTime(Product product, bool no_delay) {
   // Check if this product has any unreported events.
   char cgi[kMaxCgiLength + 1];
   cgi[0] = 0;
-  bool has_events = GetProductEventsAsCgi(product, cgi, arraysize(cgi));
+  bool has_events = GetProductEventsAsCgi(product, cgi, base::size(cgi));
   if (no_delay && has_events)
     return true;
 

rlz/lib/financial_ping_test.cc

@@ -19,7 +19,7 @@
 #include <stdint.h>
 
 #include "base/logging.h"
-#include "base/macros.h"
+#include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
@@ -175,7 +175,7 @@ TEST_F(FinancialPingTest, FormRequest) {
        ap < rlz_lib::LAST_ACCESS_POINT; ap++) {
     rlz[0] = 0;
     rlz_lib::AccessPoint point = static_cast<rlz_lib::AccessPoint>(ap);
-    if (rlz_lib::GetAccessPointRlz(point, rlz, arraysize(rlz)) && rlz[0]) {
+    if (rlz_lib::GetAccessPointRlz(point, rlz, base::size(rlz)) && rlz[0]) {
       rlz_lib::SetAccessPointRlz(point, "");
     }
   }
@@ -192,7 +192,7 @@ TEST_F(FinancialPingTest, FormRequest) {
       "Q1:QsbRlzValue" DCC_PARAM, brand);
   EXPECT_STREQ(expected_response.c_str(), request.c_str());
 
-  if (!GetAccessPointRlz(rlz_lib::IE_HOME_PAGE, rlz, arraysize(rlz))) {
+  if (!GetAccessPointRlz(rlz_lib::IE_HOME_PAGE, rlz, base::size(rlz))) {
     points[2] = rlz_lib::IE_HOME_PAGE;
     EXPECT_TRUE(rlz_lib::FinancialPing::FormRequest(rlz_lib::TOOLBAR_NOTIFIER,
         points, "swg", brand, "MyId", "en-US", true, &request));

rlz/lib/rlz_lib.cc

@@ -9,7 +9,7 @@
 
 #include <algorithm>
 
-#include "base/macros.h"
+#include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/syslog_logging.h"
@@ -619,7 +619,7 @@ bool GetPingParams(Product product, const AccessPoint* access_points,
     bool first_rlz = true;  // comma before every RLZ but the first.
     for (int i = 0; access_points[i] != NO_ACCESS_POINT; i++) {
       char rlz[kMaxRlzLength + 1];
-      if (GetAccessPointRlz(access_points[i], rlz, arraysize(rlz))) {
+      if (GetAccessPointRlz(access_points[i], rlz, base::size(rlz))) {
         const char* access_point = GetAccessPointName(access_points[i]);
         if (!access_point)
           continue;
@@ -635,7 +635,7 @@ bool GetPingParams(Product product, const AccessPoint* access_points,
     // Report the DCC too if not empty. DCCs are windows-only.
     char dcc[kMaxDccLength + 1];
     dcc[0] = 0;
-    if (GetMachineDealCode(dcc, arraysize(dcc)) && dcc[0])
+    if (GetMachineDealCode(dcc, base::size(dcc)) && dcc[0])
       base::StringAppendF(&cgi_string, "&%s=%s", kDccCgiVariable, dcc);
 #endif
   }

rlz/lib/rlz_lib_test.cc

@@ -50,6 +50,7 @@
 
 #if defined(OS_CHROMEOS)
 #include "base/files/important_file_writer.h"
+#include "base/stl_util.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_debug_daemon_client.h"
 #include "rlz/chromeos/lib/rlz_value_store_chromeos.h"
@@ -1144,7 +1145,7 @@ TEST_F(RlzLibTest, NoRecordCAFEvent) {
                               rlz_lib::FIRST_SEARCH);
   char cgi[256];
   EXPECT_TRUE(
-      rlz_lib::GetProductEventsAsCgi(rlz_lib::CHROME, cgi, arraysize(cgi)));
+      rlz_lib::GetProductEventsAsCgi(rlz_lib::CHROME, cgi, base::size(cgi)));
   EXPECT_NE(nullptr, strstr(cgi, "CAF"));
 
   // Simulate another user on the machine sending the RLZ ping, so "should send
@@ -1156,7 +1157,7 @@ TEST_F(RlzLibTest, NoRecordCAFEvent) {
   // The first search event should no longer appear, so there are no events
   // to report.
   EXPECT_FALSE(
-      rlz_lib::GetProductEventsAsCgi(rlz_lib::CHROME, cgi, arraysize(cgi)));
+      rlz_lib::GetProductEventsAsCgi(rlz_lib::CHROME, cgi, base::size(cgi)));
 
   // The event should be permanently deleted, so setting the flag back to
   // true should still not return the event.
@@ -1164,7 +1165,7 @@ TEST_F(RlzLibTest, NoRecordCAFEvent) {
       chromeos::system::kShouldSendRlzPingKey,
       chromeos::system::kShouldSendRlzPingValueTrue);
   EXPECT_FALSE(
-      rlz_lib::GetProductEventsAsCgi(rlz_lib::CHROME, cgi, arraysize(cgi)));
+      rlz_lib::GetProductEventsAsCgi(rlz_lib::CHROME, cgi, base::size(cgi)));
 }
 
 TEST_F(RlzLibTest, NoRecordCAFEvent2) {
@@ -1180,7 +1181,7 @@ TEST_F(RlzLibTest, NoRecordCAFEvent2) {
                               rlz_lib::FIRST_SEARCH);
   char cgi[256];
   EXPECT_TRUE(
-      rlz_lib::GetProductEventsAsCgi(rlz_lib::CHROME, cgi, arraysize(cgi)));
+      rlz_lib::GetProductEventsAsCgi(rlz_lib::CHROME, cgi, base::size(cgi)));
   EXPECT_NE(nullptr, strstr(cgi, "CAF"));
   EXPECT_NE(nullptr, strstr(cgi, "CAI"));
 
@@ -1192,7 +1193,7 @@ TEST_F(RlzLibTest, NoRecordCAFEvent2) {
 
   // Only the "CAI" event should appear.
   EXPECT_TRUE(
-      rlz_lib::GetProductEventsAsCgi(rlz_lib::CHROME, cgi, arraysize(cgi)));
+      rlz_lib::GetProductEventsAsCgi(rlz_lib::CHROME, cgi, base::size(cgi)));
   EXPECT_NE(nullptr, strstr(cgi, "CAI"));
 
   // The event should be permanently deleted, so setting the flag back to
@@ -1201,7 +1202,7 @@ TEST_F(RlzLibTest, NoRecordCAFEvent2) {
       chromeos::system::kShouldSendRlzPingKey,
       chromeos::system::kShouldSendRlzPingValueTrue);
   EXPECT_TRUE(
-      rlz_lib::GetProductEventsAsCgi(rlz_lib::CHROME, cgi, arraysize(cgi)));
+      rlz_lib::GetProductEventsAsCgi(rlz_lib::CHROME, cgi, base::size(cgi)));
   EXPECT_NE(nullptr, strstr(cgi, "CAI"));
 }
 #endif

rlz/lib/string_utils_unittest.cc

@@ -9,7 +9,7 @@
 #include <stddef.h>
 
 #include "base/logging.h"
-#include "base/macros.h"
+#include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "rlz/lib/assert.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ -19,11 +19,11 @@ TEST(StringUtilsUnittest, IsAscii) {
   rlz_lib::SetExpectedAssertion("");
 
   char bad_letters[] = {'\x80', '\xA0', '\xFF'};
-  for (size_t i = 0; i < arraysize(bad_letters); ++i)
+  for (size_t i = 0; i < base::size(bad_letters); ++i)
     EXPECT_FALSE(rlz_lib::IsAscii(bad_letters[i]));
 
   char good_letters[] = {'A', '~', '\n', 0x7F, 0x00};
-  for (size_t i = 0; i < arraysize(good_letters); ++i)
+  for (size_t i = 0; i < base::size(good_letters); ++i)
     EXPECT_TRUE(rlz_lib::IsAscii(good_letters[i]));
 }
 

rlz/win/lib/machine_deal.cc

@@ -10,7 +10,7 @@
 #include <stddef.h>
 #include <vector>
 
-#include "base/macros.h"
+#include "base/stl_util.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
@@ -174,7 +174,7 @@ bool MachineDealCode::GetNewCodeFromPingResponse(const char* response,
 
   // Get the current DCC value to compare to later)
   char stored_dcc[kMaxDccLength + 1];
-  if (!Get(stored_dcc, arraysize(stored_dcc)))
+  if (!Get(stored_dcc, base::size(stored_dcc)))
     stored_dcc[0] = 0;
 
   int search_index = 0;
@@ -217,7 +217,7 @@ bool MachineDealCode::SetFromPingResponse(const char* response) {
   char new_dcc[kMaxDccLength + 1];
 
   bool response_valid = GetNewCodeFromPingResponse(
-      response, &has_new_dcc, new_dcc, arraysize(new_dcc));
+      response, &has_new_dcc, new_dcc, base::size(new_dcc));
 
   if (response_valid && has_new_dcc)
     return Set(new_dcc);
@@ -290,7 +290,7 @@ bool MachineDealCode::Clear() {
 
   // Verify deletion.
   wchar_t dcc[kMaxDccLength + 1];
-  DWORD dcc_size = arraysize(dcc);
+  DWORD dcc_size = base::size(dcc);
   if (dcc_key.ReadValue(kDccValueName, dcc, &dcc_size, NULL) == ERROR_SUCCESS) {
     ASSERT_STRING("MachineDealCode::Clear: Could not delete the DCC value.");
     return false;

rlz/win/lib/machine_id_win.cc

@@ -8,7 +8,7 @@
 #include <memory>
 #include <string>
 
-#include "base/macros.h"
+#include "base/stl_util.h"
 #include "base/strings/string16.h"
 #include "rlz/lib/assert.h"
 
@@ -85,7 +85,7 @@ bool GetRawMachineId(base::string16* sid_string, int* volume_id) {
   // Calculate the Windows SID.
 
   wchar_t computer_name[MAX_COMPUTERNAME_LENGTH + 1] = {0};
-  DWORD size = arraysize(computer_name);
+  DWORD size = base::size(computer_name);
 
   if (GetComputerNameW(computer_name, &size)) {
     char sid_buffer[SECURITY_MAX_SID_SIZE];

rlz/win/lib/rlz_value_store_registry.cc

@@ -4,7 +4,7 @@
 
 #include "rlz/win/lib/rlz_value_store_registry.h"
 
-#include "base/macros.h"
+#include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/registry.h"
@@ -287,7 +287,7 @@ bool RlzValueStoreRegistry::ReadProductEvents(Product product,
     // Max 32767 bytes according to MSDN, but we never use that much.
     const size_t kMaxValueNameLength = 2048;
     char buffer[kMaxValueNameLength];
-    DWORD size = arraysize(buffer);
+    DWORD size = base::size(buffer);
 
     result = RegEnumValueA(events_key.Handle(), num_values, buffer, &size,
                            NULL, NULL, NULL, NULL);
@@ -355,7 +355,7 @@ void RlzValueStoreRegistry::CollectGarbage() {
     kPingTimesSubkeyName
   };
 
-  for (size_t i = 0; i < arraysize(subkeys); i++) {
+  for (size_t i = 0; i < base::size(subkeys); i++) {
     std::string subkey_name;
     base::StringAppendF(&subkey_name, "%s\\%s", kLibKeyName, subkeys[i]);
     AppendBrandToString(&subkey_name);