summaryrefslogtreecommitdiff
path: root/chromium/ui/gfx/paint_vector_icon_unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/ui/gfx/paint_vector_icon_unittest.cc')
-rw-r--r--chromium/ui/gfx/paint_vector_icon_unittest.cc15
1 files changed, 8 insertions, 7 deletions
diff --git a/chromium/ui/gfx/paint_vector_icon_unittest.cc b/chromium/ui/gfx/paint_vector_icon_unittest.cc
index b472dff7b0f..ca8efecbcef 100644
--- a/chromium/ui/gfx/paint_vector_icon_unittest.cc
+++ b/chromium/ui/gfx/paint_vector_icon_unittest.cc
@@ -8,6 +8,7 @@
#include <vector>
#include "base/i18n/rtl.h"
+#include "base/stl_util.h"
#include "cc/paint/paint_record.h"
#include "cc/paint/paint_recorder.h"
#include "third_party/skia/include/core/SkCanvas.h"
@@ -50,7 +51,7 @@ TEST(VectorIconTest, RelativeMoveToAfterClose) {
MOVE_TO, 4, 5, LINE_TO, 10, 11, CLOSE,
// This move should use (4, 5) as the start point rather than (10, 11).
R_MOVE_TO, 20, 21, R_LINE_TO, 50, 51};
- const VectorIconRep rep_list[] = {{elements, arraysize(elements)}};
+ const VectorIconRep rep_list[] = {{elements, base::size(elements)}};
const VectorIcon icon = {rep_list, 1u};
PaintVectorIcon(&canvas, icon, 100, SK_ColorMAGENTA);
@@ -91,7 +92,7 @@ TEST(VectorIconTest, FlipsInRtl) {
R_H_LINE_TO,
-20,
CLOSE};
- const VectorIconRep rep_list[] = {{elements, arraysize(elements)}};
+ const VectorIconRep rep_list[] = {{elements, base::size(elements)}};
const VectorIcon icon = {rep_list, 1u};
PaintVectorIcon(&canvas, icon, canvas_size, color);
@@ -217,11 +218,11 @@ TEST(VectorIconTest, CorrectSizePainted) {
0,
CLOSE};
// VectorIconReps are always sorted in descending order of size.
- const VectorIconRep rep_list[] = {{elements48, arraysize(elements48)},
- {elements32, arraysize(elements32)},
- {elements24, arraysize(elements24)},
- {elements20, arraysize(elements20)},
- {elements16, arraysize(elements16)}};
+ const VectorIconRep rep_list[] = {{elements48, base::size(elements48)},
+ {elements32, base::size(elements32)},
+ {elements24, base::size(elements24)},
+ {elements20, base::size(elements20)},
+ {elements16, base::size(elements16)}};
const VectorIcon icon = {rep_list, 5u};
// Test exact sizes paint the correctly sized icon, including the largest and