commit 35fe21779fddc0d376da13dab49e31fa3491205f
author Grace Cham <hscham@chromium.org> Mon May 30 01:05:10 2022
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Jun 02 02:08:29 2022
tree fa22c2326c89f0ccbecf5d2e3635701867e62b85
parent 9e852aa145930d6ebb990d4e8f84e5907a1321de

cbor: replace base::size with std::size

Will be removed from base/cxx17_backports.h from libchrome r979799
(crrev.com/c/3511268).

BUG=b:228144902
TEST=FEATURES=test emerge-hatch cbor

Change-Id: Ibf5a16863a18b98695799f56ef25b04dee488e8e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/cbor/+/3676632
Commit-Queue: Grace Cham <hscham@chromium.org>
Tested-by: Grace Cham <hscham@chromium.org>
Reviewed-by: Tom Hughes <tomhughes@chromium.org>

reader_unittest.cc

diff --git a/reader_unittest.cc b/reader_unittest.cc
index 2849aba..d0e457b 100644
--- a/reader_unittest.cc
+++ b/reader_unittest.cc
@@ -9,7 +9,6 @@
 #include "cbor/reader.h"
 
 #include "base/containers/span.h"
-#include "base/cxx17_backports.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -744,7 +743,7 @@
   ASSERT_EQ(cbor->type(), Value::Type::MAP);
   ASSERT_EQ(cbor->GetMap().size(), 6u);
   EXPECT_EQ(error_code, Reader::DecoderError::CBOR_NO_ERROR);
-  EXPECT_EQ(num_bytes_consumed, base::size(kMapTestCase));
+  EXPECT_EQ(num_bytes_consumed, std::size(kMapTestCase));
 }
 
 TEST(CBORReaderTest, TestReadNestedMap) {

writer_unittest.cc

diff --git a/writer_unittest.cc b/writer_unittest.cc
index b3348a8..fdac057 100644
--- a/writer_unittest.cc
+++ b/writer_unittest.cc
@@ -7,7 +7,6 @@
 #include <limits>
 #include <string>
 
-#include "base/cxx17_backports.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -135,7 +134,7 @@
   ASSERT_TRUE(cbor.has_value());
   EXPECT_THAT(cbor.value(),
               testing::ElementsAreArray(kArrayTestCaseCbor,
-                                        base::size(kArrayTestCaseCbor)));
+                                        std::size(kArrayTestCaseCbor)));
 }
 
 TEST(CBORWriterTest, TestWriteMap) {
@@ -260,7 +259,7 @@
   ASSERT_TRUE(cbor.has_value());
   EXPECT_THAT(cbor.value(),
               testing::ElementsAreArray(kMapTestCaseCbor,
-                                        base::size(kMapTestCaseCbor)));
+                                        std::size(kMapTestCaseCbor)));
 }
 
 TEST(CBORWriterTest, TestWriteMapWithArray) {
@@ -286,7 +285,7 @@
   ASSERT_TRUE(cbor.has_value());
   EXPECT_THAT(cbor.value(),
               testing::ElementsAreArray(kMapArrayTestCaseCbor,
-                                        base::size(kMapArrayTestCaseCbor)));
+                                        std::size(kMapArrayTestCaseCbor)));
 }
 
 TEST(CBORWriterTest, TestWriteNestedMap) {
@@ -315,7 +314,7 @@
   ASSERT_TRUE(cbor.has_value());
   EXPECT_THAT(cbor.value(),
               testing::ElementsAreArray(kNestedMapTestCase,
-                                        base::size(kNestedMapTestCase)));
+                                        std::size(kNestedMapTestCase)));
 }
 
 TEST(CBORWriterTest, TestSignedExchangeExample) {
@@ -362,7 +361,7 @@
   ASSERT_TRUE(cbor.has_value());
   EXPECT_THAT(cbor.value(),
               testing::ElementsAreArray(kSignedExchangeExample,
-                                        base::size(kSignedExchangeExample)));
+                                        std::size(kSignedExchangeExample)));
 }
 
 TEST(CBORWriterTest, TestWriteSimpleValue) {