MacViews: Fix failing bubble border tests after r375729.

ui/views/bubble/bubble_border_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 "ui/views/bubble/bubble_border.h"
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 206 matching lines @@
   const views::internal::BorderImages* kImages = border.GetImagesForTest();
 
   // kSmallSize is smaller than the minimum allowable size and does not
   // contribute to the resulting size.
   const gfx::Size kSmallSize = gfx::Size(1, 2);
   // kMediumSize is larger than the minimum allowable size and contributes to
   // the resulting size.
   const gfx::Size kMediumSize = gfx::Size(50, 60);
 
   const gfx::Size kSmallHorizArrow(
-      2 * kImages->border_thickness + kImages->top_arrow.width(),
+      2 * kImages->border_thickness + kImages->arrow_width,
       kImages->border_thickness + kImages->arrow_thickness +
           kImages->border_interior_thickness);
 
   const gfx::Size kSmallVertArrow(kSmallHorizArrow.height(),
                                   kSmallHorizArrow.width());
 
   const gfx::Size kSmallNoArrow(2 * kImages->border_thickness,
                                 2 * kImages->border_thickness);
 
   const gfx::Size kMediumHorizArrow(
@@ skipping 100 matching lines @@
 
   border.set_arrow(BubbleBorder::NONE);
   const gfx::Size kTotalSizeWithNoArrow =
       border.GetSizeForContentsSize(kContentSize);
 
   const int kBorderThickness = border.GetBorderThickness();
 
   const int kArrowOffsetForHorizCenter = kTotalSizeWithHorizArrow.width() / 2;
   const int kArrowOffsetForVertCenter = kTotalSizeWithVertArrow.height() / 2;
   const int kArrowOffsetForNotCenter =
-      kImages->border_thickness + (kImages->top_arrow.width() / 2);
+      kImages->border_thickness + (kImages->arrow_width / 2);
 
   const int kArrowSize =
       kImages->arrow_interior_thickness + BubbleBorder::kStroke -
           kImages->arrow_thickness;
 
   const int kTopHorizArrowY = kAnchor.y() + kAnchor.height() + kArrowSize;
   const int kBottomHorizArrowY =
       kAnchor.y() - kArrowSize - kTotalSizeWithHorizArrow.height();
 
   const int kLeftVertArrowX = kAnchor.x() + kAnchor.width() + kArrowSize;
@@ skipping 81 matching lines @@
     EXPECT_GE(border_images->border_thickness,
               border_images->border_interior_thickness);
 
     // For a TOP_LEFT arrow, the x-offset always matches the border thickness.
     EXPECT_EQ(border.GetArrowRect(rect).x(), border_images->border_thickness);
     border.Paint(paint_view, &canvas);
   }
 }
 
 }  // namespace views