Cleanup BubbleFrameView and BubbleBorder construction.

ui/views/bubble/bubble_frame_view_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/base/hit_test.h"
 #include "ui/gfx/insets.h"
 #include "ui/views/bubble/bubble_border.h"
 #include "ui/views/bubble/bubble_delegate.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
 
 namespace views {
 
 typedef ViewsTestBase BubbleFrameViewTest;
 
 namespace {
 
 const BubbleBorder::ArrowLocation kArrow = BubbleBorder::TOP_LEFT;
 const int kBubbleWidth = 200;
 const int kBubbleHeight = 200;
-const SkColor kBackgroundColor = SK_ColorRED;
-const int kDefaultMargin = 6;
+const SkColor kColor = SK_ColorRED;
+const int kMargin = 6;
 
 class SizedBubbleDelegateView : public BubbleDelegateView {
  public:
   SizedBubbleDelegateView(View* anchor_view);
   virtual ~SizedBubbleDelegateView();
 
   // View overrides:
   virtual gfx::Size GetPreferredSize() OVERRIDE;
 
  private:
@@ skipping 18 matching lines @@
  protected:
   virtual gfx::Rect GetMonitorBounds(const gfx::Rect& rect) OVERRIDE;
 
  private:
   gfx::Rect monitor_bounds_;
 
   DISALLOW_COPY_AND_ASSIGN(TestBubbleFrameView);
 };
 
 TestBubbleFrameView::TestBubbleFrameView()
-    : BubbleFrameView(gfx::Insets(kDefaultMargin,
-                                  kDefaultMargin,
-                                  kDefaultMargin,
-                                  kDefaultMargin),
-                      new BubbleBorder(kArrow, BubbleBorder::NO_SHADOW)),
+    : BubbleFrameView(gfx::Insets(kMargin, kMargin, kMargin, kMargin)),
       monitor_bounds_(gfx::Rect(0, 0, 1000, 1000)) {
-  bubble_border()->set_background_color(kBackgroundColor);
+  SetBubbleBorder(new BubbleBorder(kArrow, BubbleBorder::NO_SHADOW, kColor));
 }
 
 TestBubbleFrameView::~TestBubbleFrameView() {}
 
 gfx::Rect TestBubbleFrameView::GetMonitorBounds(const gfx::Rect& rect) {
   return monitor_bounds_;
 }
 
 }  // namespace
 
 TEST_F(BubbleFrameViewTest, GetBoundsForClientView) {
   TestBubbleFrameView frame;
   EXPECT_EQ(kArrow, frame.bubble_border()->arrow_location());
-  EXPECT_EQ(kBackgroundColor, frame.bubble_border()->background_color());
+  EXPECT_EQ(kColor, frame.bubble_border()->background_color());
 
   int margin_x = frame.content_margins().left();
   int margin_y = frame.content_margins().top();
   gfx::Insets insets = frame.bubble_border()->GetInsets();
   EXPECT_EQ(insets.left() + margin_x, frame.GetBoundsForClientView().x());
   EXPECT_EQ(insets.top() + margin_y, frame.GetBoundsForClientView().y());
 }
 
 TEST_F(BubbleFrameViewTest, NonClientHitTest) {
   // Create the anchor and parent widgets.
@@ skipping 277 matching lines @@
       gfx::Size(500, 500),          // |client_size|
       true);                        // |adjust_if_offscreen|
   EXPECT_EQ(BubbleBorder::RIGHT_CENTER,
             frame.bubble_border()->arrow_location());
   EXPECT_EQ(window_bounds.bottom(), 1000);
   EXPECT_EQ(window_bounds.y() +
             frame.bubble_border()->GetArrowOffset(window_bounds.size()), 925);
 }
 
 }  // namespace views