Use base::size and std::extent rather than arraysize in chrome/.

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

BUG=837308
R=thakis@chromium.org

Change-Id: I3246cd4e8c500e9b5cf1192a381d349ef60263fa
Reviewed-on: https://chromium-review.googlesource.com/c/1391953Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Avi Drissman <avi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#620145}

chrome/browser/conflicts/module_blacklist_cache_util_win.cc

@@ -9,6 +9,7 @@
 #include <iterator>
 #include <string>
 #include <tuple>
+#include <type_traits>
 #include <utility>
 
 #include "base/files/file.h"
@@ -232,7 +233,7 @@ int64_t CalculateExpectedFileSize(
   return static_cast<int64_t>(sizeof(third_party_dlls::PackedListMetadata) +
                               packed_list_metadata.module_count *
                                   sizeof(third_party_dlls::PackedListModule) +
-                              arraysize(base::MD5Digest::a));
+                              std::extent<decltype(base::MD5Digest::a)>());
 }
 
 bool ModuleLess::operator()(

chrome/browser/conflicts/module_blacklist_cache_util_win_unittest.cc

@@ -8,6 +8,7 @@
 #include <memory>
 #include <random>
 #include <set>
+#include <type_traits>
 #include <utility>
 
 #include "base/files/file_util.h"
@@ -130,7 +131,7 @@ TEST_F(ModuleBlacklistCacheUtilTest, WriteEmptyCache) {
       0x9F, 0x1F, 0xDB, 0xEE, 0x7F, 0x58, 0x74, 0xCB,
   };
 
-  for (size_t i = 0; i < arraysize(base::MD5Digest::a); ++i)
+  for (size_t i = 0; i < std::extent<decltype(base::MD5Digest::a)>(); ++i)
     EXPECT_EQ(expected.a[i], md5_digest.a[i]);
 }
 
@@ -175,7 +176,7 @@ TEST_F(ModuleBlacklistCacheUtilTest, WriteAndRead) {
                       read_blacklisted_modules.size() *
                           sizeof(third_party_dlls::PackedListModule)));
 
-  for (size_t i = 0; i < arraysize(base::MD5Digest::a); ++i)
+  for (size_t i = 0; i < std::extent<decltype(base::MD5Digest::a)>(); ++i)
     EXPECT_EQ(md5_digest.a[i], read_md5_digest.a[i]);
 }
 

chrome/elevation_service/service_main.cc

@@ -11,6 +11,8 @@
 
 #include "chrome/elevation_service/service_main.h"
 
+#include <type_traits>
+
 #include <atlsecurity.h>
 #include <sddl.h>
 #include <wrl/module.h>
@@ -85,13 +87,13 @@ HRESULT ServiceMain::RegisterClassObject() {
 
   // The pointer in this array is unowned. Do not release it.
   IClassFactory* class_factories[] = {class_factory.Get()};
-  static_assert(base::size(decltype(cookies_){}) ==
-                base::size(class_factories),
-                "Arrays cookies_ and class_factories must be the same size.");
+  static_assert(
+      std::extent<decltype(cookies_)>() == base::size(class_factories),
+      "Arrays cookies_ and class_factories must be the same size.");
 
   IID class_ids[] = {install_static::GetElevatorClsid()};
   DCHECK_EQ(base::size(cookies_), base::size(class_ids));
-  static_assert(base::size(decltype(cookies_){}) == base::size(class_ids),
+  static_assert(std::extent<decltype(cookies_)>() == base::size(class_ids),
                 "Arrays cookies_ and class_ids must be the same size.");
 
   hr = module.RegisterCOMObject(nullptr, class_ids, class_factories, cookies_,

chrome/notification_helper/com_server_module.cc

@@ -11,9 +11,12 @@
 
 #include "chrome/notification_helper/com_server_module.h"
 
+#include <type_traits>
+
 #include <wrl/module.h>
 
 #include "base/metrics/histogram_macros.h"
+#include "base/stl_util.h"
 #include "chrome/install_static/install_util.h"
 #include "chrome/notification_helper/notification_activator.h"
 #include "chrome/notification_helper/trace_util.h"
@@ -99,15 +102,15 @@ HRESULT ComServerModule::RegisterClassObjects() {
 
   // All pointers in this array are unowned. Do not release them.
   IClassFactory* class_factories[] = {class_factory.Get()};
-  static_assert(arraysize(cookies_) == arraysize(class_factories),
+  static_assert(std::extent<decltype(cookies_)>() == std::size(class_factories),
                 "Arrays cookies_ and class_factories must be the same size.");
 
   IID class_ids[] = {install_static::GetToastActivatorClsid()};
-  static_assert(arraysize(cookies_) == arraysize(class_ids),
+  static_assert(std::extent<decltype(cookies_)>() == std::size(class_ids),
                 "Arrays cookies_ and class_ids must be the same size.");
 
   hr = module.RegisterCOMObject(nullptr, class_ids, class_factories, cookies_,
-                                arraysize(cookies_));
+                                std::extent<decltype(cookies_)>());
   if (FAILED(hr)) {
     LogComServerModuleHistogram(ComServerModuleStatus::REGISTRATION_FAILED);
     Trace(L"%hs(NotificationActivator registration failed; hr: 0x%08X)\n",
@@ -119,8 +122,8 @@ HRESULT ComServerModule::RegisterClassObjects() {
 
 HRESULT ComServerModule::UnregisterClassObjects() {
   auto& module = mswr::Module<mswr::OutOfProcDisableCaching>::GetModule();
-  HRESULT hr =
-      module.UnregisterCOMObject(nullptr, cookies_, arraysize(cookies_));
+  HRESULT hr = module.UnregisterCOMObject(nullptr, cookies_,
+                                          std::extent<decltype(cookies_)>());
   if (FAILED(hr)) {
     LogComServerModuleHistogram(ComServerModuleStatus::UNREGISTRATION_FAILED);
     Trace(L"%hs(NotificationActivator unregistration failed; hr: 0x%08X)\n",