From 2560ad88c6c237d40db5bf2e377cd552c33ef6ea Mon Sep 17 00:00:00 2001 From: viettrungluu Date: Thu, 16 Oct 2014 18:20:48 -0700 Subject: Convert the few remaining ARRAYSIZE_UNSAFE -> arraysize. There are still ARRAYSIZE_UNSAFEs in ppapi/tests/test_audio.cc, but it defines it itself, and it might be compiled by some older NaCl toolchain that doesn't support C++11. third_party/npapi/npspy/common/format.cpp also has its own ARRAYSIZE_UNSAFE, but I'm hoping to delete npspy completely.) I'll remove ARRAYSIZE_UNSAFE from base/macro.h separately, since it's quite likely we have deps that use our base (and those deps may use it). R=ben@chromium.org TBR=armansito@chromium.org BUG=423134 Review URL: https://codereview.chromium.org/663673002 Cr-Commit-Position: refs/heads/master@{#300034} --- chromeos/network/network_cert_migrator.cc | 2 +- chromeos/network/network_change_notifier_chromeos_unittest.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'chromeos') diff --git a/chromeos/network/network_cert_migrator.cc b/chromeos/network/network_cert_migrator.cc index 1b50820..613d46a 100644 --- a/chromeos/network/network_cert_migrator.cc +++ b/chromeos/network/network_cert_migrator.cc @@ -210,7 +210,7 @@ class NetworkCertMigrator::MigrationTask shill::kOpenVPNCaCertPemProperty, UMA_NETWORK_TYPE_OPENVPN }, }; - for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kNssPemMap); ++i) { + for (size_t i = 0; i < arraysize(kNssPemMap); ++i) { const base::DictionaryValue* dict = &shill_properties; if (kNssPemMap[i].read_prefix) { shill_properties.GetDictionaryWithoutPathExpansion( diff --git a/chromeos/network/network_change_notifier_chromeos_unittest.cc b/chromeos/network/network_change_notifier_chromeos_unittest.cc index 04d549f..e1b8d78 100644 --- a/chromeos/network/network_change_notifier_chromeos_unittest.cc +++ b/chromeos/network/network_change_notifier_chromeos_unittest.cc @@ -92,7 +92,7 @@ TEST(NetworkChangeNotifierChromeosTest, ConnectionTypeFromShill) { NetworkChangeNotifier::CONNECTION_2G } }; - for (size_t i = 0; i < ARRAYSIZE_UNSAFE(type_mappings); ++i) { + for (size_t i = 0; i < arraysize(type_mappings); ++i) { NetworkChangeNotifier::ConnectionType type = NetworkChangeNotifierChromeos::ConnectionTypeFromShill( type_mappings[i].shill_type, type_mappings[i].technology); -- cgit v1.1