Convert ARRAYSIZE_UNSAFE -> arraysize in chrome/browser/.

chrome/browser/ui/views/tabs/stacked_tab_strip_layout_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/tabs/stacked_tab_strip_layout.h"
 
 #include <string>
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ skipping 149 matching lines @@
     { 0, 198, 100, -10, 1, 0, 0, "", "0 90 94 95 96 97 98 98 98" },
     { 0, 300, 100, -10, 1, 0, 0, "",
       "0 90 180 196 197 198 199 200 200 200 200" },
     { 0, 300, 100, -10, 1, 0, 10, "", "0 0 0 0 1 2 3 4 20 110 200" },
     { 0, 300, 100, -10, 1, 0, 1, "", "0 90 180 196 197 198 199 200 200" },
     { 0, 643, 160, -27, 6, 0, 0, "", "0 133 266 399" },
     { 0, 300, 100, -10, 1, 0, 7, "", "0 1 2 3 4 20 110 200" },
     { 0, 300, 100, -10, 1, 0, 6, "", "0 1 2 3 4 20 110 200" },
     { 0, 300, 100, -10, 1, 0, 4, "", "0 1 2 3 4 94 184 199 200" },
   };
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_data); ++i) {
+  for (size_t i = 0; i < arraysize(test_data); ++i) {
     CreateLayout(test_data[i]);
     EXPECT_EQ(test_data[i].expected_bounds, BoundsString()) << " at " << i;
   }
 }
 
 // Assertions for dragging from an existing configuration.
 TEST_F(StackedTabStripLayoutTest, DragActiveTabExisting) {
   struct TestData {
     struct CommonTestData common_data;
     const int delta;
@@ skipping 64 matching lines @@
     // Drags 1 beyond the left most position, which should pull in the right
     // tab slightly.
     { { 0, 240, 100, -10, 2, 0, 1, "0 90 140", "0 49 139" }, -41 },
     // Drags to the left as far as the tab goes.
     { { 0, 240, 100, -10, 2, 0, 1, "0 90 140", "0 2 92" }, -88 },
     // Drags one past as far to the left as the tab goes. Should keep pulling
     // in the rightmost tab.
     { { 0, 240, 100, -10, 2, 0, 1, "0 90 140", "0 2 91" }, -89 },
   };
 
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_data); ++i) {
+  for (size_t i = 0; i < arraysize(test_data); ++i) {
     CreateLayout(test_data[i].common_data);
     layout_->DragActiveTab(test_data[i].delta);
     EXPECT_EQ(test_data[i].common_data.expected_bounds, BoundsString()) <<
         " at " << i;
   }
 }
 
 // Assertions for SizeToFit().
 TEST_F(StackedTabStripLayoutTest, SizeToFit) {
   struct CommonTestData test_data[] = {
     // Dragged to the right.
     { 10, 240, 100, -10, 2, 2, 1, "0 5 10 100 138 140", "1 6 11 101 138 140"},
     { 10, 240, 100, -10, 2, 2, 1, "0 5 10 100 138 140",
       "124 129 134 136 138 140" },
 
     // Dragged to the left.
     { 0, 240, 100, -10, 2, 0, 1, "0 50 140", "0 49 139" },
 
     // Dragged to the left.
     { 0, 240, 100, -10, 2, 0, 1, "0 49 89 140", "0 49 89 139" },
   };
 
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_data); ++i) {
+  for (size_t i = 0; i < arraysize(test_data); ++i) {
     CreateLayout(test_data[i]);
     SetBoundsFromString(test_data[i].expected_bounds);
     layout_->SizeToFit();
     // NOTE: because of the way the code is structured this asserts on
     // |start_bound|, not |expected_bounds|.
     EXPECT_EQ(test_data[i].start_bounds, BoundsString()) << " at " << i;
   }
 }
 
 // Assertions for AddTab().
@@ skipping 32 matching lines @@
     { { 0, 200, 100, -10, 2, 0, 7, "0 2 4 6 8 8 10 100",
                                    "0 2 4 6 8 94 96 98 100"},
       4, true, false },
     { { 0, 200, 100, -10, 2, 0, 2, "0 2 10 100", "0 2 10 98 100"},
       2, true, false },
     { { 0, 200, 100, -10, 2, 0, 2, "0 2 10 100", "0 2 4 10 100"},
       4, true, false },
     { { 0, 200, 100, -10, 2, 0, 2, "0 2 10 100", "0 90 96 98 100"},
       0, true, false },
   };
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_data); ++i) {
+  for (size_t i = 0; i < arraysize(test_data); ++i) {
     CreateLayout(test_data[i].common_data);
     int add_types = 0;
     if (test_data[i].add_active)
       add_types |= StackedTabStripLayout::kAddTypeActive;
     if (test_data[i].add_mini)
       add_types |= StackedTabStripLayout::kAddTypeMini;
     AddViewToViewModel(test_data[i].add_index);
     layout_->AddTab(test_data[i].add_index, add_types,
                     test_data[i].common_data.initial_x +
                     (test_data[i].add_mini ? 4 : 0));
@@ skipping 36 matching lines @@
       0, 0 },
     { { 0, 200, 100, -10, 2, 0, 0, "0 90 94 96 98 100", "0 90 96 98 100" },
       1, 0 },
     { { 0, 200, 100, -10, 2, 0, 0, "0 90 94 96 98 100", "0 90 96 98 100" },
       2, 0 },
     { { 0, 200, 100, -10, 2, 0, 0, "0 90 94 96 98 100", "0 90 94 98 100" },
       3, 0 },
     { { 0, 200, 100, -10, 2, 0, 0, "0 90 94 96 98 100", "0 90 94 96 100" },
       5, 0 },
   };
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_data); ++i) {
+  for (size_t i = 0; i < arraysize(test_data); ++i) {
     CreateLayout(test_data[i].common_data);
     int old_x = view_model_.ideal_bounds(test_data[i].remove_index).x();
     view_model_.Remove(test_data[i].remove_index);
     layout_->RemoveTab(test_data[i].remove_index, test_data[i].x_after_remove,
                        old_x);
     EXPECT_EQ(test_data[i].common_data.expected_bounds, BoundsString()) <<
         " at " << i;
   }
 }
 
@@ skipping 14 matching lines @@
     { { 8, 250, 100, -10, 2, 2, 2, "0 4 8 98 148 150", "0 4 8 96 98 100"},
       200 },
 
     { { 0, 250, 100, -10, 2, 0, 2, "0 40 90 120 150", "0 40 90 98 100"}, 200 },
     { { 0, 250, 100, -10, 2, 0, 2, "0 2 60 150", "0 2 60 100"}, 200 },
     { { 0, 250, 100, -10, 2, 0, 2, "0 40 120 150", "0 40 98 100"}, 200 },
 
     { { 0, 200, 100, -10, 2, 0, 2, "0 2 10 100", "0 2 60 150"}, 250 },
     { { 0, 200, 100, -10, 2, 0, 2, "0 2 4 10 100", "0 2 20 110 200"}, 300 },
   };
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_data); ++i) {
+  for (size_t i = 0; i < arraysize(test_data); ++i) {
     CreateLayout(test_data[i].common_data);
     layout_->SetWidth(test_data[i].new_width);
     EXPECT_EQ(test_data[i].common_data.expected_bounds, BoundsString()) <<
         " at " << i;
   }
 }
 
 // Assertions for SetActiveIndex().
 TEST_F(StackedTabStripLayoutTest, SetActiveIndex) {
   struct TestData {
     CommonTestData common_data;
     int new_index;
   } test_data[] = {
     { { 0, 250, 100, -10, 2, 0, 2, "0 4 8 98 148 150", "0 90 144 146 148 150"},
       0 },
     { { 0, 250, 100, -10, 2, 0, 2, "0 4 8 98 148 150", "0 2 4 58 148 150"}, 4 },
     { { 0, 250, 100, -10, 2, 0, 2, "0 4 8 98 148 150", "0 2 4 6 60 150"}, 5 },
     { { 4, 250, 100, -10, 2, 1, 2, "0 4 8 98 148 150", "0 4 94 146 148 150"},
       0 },
   };
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_data); ++i) {
+  for (size_t i = 0; i < arraysize(test_data); ++i) {
     CreateLayout(test_data[i].common_data);
     layout_->SetActiveIndex(test_data[i].new_index);
     EXPECT_EQ(test_data[i].common_data.expected_bounds, BoundsString()) <<
         " at " << i;
   }
 }
 
 // Makes sure don't crash when resized and only one tab.
 TEST_F(StackedTabStripLayoutTest, EmptyTest) {
   StackedTabStripLayout layout(gfx::Size(160, 10), -27, 6, 4, &view_model_);
@@ skipping 24 matching lines @@
     { { 0, 300, 100, -10, 2, 0, 4, "", "0 5 95 185 196 198 200" },
       2, 0, 0, 5, 1 },
     { { 0, 300, 100, -10, 2, 1, 2, "", "0 5 10 100 190 198 200" },
       2, 0, 0, 10, 2 },
 
     { { 0, 200, 100, -10, 2, 0, 4, "0 2 4 6 96 98 100", "0 2 4 6 96 98 100" },
       2, 0, 4, 0, 0 },
     { { 0, 200, 100, -10, 2, 0, 4, "0 2 4 6 96 98 100", "0 2 4 6 8 10 100" },
       0, 6, 6, 0, 0 },
   };
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_data); ++i) {
+  for (size_t i = 0; i < arraysize(test_data); ++i) {
     CreateLayout(test_data[i].common_data);
     view_model_.MoveViewOnly(test_data[i].from, test_data[i].to);
     for (int j = 0; j < test_data[i].new_mini_tab_count; ++j) {
       gfx::Rect bounds;
       bounds.set_x(j * 5);
       view_model_.set_ideal_bounds(j, bounds);
     }
     layout_->MoveTab(test_data[i].from, test_data[i].to,
                      test_data[i].new_active_index, test_data[i].new_start_x,
                      test_data[i].new_mini_tab_count);
@@ skipping 44 matching lines @@
 
     // Active tab is pinned; should result in nothing.
     { { 0, 300, 100, -10, 2, 2, 1, "", "0 0 0 90 180 198 200" }, 199 },
 
     // Location is too far to the right, ends up being pushed in.
     { { 0, 300, 100, -10, 2, 0, 3, "", "0 14 104 194 196 198 200" }, 199 },
 
     // Location can be honored.
     { { 0, 300, 100, -10, 2, 0, 3, "", "0 2 4 40 130 198 200" }, 40 },
   };
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_data); ++i) {
+  for (size_t i = 0; i < arraysize(test_data); ++i) {
     CreateLayout(test_data[i].common_data);
     layout_->SetActiveTabLocation(test_data[i].location);
     EXPECT_EQ(test_data[i].common_data.expected_bounds, BoundsString()) <<
         " at " << i;
   }
 }