diff options
| author | viettrungluu <viettrungluu@chromium.org> | 2014-10-16 18:20:48 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-17 01:21:04 +0000 |
| commit | 2560ad88c6c237d40db5bf2e377cd552c33ef6ea (patch) | |
| tree | cbb6d0a186ad1b08a917e6a07c5558389cd3f74f /chromeos | |
| parent | 7cbf7ae277ab297529d5ae4b5f3f61cc37bc77ea (diff) | |
| download | chromium_src-2560ad88c6c237d40db5bf2e377cd552c33ef6ea.zip chromium_src-2560ad88c6c237d40db5bf2e377cd552c33ef6ea.tar.gz chromium_src-2560ad88c6c237d40db5bf2e377cd552c33ef6ea.tar.bz2 | |
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}
Diffstat (limited to 'chromeos')
| -rw-r--r-- | chromeos/network/network_cert_migrator.cc | 2 | ||||
| -rw-r--r-- | chromeos/network/network_change_notifier_chromeos_unittest.cc | 2 |
2 files changed, 2 insertions, 2 deletions
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); |