[Refactor] Cache the views::Widget* that the FrameMaximizeButton acts on

ash/wm/caption_buttons/frame_caption_button_container_view_unittest.cc

 // Copyright 2013 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 "ash/wm/caption_buttons/frame_caption_button_container_view.h"
 
 #include "ash/ash_switches.h"
 #include "ash/test/ash_test_base.h"
 #include "base/command_line.h"
 #include "grit/ash_resources.h"
@@ skipping 120 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(FrameCaptionButtonContainerViewTestOldStyle);
 };
 
 // Test how the allowed actions affect which caption buttons are visible.
 TEST_F(FrameCaptionButtonContainerViewTestOldStyle, ButtonVisibility) {
   // The minimize button should be hidden when both minimizing and maximizing
   // are allowed because the size button can do both.
   scoped_ptr<views::Widget> widget_can_maximize(
       CreateTestWidget(MAXIMIZE_ALLOWED));
-  FrameCaptionButtonContainerView container1(NULL, widget_can_maximize.get(),
+  FrameCaptionButtonContainerView container1(widget_can_maximize.get(),
       FrameCaptionButtonContainerView::MINIMIZE_ALLOWED);
   container1.Layout();
   FrameCaptionButtonContainerView::TestApi t1(&container1);
   EXPECT_FALSE(t1.minimize_button()->visible());
   EXPECT_TRUE(t1.size_button()->visible());
   EXPECT_TRUE(t1.close_button()->visible());
   EXPECT_TRUE(CheckButtonsAtEdges(
       &container1, *t1.size_button(), *t1.close_button()));
 
   // The minimize button should be visible when minimizing is allowed but
   // maximizing is disallowed.
   scoped_ptr<views::Widget> widget_cannot_maximize(
       CreateTestWidget(MAXIMIZE_DISALLOWED));
-  FrameCaptionButtonContainerView container2(NULL, widget_cannot_maximize.get(),
+  FrameCaptionButtonContainerView container2(widget_cannot_maximize.get(),
       FrameCaptionButtonContainerView::MINIMIZE_ALLOWED);
   container2.Layout();
   FrameCaptionButtonContainerView::TestApi t2(&container2);
   EXPECT_TRUE(t2.minimize_button()->visible());
   EXPECT_FALSE(t2.size_button()->visible());
   EXPECT_TRUE(t2.close_button()->visible());
   EXPECT_TRUE(CheckButtonsAtEdges(
       &container2, *t2.minimize_button(), *t2.close_button()));
 
   // Neither the minimize button nor the size button should be visible when
   // neither minimizing nor maximizing are allowed.
-  FrameCaptionButtonContainerView container3(NULL, widget_cannot_maximize.get(),
+  FrameCaptionButtonContainerView container3(widget_cannot_maximize.get(),
       FrameCaptionButtonContainerView::MINIMIZE_DISALLOWED);
   container3.Layout();
   FrameCaptionButtonContainerView::TestApi t3(&container3);
   EXPECT_FALSE(t3.minimize_button()->visible());
   EXPECT_FALSE(t3.size_button()->visible());
   EXPECT_TRUE(t3.close_button()->visible());
   EXPECT_TRUE(CheckButtonsAtEdges(
       &container3, *t3.close_button(), *t3.close_button()));
 
   // Neither the minimize button nor the size button should be visible when the
   // "force-maximize-mode" experiment is turned on.
   CommandLine::ForCurrentProcess()->AppendSwitch(switches::kForcedMaximizeMode);
-  FrameCaptionButtonContainerView container4(NULL, widget_can_maximize.get(),
+  FrameCaptionButtonContainerView container4(widget_can_maximize.get(),
       FrameCaptionButtonContainerView::MINIMIZE_ALLOWED);
   container4.Layout();
   FrameCaptionButtonContainerView::TestApi t4(&container4);
   EXPECT_FALSE(t4.minimize_button()->visible());
   EXPECT_FALSE(t4.size_button()->visible());
   EXPECT_TRUE(t4.close_button()->visible());
   EXPECT_TRUE(CheckButtonsAtEdges(
       &container4, *t4.close_button(), *t4.close_button()));
 }
 
 // Test the layout when a border is set on the container.
 TEST_F(FrameCaptionButtonContainerViewTestOldStyle, LayoutBorder) {
   const int kTopInset = 1;
   const int kLeftInset = 2;
   const int kBottomInset = 3;
   const int kRightInset = 4;
 
   scoped_ptr<views::Widget> widget(CreateTestWidget(MAXIMIZE_ALLOWED));
-  FrameCaptionButtonContainerView container(NULL, widget.get(),
+  FrameCaptionButtonContainerView container(widget.get(),
       FrameCaptionButtonContainerView::MINIMIZE_ALLOWED);
   container.set_border(views::Border::CreateEmptyBorder(
       kTopInset, kLeftInset, kBottomInset, kRightInset));
   container.Layout();
   FrameCaptionButtonContainerView::TestApi t(&container);
 
   EXPECT_EQ(kLeftInset, t.size_button()->x());
   EXPECT_EQ(kTopInset, t.close_button()->y());
   EXPECT_EQ(container.GetPreferredSize().height(),
             t.close_button()->bounds().bottom() + kBottomInset);
   EXPECT_EQ(container.GetPreferredSize().width(),
             t.close_button()->bounds().right() + kRightInset);
 }
 
 // Test how the header style affects which images are used for the buttons.
 TEST_F(FrameCaptionButtonContainerViewTestOldStyle, HeaderStyle) {
   scoped_ptr<views::Widget> widget(CreateTestWidget(MAXIMIZE_ALLOWED));
-  FrameCaptionButtonContainerView container(NULL, widget.get(),
+  FrameCaptionButtonContainerView container(widget.get(),
       FrameCaptionButtonContainerView::MINIMIZE_ALLOWED);
   FrameCaptionButtonContainerView::TestApi t(&container);
 
   // Tall header style.
   container.set_header_style(
       FrameCaptionButtonContainerView::HEADER_STYLE_TALL);
   container.Layout();
   EXPECT_TRUE(ImagesMatch(t.size_button(),
                           IDR_AURA_WINDOW_MAXIMIZE,
                           IDR_AURA_WINDOW_MAXIMIZE_H,
@@ skipping 76 matching lines @@
 };
 
 // Test how the alternate button style affects which buttons are visible in the
 // default case.
 TEST_F(FrameCaptionButtonContainerViewTestAlternateStyle, ButtonVisibility) {
   // Both the minimize button and the maximize button should be visible when
   // both minimizing and maximizing are allowed when using the alternate
   // button style.
   scoped_ptr<views::Widget> widget_can_maximize(
       CreateTestWidget(MAXIMIZE_ALLOWED));
-  FrameCaptionButtonContainerView container(NULL, widget_can_maximize.get(),
+  FrameCaptionButtonContainerView container(widget_can_maximize.get(),
       FrameCaptionButtonContainerView::MINIMIZE_ALLOWED);
   container.Layout();
   FrameCaptionButtonContainerView::TestApi t(&container);
   EXPECT_TRUE(t.minimize_button()->visible());
   EXPECT_TRUE(t.size_button()->visible());
   EXPECT_TRUE(t.close_button()->visible());
   EXPECT_TRUE(CheckButtonsAtEdges(
       &container, *t.minimize_button(), *t.close_button()));
 }
 
 }  // namespace ash